X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fadj%2Fadj_nbr.c;h=3a474a8e199ccb9344f293f8c46f54da6d9bb918;hb=1855b8e4;hp=97940da02713b81cd5105aa1c3692fba9538b110;hpb=c819fc612f9a79eaba2981dc2e8f7c31552db5ea;p=vpp.git

diff --git a/src/vnet/adj/adj_nbr.c b/src/vnet/adj/adj_nbr.c
index 97940da0271..3a474a8e199 100644
--- a/src/vnet/adj/adj_nbr.c
+++ b/src/vnet/adj/adj_nbr.c
@@ -93,7 +93,7 @@ adj_nbr_remove (adj_index_t ai,
     BV(clib_bihash_add_del) (adj_nbr_tables[nh_proto][sw_if_index], &kv, 0);
 }
 
-static adj_index_t
+adj_index_t
 adj_nbr_find (fib_protocol_t nh_proto,
 	      vnet_link_t link_type,
 	      const ip46_address_t *nh_addr,
@@ -230,7 +230,12 @@ adj_nbr_add_or_lock (fib_protocol_t nh_proto,
 	adj_index = adj_get_index(adj);
 	adj_lock(adj_index);
 
-	vnet_rewrite_init(vnm, sw_if_index,
+        if (ip46_address_is_equal(&ADJ_BCAST_ADDR, nh_addr))
+        {
+            adj->lookup_next_index = IP_LOOKUP_NEXT_BCAST;
+        }
+
+	vnet_rewrite_init(vnm, sw_if_index, link_type,
 			  adj_get_nd_node(nh_proto),
 			  vnet_tx_node_index_for_sw_interface(vnm, sw_if_index),
 			  &adj->rewrite_header);
@@ -583,29 +588,6 @@ adj_nbr_walk (u32 sw_if_index,
 	&awc);
 }
 
-/**
- * @brief Context for a walk of the adjacency neighbour DB
- */
-typedef struct adj_walk_nh_ctx_t_
-{
-    adj_walk_cb_t awc_cb;
-    void *awc_ctx;
-    const ip46_address_t *awc_nh;
-} adj_walk_nh_ctx_t;
-
-static void
-adj_nbr_walk_nh_cb (BVT(clib_bihash_kv) * kvp,
-		    void *arg)
-{
-    ip_adjacency_t *adj;
-    adj_walk_nh_ctx_t *ctx = arg;
-
-    adj = adj_get(kvp->value);
-
-    if (!ip46_address_cmp(&adj->sub_type.nbr.next_hop, ctx->awc_nh)) 
-	ctx->awc_cb(kvp->value, ctx->awc_ctx);
-}
-
 /**
  * @brief Walk adjacencies on a link with a given v4 next-hop.
  * that is visit the adjacencies with different link types.
@@ -622,17 +604,16 @@ adj_nbr_walk_nh4 (u32 sw_if_index,
     ip46_address_t nh = {
 	.ip4 = *addr,
     };
+    vnet_link_t linkt;
+    adj_index_t ai;
 
-    adj_walk_nh_ctx_t awc = {
-	.awc_ctx = ctx,
-	.awc_cb = cb,
-	.awc_nh = &nh,
-    };
+    FOR_EACH_VNET_LINK(linkt)
+    {
+        ai = adj_nbr_find (FIB_PROTOCOL_IP4, linkt, &nh, sw_if_index);
 
-    BV(clib_bihash_foreach_key_value_pair) (
-	adj_nbr_tables[FIB_PROTOCOL_IP4][sw_if_index],
-	adj_nbr_walk_nh_cb,
-	&awc);
+        if (INDEX_INVALID != ai)
+            cb(ai, ctx);
+    }
 }
 
 /**
@@ -651,17 +632,16 @@ adj_nbr_walk_nh6 (u32 sw_if_index,
     ip46_address_t nh = {
 	.ip6 = *addr,
     };
+    vnet_link_t linkt;
+    adj_index_t ai;
 
-    adj_walk_nh_ctx_t awc = {
-	.awc_ctx = ctx,
-	.awc_cb = cb,
-	.awc_nh = &nh,
-    };
+    FOR_EACH_VNET_LINK(linkt)
+    {
+        ai = adj_nbr_find (FIB_PROTOCOL_IP6, linkt, &nh, sw_if_index);
 
-    BV(clib_bihash_foreach_key_value_pair) (
-	adj_nbr_tables[FIB_PROTOCOL_IP6][sw_if_index],
-	adj_nbr_walk_nh_cb,
-	&awc);
+        if (INDEX_INVALID != ai)
+            cb(ai, ctx);
+    }
 }
 
 /**
@@ -678,16 +658,16 @@ adj_nbr_walk_nh (u32 sw_if_index,
     if (!ADJ_NBR_ITF_OK(adj_nh_proto, sw_if_index))
 	return;
 
-    adj_walk_nh_ctx_t awc = {
-	.awc_ctx = ctx,
-	.awc_cb = cb,
-	.awc_nh = nh,
-    };
+    vnet_link_t linkt;
+    adj_index_t ai;
 
-    BV(clib_bihash_foreach_key_value_pair) (
-	adj_nbr_tables[adj_nh_proto][sw_if_index],
-	adj_nbr_walk_nh_cb,
-	&awc);
+    FOR_EACH_VNET_LINK(linkt)
+    {
+        ai = adj_nbr_find (FIB_PROTOCOL_IP4, linkt, nh, sw_if_index);
+
+        if (INDEX_INVALID != ai)
+            cb(ai, ctx);
+    }
 }
 
 /**
@@ -776,7 +756,7 @@ VNET_SW_INTERFACE_ADMIN_UP_DOWN_FUNCTION_PRIO(
  * @brief Invoked on each SW interface of a HW interface when the
  * HW interface state changes
  */
-static void
+static walk_rc_t
 adj_nbr_hw_sw_interface_state_change (vnet_main_t * vnm,
                                       u32 sw_if_index,
                                       void *arg)
@@ -793,6 +773,7 @@ adj_nbr_hw_sw_interface_state_change (vnet_main_t * vnm,
 		     adj_nbr_interface_state_change_one,
 		     ctx);
     }
+    return (WALK_CONTINUE);
 }
 
 /**
@@ -981,10 +962,8 @@ format_adj_nbr_incomplete (u8* s, va_list *ap)
                 format_ip46_address, &adj->sub_type.nbr.next_hop,
 		adj_proto_to_46(adj->ia_nh_proto));
     s = format (s, " %U",
-                format_vnet_sw_interface_name,
-                vnm,
-                vnet_get_sw_interface(vnm,
-                                      adj->rewrite_header.sw_if_index));
+                format_vnet_sw_if_index_name,
+                vnm, adj->rewrite_header.sw_if_index);
 
     return (s);
 }