diff options
| author |   Neale Ranns <nranns@cisco.com> | 2019-03-19 10:06:00 +0000 |
|---|---|---|
| committer |   Dave Barach <openvpp@barachs.net> | 2019-03-19 11:26:14 +0000 |
| commit | 9f231d4f147c7e3fdf562680488ec5dfe7655b5e (patch) | |
| tree | e190aff4497734c6ab13c512422c652e630f64bc /src/vnet/ipsec/ipsec_api.c | |
| parent | ee94ffa35d69a56df894a31147a106f2a7d4c3de (diff) | |
IPSEC: tidy the policy types
Change-Id: I5e981f12ff44243623cfd18d5e0ae06a7dfd1eb8
Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'src/vnet/ipsec/ipsec_api.c')
| -rw-r--r-- | src/vnet/ipsec/ipsec_api.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/vnet/ipsec/ipsec_api.c b/src/vnet/ipsec/ipsec_api.c index 906f4c4c16d..d0f543fe520 100644 --- a/src/vnet/ipsec/ipsec_api.c +++ b/src/vnet/ipsec/ipsec_api.c @@ -141,7 +141,6 @@ static void vl_api_ipsec_spd_entry_add_del_t_handler p.id = ntohl (mp->entry.spd_id); p.priority = ntohl (mp->entry.priority); - p.is_outbound = mp->entry.is_outbound; itype = ip_address_decode (&mp->entry.remote_address_start, &p.raddr.start); ip_address_decode (&mp->entry.remote_address_stop, &p.raddr.stop); @@ -169,6 +168,11 @@ static void vl_api_ipsec_spd_entry_add_del_t_handler goto out; } p.sa_id = ntohl (mp->entry.sa_id); + rv = + ipsec_policy_mk_type (mp->entry.is_outbound, p.is_ipv6, p.policy, + &p.type); + if (rv) + goto out; rv = ipsec_add_del_policy (vm, &p, mp->is_add, &stat_index); if (rv) @@ -466,7 +470,8 @@ send_ipsec_spd_details (ipsec_policy_t * p, vl_api_registration_t * reg, mp->entry.spd_id = htonl (p->id); mp->entry.priority = htonl (p->priority); - mp->entry.is_outbound = p->is_outbound; + mp->entry.is_outbound = ((p->type == IPSEC_SPD_POLICY_IP6_OUTBOUND) || + (p->type == IPSEC_SPD_POLICY_IP4_OUTBOUND)); ip_address_encode (&p->laddr.start, IP46_TYPE_ANY, &mp->entry.local_address_start); @@ -492,7 +497,7 @@ vl_api_ipsec_spd_dump_t_handler (vl_api_ipsec_spd_dump_t * mp) { vl_api_registration_t *reg; ipsec_main_t *im = &ipsec_main; - ipsec_spd_policy_t ptype; + ipsec_spd_policy_type_t ptype; ipsec_policy_t *policy; ipsec_spd_t *spd; uword *p; |