vrrp: fix support for VRs in different FIBs

[vpp.git] / src / plugins / vrrp / vrrp.c

diff --git a/src/plugins/vrrp/vrrp.c b/src/plugins/vrrp/vrrp.c
index 564cdb0..dbc122c 100644 (file)
--- a/src/plugins/vrrp/vrrp.c
+++ b/src/plugins/vrrp/vrrp.c
@@ -144,11 +144,7 @@ vrrp_vr_transition_intf (vrrp_vr_t * vr, vrrp_vr_state_t new_state)
   u8 is_ipv6 = vrrp_vr_is_ipv6 (vr);
   u32 *vr_index;
   int n_master_accept = 0;
-
-  /* only need to do something if entering or leaving master state */
-  if ((vr->runtime.state != VRRP_VR_STATE_MASTER) &&
-      (new_state != VRRP_VR_STATE_MASTER))
-    return;
+  int n_started = 0;
 
   if (is_ipv6)
     {
@@ -167,46 +163,53 @@ vrrp_vr_transition_intf (vrrp_vr_t * vr, vrrp_vr_state_t new_state)
 
   intf = vrrp_intf_get (vr->config.sw_if_index);
 
-  if (new_state == VRRP_VR_STATE_MASTER)
-    {
-      intf->n_master_vrs[is_ipv6]++;
-      if (intf->n_master_vrs[is_ipv6] == 1)
-       vnet_feature_enable_disable (arc_name, node_name,
-                                    vr->config.sw_if_index, 1, NULL, 0);
-    }
-  else
-    {
-      if (intf->n_master_vrs[is_ipv6] == 1)
-       vnet_feature_enable_disable (arc_name, node_name,
-                                    vr->config.sw_if_index, 0, NULL, 0);
-      /* If the count were already 0, leave it at 0 */
-      if (intf->n_master_vrs[is_ipv6])
-       intf->n_master_vrs[is_ipv6]--;
-    }
+  /* Check other VRs on this intf to see if features need to be toggled */
+  vec_foreach (vr_index, intf->vr_indices[is_ipv6])
+  {
+    vrrp_vr_t *intf_vr = vrrp_vr_lookup_index (*vr_index);
 
-  /* accept mode enabled, count the other master VRs w/ accept mode on intf */
-  if (vrrp_vr_accept_mode_enabled (vr))
-    {
-      vec_foreach (vr_index, intf->vr_indices[is_ipv6])
-      {
-       vrrp_vr_t *intf_vr = vrrp_vr_lookup_index (*vr_index);
+    if (intf_vr == vr)
+      continue;
 
-       if (intf_vr == vr)
-         continue;
+    if (intf_vr->runtime.state == VRRP_VR_STATE_INIT)
+      continue;
 
-       if (vrrp_vr_accept_mode_enabled (intf_vr) &&
-           (intf_vr->runtime.state == VRRP_VR_STATE_MASTER))
-         n_master_accept++;
-      }
+    n_started++;
+
+    if ((intf_vr->runtime.state == VRRP_VR_STATE_MASTER) &&
+       vrrp_vr_accept_mode_enabled (intf_vr))
+      n_master_accept++;
+  }
 
-      /* If no others, enable or disable the feature based on new state */
-      if (!n_master_accept)
+  /* If entering/leaving init state, start/stop ARP or ND feature if no other
+   * VRs are active on the interface.
+   */
+  if (((vr->runtime.state == VRRP_VR_STATE_INIT) ||
+       (new_state == VRRP_VR_STATE_INIT)) && (n_started == 0))
+    vnet_feature_enable_disable (arc_name, node_name,
+                                vr->config.sw_if_index,
+                                (new_state != VRRP_VR_STATE_INIT), NULL, 0);
+
+  /* Special housekeeping when entering/leaving master mode */
+  if ((vr->runtime.state == VRRP_VR_STATE_MASTER) ||
+      (new_state == VRRP_VR_STATE_MASTER))
+    {
+      /* Maintain count of master state VRs on interface */
+      if (new_state == VRRP_VR_STATE_MASTER)
+       intf->n_master_vrs[is_ipv6]++;
+      else if (intf->n_master_vrs[is_ipv6] > 0)
+       intf->n_master_vrs[is_ipv6]--;
+
+      /* If accept mode is enabled and no other master on intf has accept
+       * mode enabled, enable/disable feature node to avoid spurious drops by
+       * spoofing check.
+       */
+      if (vrrp_vr_accept_mode_enabled (vr) && !n_master_accept)
        vnet_feature_enable_disable (mc_arc_name, mc_node_name,
                                     vr->config.sw_if_index,
                                     (new_state == VRRP_VR_STATE_MASTER),
                                     NULL, 0);
     }
-
 }
 
 /* If accept mode enabled, add/remove VR addresses from interface */
@@ -348,6 +351,8 @@ vrrp_vr_transition (vrrp_vr_t * vr, vrrp_vr_state_t new_state, void *data)
   /* add/delete virtual MAC address on NIC if necessary */
   vrrp_vr_transition_vmac (vr, new_state);
 
+  vrrp_vr_event (vr, new_state);
+
   vr->runtime.state = new_state;
 }
 
@@ -380,7 +385,8 @@ vrrp_intf_enable_disable_mcast (u8 enable, u32 sw_if_index, u8 is_ipv6)
 {
   vrrp_main_t *vrm = &vrrp_main;
   vrrp_intf_t *intf;
-  u32 fib_index;
+  u32 fib_index, i;
+  u32 n_vrs_in_fib = 0;
   const mfib_prefix_t *vrrp_prefix;
   fib_protocol_t proto;
   vnet_link_t link_type;
@@ -415,20 +421,29 @@ vrrp_intf_enable_disable_mcast (u8 enable, u32 sw_if_index, u8 is_ipv6)
   via_itf.frp_proto = fib_proto_to_dpo (proto);
   fib_index = mfib_table_get_index_for_sw_if_index (proto, sw_if_index);
 
+  vec_foreach_index (i, vrm->vrrp_intfs)
+    {
+      if (mfib_table_get_index_for_sw_if_index (proto, i) != fib_index)
+       continue;
+
+      n_vrs_in_fib += vrrp_intf_num_vrs (i, is_ipv6);
+    }
+
   if (enable)
     {
-      if (pool_elts (vrm->vrs) == 1)
-       mfib_table_entry_path_update (fib_index, vrrp_prefix, MFIB_SOURCE_API,
-                                     &for_us);
+      /* ensure that the local mcast route exists */
+      mfib_table_entry_path_update (fib_index, vrrp_prefix, MFIB_SOURCE_API,
+                                   MFIB_ENTRY_FLAG_NONE, &for_us);
 
       mfib_table_entry_path_update (fib_index, vrrp_prefix, MFIB_SOURCE_API,
-                                   &via_itf);
+                                   MFIB_ENTRY_FLAG_NONE, &via_itf);
       intf->mcast_adj_index[! !is_ipv6] =
        adj_mcast_add_or_lock (proto, link_type, sw_if_index);
     }
   else
     {
-      if (pool_elts (vrm->vrs) == 0)
+      /* Remove mcast local routes if this is the last VR being deleted */
+      if (n_vrs_in_fib == 0)
        mfib_table_entry_path_remove (fib_index, vrrp_prefix, MFIB_SOURCE_API,
                                      &for_us);
 
@@ -679,6 +694,7 @@ vrrp_vr_add_del (u8 is_add, vrrp_vr_config_t * vr_conf)
       vrrp_vr_tracking_ifs_add_del (vr, vr->tracking.interfaces, is_add);
       vrrp_vr_addrs_add_del (vr, is_add, vr->config.vr_addrs);
       mhash_unset (&vrm->vr_index_by_key, &key, 0);
+      vec_free (vr->config.peer_addrs);
       vec_free (vr->config.vr_addrs);
       vec_free (vr->tracking.interfaces);
       pool_put (vrm->vrs, vr);