ip-neighbor: Handle local MAC address change for incomplete adjacencies
Type: fix
When the local MAC address of an interface changes the rewrite strings
of all adjacency types need to be updated - this patch fixes the missing
case of incomplete adjacencies.
I moved the update of all adj types into the adj module, since if the
complete adjs were done by the ip-neighbour module and incomplete ones
by adj module, that would mean two walks of the adj DB, as it is not
possible to walk only a specific type.
UT is updated to include the missing case.
Signed-off-by: Neale Ranns <neale@graphiant.com>
Signed-off-by: Ivan Shvedunov <ivan4th@gmail.com>
Change-Id: I36af94976c645bdd0d4d3bc0093b24d7d077e9d7
diff --git a/src/vnet/adj/adj_nbr.c b/src/vnet/adj/adj_nbr.c
index 3344d6e..8524c6c 100644
--- a/src/vnet/adj/adj_nbr.c
+++ b/src/vnet/adj/adj_nbr.c
@@ -910,13 +910,40 @@
}
return (NULL);
-
}
VNET_SW_INTERFACE_ADD_DEL_FUNCTION(adj_nbr_interface_add_del);
static adj_walk_rc_t
+adj_nbr_ethernet_mac_change_one (adj_index_t ai,
+ void *arg)
+{
+ vnet_update_adjacency_for_sw_interface(vnet_get_main(),
+ adj_get_sw_if_index(ai),
+ ai);
+
+ return (ADJ_WALK_RC_CONTINUE);
+}
+
+/**
+ * Callback function invoked when an interface's MAC Address changes
+ */
+static void
+adj_nbr_ethernet_change_mac (ethernet_main_t * em,
+ u32 sw_if_index, uword opaque)
+{
+ fib_protocol_t proto;
+
+ FOR_EACH_FIB_IP_PROTOCOL(proto)
+ {
+ adj_nbr_walk(sw_if_index, proto,
+ adj_nbr_ethernet_mac_change_one,
+ NULL);
+ }
+}
+
+static adj_walk_rc_t
adj_nbr_show_one (adj_index_t ai,
void *arg)
{
@@ -1156,4 +1183,10 @@
dpo_register(DPO_ADJACENCY_INCOMPLETE,
&adj_nbr_incompl_dpo_vft,
nbr_incomplete_nodes);
+
+ ethernet_address_change_ctx_t ctx = {
+ .function = adj_nbr_ethernet_change_mac,
+ .function_opaque = 0,
+ };
+ vec_add1 (ethernet_main.address_change_callbacks, ctx);
}