X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fadj%2Fadj_glean.c;h=338d7320d53e279df6669fa4a43c530100dcf184;hb=cbe25aab3be72154f2c706c39eeba6a77f34450f;hp=8d86e2a9f00c5095bc30cd9d812e592cdeb4672f;hpb=7cd468a3d7dee7d6c92f69a0bb7061ae208ec727;p=vpp.git

diff --git a/src/vnet/adj/adj_glean.c b/src/vnet/adj/adj_glean.c
index 8d86e2a9f00..338d7320d53 100644
--- a/src/vnet/adj/adj_glean.c
+++ b/src/vnet/adj/adj_glean.c
@@ -24,19 +24,19 @@
  */
 static adj_index_t *adj_gleans[FIB_PROTOCOL_MAX];
 
-static inline vlib_node_registration_t*
+static inline u32
 adj_get_glean_node (fib_protocol_t proto)
 {
     switch (proto) {
     case FIB_PROTOCOL_IP4:
-	return (&ip4_glean_node);
+	return (ip4_glean_node.index);
     case FIB_PROTOCOL_IP6:
-	return (&ip6_glean_node);
+	return (ip6_glean_node.index);
     case FIB_PROTOCOL_MPLS:
 	break;
     }
     ASSERT(0);
-    return (NULL);
+    return (~0);
 }
 
 /*
@@ -48,6 +48,7 @@ adj_get_glean_node (fib_protocol_t proto)
  */
 adj_index_t
 adj_glean_add_or_lock (fib_protocol_t proto,
+                       vnet_link_t linkt,
 		       u32 sw_if_index,
 		       const ip46_address_t *nh_addr)
 {
@@ -61,33 +62,73 @@ adj_glean_add_or_lock (fib_protocol_t proto,
 
 	adj->lookup_next_index = IP_LOOKUP_NEXT_GLEAN;
 	adj->ia_nh_proto = proto;
+        adj->ia_link = linkt;
+        adj->ia_node_index = adj_get_glean_node(proto);
 	adj_gleans[proto][sw_if_index] = adj_get_index(adj);
 
 	if (NULL != nh_addr)
 	{
 	    adj->sub_type.glean.receive_addr = *nh_addr;
 	}
+        else
+        {
+            adj->sub_type.glean.receive_addr = zero_addr;
+        }
 
+	adj->rewrite_header.sw_if_index = sw_if_index;
 	adj->rewrite_header.data_bytes = 0;
-
-	vnet_rewrite_for_sw_interface(vnet_get_main(),
-				      adj_fib_proto_2_nd(proto),
-				      sw_if_index,
-				      adj_get_glean_node(proto)->index,
-				      VNET_REWRITE_FOR_SW_INTERFACE_ADDRESS_BROADCAST,
-				      &adj->rewrite_header,
-				      sizeof (adj->rewrite_data));
+        adj->rewrite_header.max_l3_packet_bytes =
+	  vnet_sw_interface_get_mtu(vnet_get_main(), sw_if_index,
+                                    vnet_link_to_mtu(linkt));
+        adj_lock(adj_get_index(adj));
+
+	vnet_update_adjacency_for_sw_interface(vnet_get_main(),
+                                               sw_if_index,
+                                               adj_get_index(adj));
     }
     else
     {
 	adj = adj_get(adj_gleans[proto][sw_if_index]);
+        adj_lock(adj_get_index(adj));
     }
 
-    adj_lock(adj_get_index(adj));
+    adj_delegate_adj_created(adj);
 
     return (adj_get_index(adj));
 }
 
+/**
+ * adj_glean_update_rewrite
+ */
+void
+adj_glean_update_rewrite (adj_index_t adj_index)
+{
+    ip_adjacency_t *adj;
+
+    ASSERT(ADJ_INDEX_INVALID != adj_index);
+
+    adj = adj_get(adj_index);
+
+    vnet_rewrite_for_sw_interface(vnet_get_main(),
+                                  adj_fib_proto_2_nd(adj->ia_nh_proto),
+                                  adj->rewrite_header.sw_if_index,
+                                  adj->ia_node_index,
+                                  VNET_REWRITE_FOR_SW_INTERFACE_ADDRESS_BROADCAST,
+                                  &adj->rewrite_header,
+                                  sizeof (adj->rewrite_data));
+}
+
+adj_index_t
+adj_glean_get (fib_protocol_t proto,
+               u32 sw_if_index)
+{
+    if (sw_if_index < vec_len(adj_gleans[proto]))
+    {
+        return (adj_gleans[proto][sw_if_index]);
+    }
+    return (ADJ_INDEX_INVALID);
+}
+
 void
 adj_glean_remove (fib_protocol_t proto,
 		  u32 sw_if_index)
@@ -135,12 +176,14 @@ VNET_SW_INTERFACE_ADMIN_UP_DOWN_FUNCTION(adj_glean_interface_state_change);
  * @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)
 {
     adj_glean_interface_state_change(vnm, sw_if_index, (uword) arg);
+
+    return (WALK_CONTINUE);
 }
 
 /**
@@ -224,15 +267,14 @@ format_adj_glean (u8* s, va_list *ap)
 {
     index_t index = va_arg(*ap, index_t);
     CLIB_UNUSED(u32 indent) = va_arg(*ap, u32);
-    vnet_main_t * vnm = vnet_get_main();
     ip_adjacency_t * adj = adj_get(index);
 
-    return (format(s, "%U-glean: %U",
-		   format_fib_protocol, adj->ia_nh_proto,
-                   format_vnet_sw_interface_name,
-                   vnm,
-                   vnet_get_sw_interface(vnm,
-                                         adj->rewrite_header.sw_if_index)));
+    s = format(s, "%U-glean: %U",
+               format_fib_protocol, adj->ia_nh_proto,
+		format_vnet_rewrite,
+		&adj->rewrite_header, sizeof (adj->rewrite_data), 0);
+
+    return (s);
 }
 
 
@@ -251,6 +293,7 @@ const static dpo_vft_t adj_glean_dpo_vft = {
     .dv_lock = adj_dpo_lock,
     .dv_unlock = adj_dpo_unlock,
     .dv_format = format_adj_glean,
+    .dv_get_urpf = adj_dpo_get_urpf,
 };
 
 /**