Add support for API client to receive L2 MAC events

[vpp.git] / src / vnet / l2 / l2_bd.c

diff --git a/src/vnet/l2/l2_bd.c b/src/vnet/l2/l2_bd.c
index 4d54022..6e0db05 100644 (file)
--- a/src/vnet/l2/l2_bd.c
+++ b/src/vnet/l2/l2_bd.c
@@ -94,8 +94,11 @@ bd_delete (bd_main_t * bdm, u32 bd_index)
 {
   l2_bridge_domain_t *bd = &l2input_main.bd_configs[bd_index];
   u32 bd_id = bd->bd_id;
-  l2fib_flush_bd_mac (vlib_get_main (), bd_index);
+  u64 mac_addr;
+  ip6_address_t *ip6_addr_key;
 
+  /* flush non-static MACs in BD and removed bd_id from hash table */
+  l2fib_flush_bd_mac (vlib_get_main (), bd_index);
   hash_unset (bdm->bd_index_by_bd_id, bd_id);
 
   /* mark this index clear */
@@ -105,9 +108,15 @@ bd_delete (bd_main_t * bdm, u32 bd_index)
   bd->bd_id = ~0;
   bd->feature_bitmap = 0;
 
-  /* free memory used by BD and flush non-static MACs in BD */
+  /* free memory used by BD */
   vec_free (bd->members);
   hash_free (bd->mac_by_ip4);
+  /* *INDENT-OFF* */
+  hash_foreach_mem (ip6_addr_key, mac_addr, bd->mac_by_ip6,
+  ({
+    clib_mem_free (ip6_addr_key); /* free memory used for ip6 addr key */
+  }));
+  /* *INDENT-ON* */
   hash_free (bd->mac_by_ip6);
 
   return 0;
@@ -254,7 +263,7 @@ bd_set_flags (vlib_main_t * vm, u32 bd_index, u32 flags, u32 enable)
       bd_config->feature_bitmap &= ~feature_bitmap;
     }
 
-  return 0;
+  return bd_config->feature_bitmap;
 }
 
 /**
@@ -319,12 +328,7 @@ bd_learn (vlib_main_t * vm,
     }
 
   /* set the bridge domain flag */
-  if (bd_set_flags (vm, bd_index, L2_LEARN, enable))
-    {
-      error =
-       clib_error_return (0, "bridge-domain id %d out of range", bd_index);
-      goto done;
-    }
+  bd_set_flags (vm, bd_index, L2_LEARN, enable);
 
 done:
   return error;
@@ -388,12 +392,7 @@ bd_fwd (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd)
     }
 
   /* set the bridge domain flag */
-  if (bd_set_flags (vm, bd_index, L2_FWD, enable))
-    {
-      error =
-       clib_error_return (0, "bridge-domain id %d out of range", bd_index);
-      goto done;
-    }
+  bd_set_flags (vm, bd_index, L2_FWD, enable);
 
 done:
   return error;
@@ -459,12 +458,7 @@ bd_flood (vlib_main_t * vm,
     }
 
   /* set the bridge domain flag */
-  if (bd_set_flags (vm, bd_index, L2_FLOOD, enable))
-    {
-      error =
-       clib_error_return (0, "bridge-domain id %d out of range", bd_index);
-      goto done;
-    }
+  bd_set_flags (vm, bd_index, L2_FLOOD, enable);
 
 done:
   return error;
@@ -529,12 +523,7 @@ bd_uu_flood (vlib_main_t * vm,
     }
 
   /* set the bridge domain flag */
-  if (bd_set_flags (vm, bd_index, L2_UU_FLOOD, enable))
-    {
-      error =
-       clib_error_return (0, "bridge-domain id %d out of range", bd_index);
-      goto done;
-    }
+  bd_set_flags (vm, bd_index, L2_UU_FLOOD, enable);
 
 done:
   return error;
@@ -596,12 +585,7 @@ bd_arp_term (vlib_main_t * vm,
     enable = 0;
 
   /* set the bridge domain flag */
-  if (bd_set_flags (vm, bd_index, L2_ARP_TERM, enable))
-    {
-      error =
-       clib_error_return (0, "bridge-domain id %d out of range", bd_index);
-      goto done;
-    }
+  bd_set_flags (vm, bd_index, L2_ARP_TERM, enable);
 
 done:
   return error;
@@ -975,10 +959,10 @@ bd_show (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd)
            {
              printed = 1;
              vlib_cli_output (vm,
-                              "%=5s %=7s %=4s %=9s %=9s %=9s %=9s %=9s %=9s %=9s",
-                              "ID", "Index", "BSN", "Age(min)", "Learning",
-                              "U-Forwrd", "UU-Flood", "Flooding", "ARP-Term",
-                              "BVI-Intf");
+                              "%=8s %=7s %=4s %=9s %=9s %=9s %=9s %=9s %=9s %=9s",
+                              "BD-ID", "Index", "BSN", "Age(min)",
+                              "Learning", "U-Forwrd", "UU-Flood", "Flooding",
+                              "ARP-Term", "BVI-Intf");
            }
 
          if (bd_config->mac_age)
@@ -986,7 +970,7 @@ bd_show (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd)
          else
            as = format (as, "off");
          vlib_cli_output (vm,
-                          "%=5d %=7d %=4d %=9v %=9s %=9s %=9s %=9s %=9s %=9U",
+                          "%=8d %=7d %=4d %=9v %=9s %=9s %=9s %=9s %=9s %=9U",
                           bd_config->bd_id, bd_index, bd_config->seq_num, as,
                           bd_config->feature_bitmap & L2INPUT_FEAT_LEARN ?
                           "on" : "off",
@@ -1010,8 +994,7 @@ bd_show (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd)
              {
                l2_flood_member_t *member =
                  vec_elt_at_index (bd_config->members, i);
-               l2_input_config_t *int_config =
-                 l2input_intf_config (member->sw_if_index);
+               u8 swif_seq_num = *l2fib_swif_seq_num (member->sw_if_index);
                u32 vtr_opr, dot1q, tag1, tag2;
                if (i == 0)
                  {
@@ -1024,7 +1007,7 @@ bd_show (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd)
                vlib_cli_output (vm, "%=30U%=7d%=5d%=5d%=5s%=9s%=30U",
                                 format_vnet_sw_if_index_name, vnm,
                                 member->sw_if_index, member->sw_if_index,
-                                int_config->seq_num, member->shg,
+                                swif_seq_num, member->shg,
                                 member->flags & L2_FLOOD_MEMBER_BVI ? "*" :
                                 "-", i < bd_config->flood_count ? "*" : "-",
                                 format_vtr, vtr_opr, dot1q, tag1, tag2);
@@ -1114,6 +1097,8 @@ bd_add_del (l2_bridge_domain_add_del_args_t * a)
     {
       if (bd_index != ~0)
        return VNET_API_ERROR_BD_ALREADY_EXISTS;
+      if (a->bd_id > L2_BD_ID_MAX)
+       return VNET_API_ERROR_BD_ID_EXCEED_MAX;
       bd_index = bd_add_bd_index (bdm, a->bd_id);
 
       u32 enable_flags = 0, disable_flags = 0;
@@ -1253,11 +1238,14 @@ bd_add_del_command_fn (vlib_main_t * vm, unformat_input_t * input,
       error = clib_error_return (0, "bridge domain in use - remove members");
       goto done;
     case VNET_API_ERROR_NO_SUCH_ENTRY:
-      error = clib_error_return (0, "bridge domain id does not exist");
+      error = clib_error_return (0, "bridge domain ID does not exist");
       goto done;
     case VNET_API_ERROR_BD_NOT_MODIFIABLE:
       error = clib_error_return (0, "bridge domain 0 can not be modified");
       goto done;
+    case VNET_API_ERROR_BD_ID_EXCEED_MAX:
+      error = clib_error_return (0, "bridge domain ID exceed 16M limit");
+      goto done;
     default:
       error = clib_error_return (0, "bd_add_del returned %d", rv);
       goto done;