diff options
| author |   Ole Troan <ot@cisco.com> | 2016-01-07 14:37:25 +0100 |
|---|---|---|
| committer | Ole Troan <ot@cisco.com> | 2016-01-07 20:17:14 +0100 |
| commit | cda948225887b2f53032ffb321f2d922b9836bd2 (patch) | |
| tree | 3c2b1fc0615546d0ee180d13f45133d45da714b7 /vnet/vnet/map/ip4_map.c | |
| parent | 366ac6ecdea0214363f523967830c370697c8944 (diff) | |
- ICMP6: Add generic ICMP6 error node. Caller sets code/type fields.
- MAP: Added knob to send unreachable ICMP6 on unmatched binding.
Change-Id: I314547cc1157d8a73887e7518ebfe3e68d331650
Signed-off-by: Ole Troan <ot@cisco.com>
Diffstat (limited to 'vnet/vnet/map/ip4_map.c')
| -rw-r--r-- | vnet/vnet/map/ip4_map.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vnet/vnet/map/ip4_map.c b/vnet/vnet/map/ip4_map.c index c8ee2764f23..343b57d210f 100644 --- a/vnet/vnet/map/ip4_map.c +++ b/vnet/vnet/map/ip4_map.c @@ -76,7 +76,7 @@ ip4_map_get_port (ip4_header_t *ip, map_dir_e dir) icmp46_header_t *icmp = (void *)(ip + 1); if (icmp->type == ICMP4_echo_request || icmp->type == ICMP4_echo_reply) { return *((u16 *)(icmp + 1)); - } else if (clib_net_to_host_u16(ip->length) >= 64) { // IP + ICMP + IP + L4 header + } else if (clib_net_to_host_u16(ip->length) >= 56) { // IP + ICMP + IP + L4 header ip4_header_t *icmp_ip = (ip4_header_t *)(icmp + 2); if (PREDICT_TRUE((icmp_ip->protocol == IP_PROTOCOL_TCP) || (icmp_ip->protocol == IP_PROTOCOL_UDP))) { @@ -256,8 +256,8 @@ ip4_map (vlib_main_t *vm, u64 dal61 = map_get_pfx(d1, da41, dp41); u64 dar60 = map_get_sfx(d0, da40, dp40); u64 dar61 = map_get_sfx(d1, da41, dp41); - if (dal60 == 0 && dar60 == 0) error0 = MAP_ERROR_UNKNOWN; - if (dal61 == 0 && dar61 == 0) error1 = MAP_ERROR_UNKNOWN; + if (dal60 == 0 && dar60 == 0) error0 = MAP_ERROR_NO_BINDING; + if (dal61 == 0 && dar61 == 0) error1 = MAP_ERROR_NO_BINDING; /* construct ipv6 header */ vlib_buffer_advance(p0, - sizeof(ip6_header_t)); @@ -375,7 +375,7 @@ ip4_map (vlib_main_t *vm, u16 dp40 = clib_net_to_host_u16(port0); u64 dal60 = map_get_pfx(d0, da40, dp40); u64 dar60 = map_get_sfx(d0, da40, dp40); - if (dal60 == 0 && dar60 == 0 && error0 == MAP_ERROR_NONE) error0 = MAP_ERROR_UNKNOWN; + if (dal60 == 0 && dar60 == 0 && error0 == MAP_ERROR_NONE) error0 = MAP_ERROR_NO_BINDING; /* construct ipv6 header */ vlib_buffer_advance(p0, - (sizeof(ip6_header_t))); |