commit cbe25aab3be72154f2c706c39eeba6a77f34450f
author Neale Ranns <nranns@cisco.com> Mon Sep 30 10:53:31 2019 +0000
committer Ole Trøan <otroan@employees.org> Tue Dec 17 10:56:20 2019 +0000
tree 131fb53b5ec973be045ffb9e2eb797af01d112a0
parent 96453fd2417ebd1d69354a7fb692976129cea80e

ip: Protocol Independent IP Neighbors

Type: feature

 - ip-neighbour: generic neighbour handling; APIs, DBs, event handling,
aging
 - arp: ARP protocol implementation
 - ip6-nd; IPv6 neighbor discovery implementation; separate ND,
MLD, RA
 - ip6-link; manage link-local addresses
 - l2-arp-term; events separated from IP neighbours, since they are not
the same.

vnet retains just enough education to perform ND/ARP packet
construction.
arp and ip6-nd to be moved to plugins soon.

Change-Id: I88dedd0006b299344f4c7024a0aa5baa6b9a8bbe
Signed-off-by: Neale Ranns <nranns@cisco.com>

src/vnet/adj/adj_glean.c

diff --git a/src/vnet/adj/adj_glean.c b/src/vnet/adj/adj_glean.c
index a8a422d..338d732 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);
 }
 
 /*
@@ -63,6 +63,7 @@
 	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)
@@ -111,7 +112,7 @@
     vnet_rewrite_for_sw_interface(vnet_get_main(),
                                   adj_fib_proto_2_nd(adj->ia_nh_proto),
                                   adj->rewrite_header.sw_if_index,
-                                  adj_get_glean_node(adj->ia_nh_proto)->index,
+                                  adj->ia_node_index,
                                   VNET_REWRITE_FOR_SW_INTERFACE_ADDRESS_BROADCAST,
                                   &adj->rewrite_header,
                                   sizeof (adj->rewrite_data));