diff options
| -rw-r--r-- | src/plugins/linux-cp/lcp_router.c | 33 | ||||
| -rw-r--r-- | src/vnet/ip-neighbor/ip_neighbor.c | 2 | ||||
| -rw-r--r-- | src/vnet/ip-neighbor/ip_neighbor.h | 1 | ||||
| -rw-r--r-- | src/vnet/ip/ip_interface.c | 6 | ||||
| -rw-r--r-- | src/vnet/ip/ip_interface.h | 3 |
5 files changed, 38 insertions, 7 deletions
diff --git a/src/plugins/linux-cp/lcp_router.c b/src/plugins/linux-cp/lcp_router.c index af01b54d52f..acf0a034be0 100644 --- a/src/plugins/linux-cp/lcp_router.c +++ b/src/plugins/linux-cp/lcp_router.c @@ -662,10 +662,25 @@ lcp_router_link_addr_add (struct rtnl_addr *la) lcp_router_link_addr_add_del (la, 0); } +static walk_rc_t +lcp_router_address_mark (index_t index, void *ctx) +{ + vnet_main_t *vnm = vnet_get_main (); + + lcp_itf_pair_t *lip = lcp_itf_pair_get (index); + if (!lip) + return WALK_CONTINUE; + + ip_interface_address_mark_one_interface ( + vnm, vnet_get_sw_interface (vnm, lip->lip_phy_sw_if_index), 0); + + return WALK_CONTINUE; +} + static void lcp_router_link_addr_sync_begin (void) { - ip_interface_address_mark (); + lcp_itf_pair_walk (lcp_router_address_mark, 0); LCP_ROUTER_INFO ("Begin synchronization of interface addresses"); } @@ -795,11 +810,23 @@ lcp_router_neigh_add (struct rtnl_neigh *rn) rtnl_neigh_get_ifindex (rn)); } +static walk_rc_t +lcp_router_neighbor_mark (index_t index, void *ctx) +{ + lcp_itf_pair_t *lip = lcp_itf_pair_get (index); + if (!lip) + return WALK_CONTINUE; + + ip_neighbor_walk (AF_IP4, lip->lip_phy_sw_if_index, ip_neighbor_mark_one, 0); + ip_neighbor_walk (AF_IP6, lip->lip_phy_sw_if_index, ip_neighbor_mark_one, 0); + + return WALK_CONTINUE; +} + static void lcp_router_neigh_sync_begin (void) { - ip_neighbor_mark (AF_IP4); - ip_neighbor_mark (AF_IP6); + lcp_itf_pair_walk (lcp_router_neighbor_mark, 0); LCP_ROUTER_INFO ("Begin synchronization of neighbors"); } diff --git a/src/vnet/ip-neighbor/ip_neighbor.c b/src/vnet/ip-neighbor/ip_neighbor.c index 6c97356dd98..6ba191abaf6 100644 --- a/src/vnet/ip-neighbor/ip_neighbor.c +++ b/src/vnet/ip-neighbor/ip_neighbor.c @@ -1204,7 +1204,7 @@ ip_neighbor_flush (ip_address_family_t af, u32 sw_if_index) vec_free (ipnis); } -static walk_rc_t +walk_rc_t ip_neighbor_mark_one (index_t ipni, void *ctx) { ip_neighbor_t *ipn; diff --git a/src/vnet/ip-neighbor/ip_neighbor.h b/src/vnet/ip-neighbor/ip_neighbor.h index 064569b56ce..17028012dfd 100644 --- a/src/vnet/ip-neighbor/ip_neighbor.h +++ b/src/vnet/ip-neighbor/ip_neighbor.h @@ -60,6 +60,7 @@ extern void ip_neighbor_probe_dst (u32 sw_if_index, extern void ip_neighbor_mark (ip_address_family_t af); extern void ip_neighbor_sweep (ip_address_family_t af); +extern walk_rc_t ip_neighbor_mark_one (index_t ipni, void *ctx); /** * From the watcher to the API to publish a new neighbor diff --git a/src/vnet/ip/ip_interface.c b/src/vnet/ip/ip_interface.c index 48c20a6cf34..d5ee7fd9b2b 100644 --- a/src/vnet/ip/ip_interface.c +++ b/src/vnet/ip/ip_interface.c @@ -203,9 +203,9 @@ ip_interface_get_first_ip (u32 sw_if_index, u8 is_ip4) return 0; } -static walk_rc_t -ip_interface_address_mark_one_interface (vnet_main_t * vnm, - vnet_sw_interface_t * si, void *ctx) +walk_rc_t +ip_interface_address_mark_one_interface (vnet_main_t *vnm, + vnet_sw_interface_t *si, void *ctx) { ip_lookup_main_t *lm4 = &ip4_main.lookup_main; ip_lookup_main_t *lm6 = &ip6_main.lookup_main; diff --git a/src/vnet/ip/ip_interface.h b/src/vnet/ip/ip_interface.h index b48eebdbc90..f0474c1bf9a 100644 --- a/src/vnet/ip/ip_interface.h +++ b/src/vnet/ip/ip_interface.h @@ -38,6 +38,9 @@ void ip_interface_address_sweep (void); u32 ip_interface_address_find (ip_lookup_main_t * lm, void *addr_fib, u32 address_length); u8 ip_interface_has_address (u32 sw_if_index, ip46_address_t * ip, u8 is_ip4); +walk_rc_t ip_interface_address_mark_one_interface (vnet_main_t *vnm, + vnet_sw_interface_t *si, + void *ctx); always_inline void * ip_interface_address_get_address (ip_lookup_main_t * lm, |