diff options
Diffstat (limited to 'src/vnet')
| -rw-r--r-- | src/vnet/ipsec/ipsec_api.c | 17 | ||||
| -rw-r--r-- | src/vnet/ipsec/ipsec_cli.c | 4 | ||||
| -rw-r--r-- | src/vnet/ipsec/ipsec_format.c | 19 | ||||
| -rw-r--r-- | src/vnet/ipsec/ipsec_output.c | 25 | ||||
| -rw-r--r-- | src/vnet/ipsec/ipsec_spd_policy.h | 1 |
5 files changed, 35 insertions, 31 deletions
diff --git a/src/vnet/ipsec/ipsec_api.c b/src/vnet/ipsec/ipsec_api.c index 4311a30f859..e37a3009625 100644 --- a/src/vnet/ipsec/ipsec_api.c +++ b/src/vnet/ipsec/ipsec_api.c @@ -150,11 +150,10 @@ static void vl_api_ipsec_spd_entry_add_del_t_handler p.is_ipv6 = (itype == IP46_TYPE_IP6); p.protocol = mp->entry.protocol; - /* leave the ports in network order */ - p.rport.start = mp->entry.remote_port_start; - p.rport.stop = mp->entry.remote_port_stop; - p.lport.start = mp->entry.local_port_start; - p.lport.stop = mp->entry.local_port_stop; + p.rport.start = ntohs (mp->entry.remote_port_start); + p.rport.stop = ntohs (mp->entry.remote_port_stop); + p.lport.start = ntohs (mp->entry.local_port_start); + p.lport.stop = ntohs (mp->entry.local_port_stop); rv = ipsec_spd_action_decode (mp->entry.policy, &p.policy); @@ -489,10 +488,10 @@ send_ipsec_spd_details (ipsec_policy_t * p, vl_api_registration_t * reg, &mp->entry.remote_address_start); ip_address_encode (&p->raddr.stop, IP46_TYPE_ANY, &mp->entry.remote_address_stop); - mp->entry.local_port_start = p->lport.start; - mp->entry.local_port_stop = p->lport.stop; - mp->entry.remote_port_start = p->rport.start; - mp->entry.remote_port_stop = p->rport.stop; + mp->entry.local_port_start = htons (p->lport.start); + mp->entry.local_port_stop = htons (p->lport.stop); + mp->entry.remote_port_start = htons (p->rport.start); + mp->entry.remote_port_stop = htons (p->rport.stop); mp->entry.protocol = p->protocol; mp->entry.policy = ipsec_spd_action_encode (p->policy); mp->entry.sa_id = htonl (p->sa_id); diff --git a/src/vnet/ipsec/ipsec_cli.c b/src/vnet/ipsec/ipsec_cli.c index b97fb02b66d..a019f8e365f 100644 --- a/src/vnet/ipsec/ipsec_cli.c +++ b/src/vnet/ipsec/ipsec_cli.c @@ -291,16 +291,12 @@ ipsec_policy_add_del_command_fn (vlib_main_t * vm, { p.lport.start = tmp; p.lport.stop = tmp2; - p.lport.start = clib_host_to_net_u16 (p.lport.start); - p.lport.stop = clib_host_to_net_u16 (p.lport.stop); } else if (unformat (line_input, "remote-port-range %u - %u", &tmp, &tmp2)) { p.rport.start = tmp; p.rport.stop = tmp2; - p.rport.start = clib_host_to_net_u16 (p.rport.start); - p.rport.stop = clib_host_to_net_u16 (p.rport.stop); } else { diff --git a/src/vnet/ipsec/ipsec_format.c b/src/vnet/ipsec/ipsec_format.c index 80691f2836c..7bda5203a55 100644 --- a/src/vnet/ipsec/ipsec_format.c +++ b/src/vnet/ipsec/ipsec_format.c @@ -158,6 +158,7 @@ format_ipsec_policy (u8 * s, va_list * args) ipsec_main_t *im = &ipsec_main; ipsec_policy_t *p; vlib_counter_t counts; + ip46_type_t ip_type; p = pool_elt_at_index (im->policies, pi); @@ -177,17 +178,19 @@ format_ipsec_policy (u8 * s, va_list * args) { s = format (s, " sa %u", p->sa_id); } + if (p->is_ipv6) + { + ip_type = IP46_TYPE_IP6; + } s = format (s, "\n local addr range %U - %U port range %u - %u", - format_ip46_address, &p->laddr.start, IP46_TYPE_ANY, - format_ip46_address, &p->laddr.stop, IP46_TYPE_ANY, - clib_net_to_host_u16 (p->lport.start), - clib_net_to_host_u16 (p->lport.stop)); + format_ip46_address, &p->laddr.start, ip_type, + format_ip46_address, &p->laddr.stop, ip_type, + p->lport.start, p->lport.stop); s = format (s, "\n remote addr range %U - %U port range %u - %u", - format_ip46_address, &p->raddr.start, IP46_TYPE_ANY, - format_ip46_address, &p->raddr.stop, IP46_TYPE_ANY, - clib_net_to_host_u16 (p->rport.start), - clib_net_to_host_u16 (p->rport.stop)); + format_ip46_address, &p->raddr.start, ip_type, + format_ip46_address, &p->raddr.stop, ip_type, + p->rport.start, p->rport.stop); vlib_get_combined_counter (&ipsec_spd_policy_counters, pi, &counts); s = format (s, "\n packets %u bytes %u", counts.packets, counts.bytes); diff --git a/src/vnet/ipsec/ipsec_output.c b/src/vnet/ipsec/ipsec_output.c index 83ab629453d..a2553764192 100644 --- a/src/vnet/ipsec/ipsec_output.c +++ b/src/vnet/ipsec/ipsec_output.c @@ -82,16 +82,16 @@ ipsec_output_policy_match (ipsec_spd_t * spd, u8 pr, u32 la, u32 ra, u16 lp, if (PREDICT_FALSE (p->protocol && (p->protocol != pr))) continue; - if (ra < p->raddr.start.ip4.as_u32) + if (ra < clib_net_to_host_u32 (p->raddr.start.ip4.as_u32)) continue; - if (ra > p->raddr.stop.ip4.as_u32) + if (ra > clib_net_to_host_u32 (p->raddr.stop.ip4.as_u32)) continue; - if (la < p->laddr.start.ip4.as_u32) + if (la < clib_net_to_host_u32 (p->laddr.start.ip4.as_u32)) continue; - if (la > p->laddr.stop.ip4.as_u32) + if (la > clib_net_to_host_u32 (p->laddr.stop.ip4.as_u32)) continue; if (PREDICT_FALSE @@ -239,8 +239,10 @@ ipsec_output_inline (vlib_main_t * vm, vlib_node_runtime_t * node, p0 = ipsec6_output_policy_match (spd0, &ip6_0->src_address, &ip6_0->dst_address, - udp0->src_port, - udp0->dst_port, ip6_0->protocol); + clib_net_to_host_u16 + (udp0->src_port), + clib_net_to_host_u16 + (udp0->dst_port), ip6_0->protocol); } else { @@ -256,9 +258,14 @@ ipsec_output_inline (vlib_main_t * vm, vlib_node_runtime_t * node, #endif p0 = ipsec_output_policy_match (spd0, ip0->protocol, - ip0->src_address.as_u32, - ip0->dst_address.as_u32, - udp0->src_port, udp0->dst_port); + clib_net_to_host_u32 + (ip0->src_address.as_u32), + clib_net_to_host_u32 + (ip0->dst_address.as_u32), + clib_net_to_host_u16 + (udp0->src_port), + clib_net_to_host_u16 + (udp0->dst_port)); } tcp0 = (void *) udp0; diff --git a/src/vnet/ipsec/ipsec_spd_policy.h b/src/vnet/ipsec/ipsec_spd_policy.h index d4472e68d89..6d6b69592b0 100644 --- a/src/vnet/ipsec/ipsec_spd_policy.h +++ b/src/vnet/ipsec/ipsec_spd_policy.h @@ -39,7 +39,6 @@ typedef struct typedef struct { - /* Ports stored in network byte order */ u16 start, stop; } port_range_t; |