From cbe25aab3be72154f2c706c39eeba6a77f34450f Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Mon, 30 Sep 2019 10:53:31 +0000 Subject: 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 --- src/vnet/adj/adj_glean.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/vnet/adj/adj_glean.c') diff --git a/src/vnet/adj/adj_glean.c b/src/vnet/adj/adj_glean.c index a8a422d30ba..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); } /* @@ -63,6 +63,7 @@ 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) @@ -111,7 +112,7 @@ adj_glean_update_rewrite (adj_index_t 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_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)); -- cgit 1.2.3-korg