arp: fix for source address selection

Type: fix
Ticket: VPP-1970
Ticket: VPP-1992
Fixes: 9e17887db97bb9f6507270f9fa9923c10816e0df

https://gerrit.fd.io/r/c/vpp/+/33495/7 introduced a bug

where ND responses are inproperly dropped. This fixes that bug.

Signed-off-by: Ed Warnicke <hagbard@gmail.com>
Change-Id: Iec4b07646332ced292e2211408c4f7af3088ac28
Signed-off-by: Ed Warnicke <hagbard@gmail.com>

diff --git a/src/vnet/ip-neighbor/ip6_neighbor.c b/src/vnet/ip-neighbor/ip6_neighbor.c
index 0f923fe..cf14954 100644 (file)
--- a/src/vnet/ip-neighbor/ip6_neighbor.c
+++ b/src/vnet/ip-neighbor/ip6_neighbor.c
@@ -214,7 +214,7 @@ ip6_discover_neighbor_inline (vlib_main_t * vm,
           * Choose source address based on destination lookup
           * adjacency.
           */
-         if (!fib_sas6_get (sw_if_index0, &ip0->dst_address, &src) &&
+         if (!fib_sas6_get (sw_if_index0, &ip0->dst_address, &src) ||
              !ip6_sas_by_sw_if_index (sw_if_index0, &ip0->dst_address, &src))
            {
              /* There is no address on the interface */