diff options
Diffstat (limited to 'src/vnet/adj')
| -rw-r--r-- | src/vnet/adj/adj.h | 4 | ||||
| -rw-r--r-- | src/vnet/adj/adj_glean.c | 11 | ||||
| -rw-r--r-- | src/vnet/adj/adj_internal.h | 2 | ||||
| -rw-r--r-- | src/vnet/adj/adj_mcast.c | 3 | ||||
| -rw-r--r-- | src/vnet/adj/adj_nbr.c | 19 |
5 files changed, 24 insertions, 15 deletions
diff --git a/src/vnet/adj/adj.h b/src/vnet/adj/adj.h index cd6e8382ba5..1a841ed2892 100644 --- a/src/vnet/adj/adj.h +++ b/src/vnet/adj/adj.h @@ -326,6 +326,10 @@ typedef struct ip_adjacency_t_ */ struct adj_delegate_t_ *ia_delegates; + /** + * The VLIB node in which this adj is used to forward packets + */ + u32 ia_node_index; } ip_adjacency_t; STATIC_ASSERT ((STRUCT_OFFSET_OF (ip_adjacency_t, cacheline0) == 0), 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)); diff --git a/src/vnet/adj/adj_internal.h b/src/vnet/adj/adj_internal.h index 2053c69342a..adb7a32375d 100644 --- a/src/vnet/adj/adj_internal.h +++ b/src/vnet/adj/adj_internal.h @@ -98,7 +98,7 @@ adj_proto_to_46 (fib_protocol_t proto) * Get a pointer to an adjacency object from its index */ static inline adj_index_t -adj_get_index (ip_adjacency_t *adj) +adj_get_index (const ip_adjacency_t *adj) { return (adj - adj_pool); } diff --git a/src/vnet/adj/adj_mcast.c b/src/vnet/adj/adj_mcast.c index 4d7172cdb58..590652244e6 100644 --- a/src/vnet/adj/adj_mcast.c +++ b/src/vnet/adj/adj_mcast.c @@ -66,11 +66,12 @@ adj_mcast_add_or_lock (fib_protocol_t proto, adj->lookup_next_index = IP_LOOKUP_NEXT_MCAST; adj->ia_nh_proto = proto; adj->ia_link = link_type; + adj->ia_node_index = adj_get_mcast_node(proto); adj_mcasts[proto][sw_if_index] = adj_get_index(adj); adj_lock(adj_get_index(adj)); vnet_rewrite_init(vnm, sw_if_index, link_type, - adj_get_mcast_node(proto), + adj->ia_node_index, vnet_tx_node_index_for_sw_interface(vnm, sw_if_index), &adj->rewrite_header); diff --git a/src/vnet/adj/adj_nbr.c b/src/vnet/adj/adj_nbr.c index 28ee53e7d49..f769c56d8ec 100644 --- a/src/vnet/adj/adj_nbr.c +++ b/src/vnet/adj/adj_nbr.c @@ -464,6 +464,7 @@ adj_nbr_update_rewrite_internal (ip_adjacency_t *adj, vlib_worker_thread_barrier_sync(vm); adj->lookup_next_index = adj_next_index; + adj->ia_node_index = this_node; if (NULL != rewrite) { @@ -666,15 +667,17 @@ adj_nbr_walk_nh (u32 sw_if_index, if (!ADJ_NBR_ITF_OK(adj_nh_proto, sw_if_index)) return; - vnet_link_t linkt; - adj_index_t ai; - - FOR_EACH_VNET_LINK(linkt) + switch (adj_nh_proto) { - ai = adj_nbr_find (adj_nh_proto, linkt, nh, sw_if_index); - - if (INDEX_INVALID != ai) - cb(ai, ctx); + case FIB_PROTOCOL_IP4: + adj_nbr_walk_nh4(sw_if_index, &nh->ip4, cb, ctx); + break; + case FIB_PROTOCOL_IP6: + adj_nbr_walk_nh6(sw_if_index, &nh->ip6, cb, ctx); + break; + case FIB_PROTOCOL_MPLS: + ASSERT(0); + break; } } |