From: Florin Coras Date: Mon, 5 Sep 2016 17:54:17 +0000 (+0200) Subject: VPP-385: Fix ARP for indirect adjacencies X-Git-Tag: v17.01-rc0~250 X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F49%2F2649%2F3;p=vpp.git VPP-385: Fix ARP for indirect adjacencies Change-Id: I48cffb8acbd9e6655d7ec661ee8f7e0689b12a2d Signed-off-by: Florin Coras --- diff --git a/vnet/vnet/ip/ip4_forward.c b/vnet/vnet/ip/ip4_forward.c index 8113cd72219..8a49854966c 100644 --- a/vnet/vnet/ip/ip4_forward.c +++ b/vnet/vnet/ip/ip4_forward.c @@ -884,6 +884,15 @@ ip4_lookup_inline (vlib_main_t * vm, vnet_buffer (p0)->ip.adj_index[VLIB_TX] = adj_index0; vnet_buffer (p1)->ip.adj_index[VLIB_TX] = adj_index1; + if (is_indirect) + { + /* ARP for next-hop not packet's destination address */ + if (adj0->lookup_next_index == IP_LOOKUP_NEXT_ARP) + ip0->dst_address.as_u32 = dst_addr0->as_u32; + if (adj1->lookup_next_index == IP_LOOKUP_NEXT_ARP) + ip1->dst_address.as_u32 = dst_addr1->as_u32; + } + vlib_increment_combined_counter (cm, cpu_index, adj_index0, 1, vlib_buffer_length_in_chain (vm, p0) @@ -1027,6 +1036,13 @@ ip4_lookup_inline (vlib_main_t * vm, vnet_buffer (p0)->ip.adj_index[VLIB_TX] = adj_index0; + if (is_indirect) + { + /* ARP for next-hop not packet's destination address */ + if (adj0->lookup_next_index == IP_LOOKUP_NEXT_ARP) + ip0->dst_address.as_u32 = dst_addr0->as_u32; + } + vlib_increment_combined_counter (cm, cpu_index, adj_index0, 1, vlib_buffer_length_in_chain (vm, p0)