L2: no-flood interface type in the Bridge-Domain

[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 6e0db05..7c8aef1 100644 (file)
--- a/src/vnet/l2/l2_bd.c
+++ b/src/vnet/l2/l2_bd.c
@@ -108,6 +108,9 @@ bd_delete (bd_main_t * bdm, u32 bd_index)
   bd->bd_id = ~0;
   bd->feature_bitmap = 0;
 
+  /* free BD tag */
+  vec_free (bd->bd_tag);
+
   /* free memory used by BD */
   vec_free (bd->members);
   hash_free (bd->mac_by_ip4);
@@ -125,38 +128,46 @@ bd_delete (bd_main_t * bdm, u32 bd_index)
 static void
 update_flood_count (l2_bridge_domain_t * bd_config)
 {
-  bd_config->flood_count = vec_len (bd_config->members) -
-    (bd_config->tun_master_count ? bd_config->tun_normal_count : 0);
+  bd_config->flood_count = (vec_len (bd_config->members) -
+                           (bd_config->tun_master_count ?
+                            bd_config->tun_normal_count : 0));
+  bd_config->flood_count -= bd_config->no_flood_count;
 }
 
 void
 bd_add_member (l2_bridge_domain_t * bd_config, l2_flood_member_t * member)
 {
-  u32 ix;
+  u32 ix = 0;
   vnet_sw_interface_t *sw_if = vnet_get_sw_interface
     (vnet_get_main (), member->sw_if_index);
 
   /*
    * Add one element to the vector
-   * vector is ordered [ bvi, normal/tun_masters..., tun_normals... ]
+   * vector is ordered [ bvi, normal/tun_masters..., tun_normals... no_flood]
    * When flooding, the bvi interface (if present) must be the last member
    * processed due to how BVI processing can change the packet. To enable
    * this order, we make the bvi interface the first in the vector and
-   * flooding walks the vector in reverse.
+   * flooding walks the vector in reverse. The flood-count determines where
+   * in the member list to start the walk from.
    */
   switch (sw_if->flood_class)
     {
+    case VNET_FLOOD_CLASS_NO_FLOOD:
+      bd_config->no_flood_count++;
+      ix = vec_len (bd_config->members);
+      break;
+    case VNET_FLOOD_CLASS_BVI:
+      ix = 0;
+      break;
     case VNET_FLOOD_CLASS_TUNNEL_MASTER:
       bd_config->tun_master_count++;
       /* Fall through */
-    default:
-      /* Fall through */
     case VNET_FLOOD_CLASS_NORMAL:
-      ix = (member->flags & L2_FLOOD_MEMBER_BVI) ? 0 :
-       vec_len (bd_config->members) - bd_config->tun_normal_count;
+      ix = (vec_len (bd_config->members) -
+           bd_config->tun_normal_count - bd_config->no_flood_count);
       break;
     case VNET_FLOOD_CLASS_TUNNEL_NORMAL:
-      ix = vec_len (bd_config->members);
+      ix = (vec_len (bd_config->members) - bd_config->no_flood_count);
       bd_config->tun_normal_count++;
       break;
     }
@@ -288,6 +299,32 @@ bd_set_mac_age (vlib_main_t * vm, u32 bd_index, u8 age)
                             L2_MAC_AGE_PROCESS_EVENT_STOP, 0);
 }
 
+/**
+    Set the tag for the bridge domain.
+*/
+
+static void
+bd_set_bd_tag (vlib_main_t * vm, u32 bd_index, u8 * bd_tag)
+{
+  u8 *old;
+  l2_bridge_domain_t *bd_config;
+  vec_validate (l2input_main.bd_configs, bd_index);
+  bd_config = vec_elt_at_index (l2input_main.bd_configs, bd_index);
+
+  old = bd_config->bd_tag;
+
+  if (bd_tag[0])
+    {
+      bd_config->bd_tag = format (0, "%s%c", bd_tag, 0);
+    }
+  else
+    {
+      bd_config->bd_tag = NULL;
+    }
+
+  vec_free (old);
+}
+
 /**
    Set bridge-domain learn enable/disable.
    The CLI format is:
@@ -906,6 +943,7 @@ bd_show (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd)
   u32 detail = 0;
   u32 intf = 0;
   u32 arp = 0;
+  u32 bd_tag = 0;
   u32 bd_id = ~0;
   uword *p;
 
@@ -922,6 +960,8 @@ bd_show (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd)
        intf = 1;
       if (unformat (input, "arp"))
        arp = 1;
+      if (unformat (input, "bd-tag"))
+       bd_tag = 1;
 
       if (bd_id == 0)
        return clib_error_return (0,
@@ -1039,6 +1079,12 @@ bd_show (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd)
               }));
               /* *INDENT-ON* */
            }
+
+         if ((detail || bd_tag) && (bd_config->bd_tag))
+           {
+             vlib_cli_output (vm, "\n  BD-Tag: %s", bd_config->bd_tag);
+
+           }
        }
     }
   vec_free (as);
@@ -1080,7 +1126,7 @@ done:
 /* *INDENT-OFF* */
 VLIB_CLI_COMMAND (bd_show_cli, static) = {
   .path = "show bridge-domain",
-  .short_help = "show bridge-domain [bridge-domain-id [detail|int|arp]]",
+  .short_help = "show bridge-domain [bridge-domain-id [detail|int|arp|bd-tag]]",
   .function = bd_show,
 };
 /* *INDENT-ON* */
@@ -1134,6 +1180,10 @@ bd_add_del (l2_bridge_domain_add_del_args_t * a)
        bd_set_flags (vm, bd_index, disable_flags, 0 /* disable */ );
 
       bd_set_mac_age (vm, bd_index, a->mac_age);
+
+      if (a->bd_tag)
+       bd_set_bd_tag (vm, bd_index, a->bd_tag);
+
     }
   else
     {
@@ -1152,8 +1202,8 @@ bd_add_del (l2_bridge_domain_add_del_args_t * a)
 /**
    Create or delete bridge-domain.
    The CLI format:
-   create bridge-domain <bd_index> [learn <0|1>] [forward <0|1>] [uu-flood <0|1>]
-                                   [flood <0|1>] [arp-term <0|1>] [mac-age <nn>] [del]
+   create bridge-domain <bd_index> [learn <0|1>] [forward <0|1>] [uu-flood <0|1>] [flood <0|1>]
+                                       [arp-term <0|1>] [mac-age <nn>] [bd-tag <tag>] [del]
 */
 
 static clib_error_t *
@@ -1166,6 +1216,7 @@ bd_add_del_command_fn (vlib_main_t * vm, unformat_input_t * input,
   u32 bd_id = ~0;
   u32 flood = 1, forward = 1, learn = 1, uu_flood = 1, arp_term = 0;
   u32 mac_age = 0;
+  u8 *bd_tag = NULL;
   l2_bridge_domain_add_del_args_t _a, *a = &_a;
   int rv;
 
@@ -1189,6 +1240,8 @@ bd_add_del_command_fn (vlib_main_t * vm, unformat_input_t * input,
        ;
       else if (unformat (line_input, "mac-age %d", &mac_age))
        ;
+      else if (unformat (line_input, "bd-tag %s", &bd_tag))
+       ;
       else if (unformat (line_input, "del"))
        {
          is_add = 0;
@@ -1215,6 +1268,11 @@ bd_add_del_command_fn (vlib_main_t * vm, unformat_input_t * input,
       error = clib_error_return (0, "mac age must be less than 256");
       goto done;
     }
+  if ((bd_tag) && (strlen ((char *) bd_tag) > 63))
+    {
+      error = clib_error_return (0, "bd-tag cannot be longer than 63");
+      goto done;
+    }
 
   memset (a, 0, sizeof (*a));
   a->is_add = is_add;
@@ -1225,6 +1283,7 @@ bd_add_del_command_fn (vlib_main_t * vm, unformat_input_t * input,
   a->learn = (u8) learn;
   a->arp_term = (u8) arp_term;
   a->mac_age = (u8) mac_age;
+  a->bd_tag = bd_tag;
 
   rv = bd_add_del (a);
 
@@ -1252,6 +1311,7 @@ bd_add_del_command_fn (vlib_main_t * vm, unformat_input_t * input,
     }
 
 done:
+  vec_free (bd_tag);
   unformat_free (line_input);
 
   return error;
@@ -1291,7 +1351,7 @@ VLIB_CLI_COMMAND (bd_create_cli, static) = {
   .path = "create bridge-domain",
   .short_help = "create bridge-domain <bridge-domain-id>"
                 " [learn <0|1>] [forward <0|1>] [uu-flood <0|1>] [flood <0|1>] [arp-term <0|1>]"
-                " [mac-age <nn>] [del]",
+                " [mac-age <nn>] [bd-tag <tag>] [del]",
   .function = bd_add_del_command_fn,
 };
 /* *INDENT-ON* */