X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fl2%2Fl2_input.c;h=aca23fe03fcfcb29689a85520d6a5d661bece3b9;hb=93992a9048cb6e5dcd22de5091e72de778122627;hp=e5d6878a7aef3378bc9507dd0be0c80eddb0361e;hpb=586afd762bfa149f5ca167bd5fd5a0cd59ce94fe;p=vpp.git

diff --git a/src/vnet/l2/l2_input.c b/src/vnet/l2/l2_input.c
index e5d6878a7ae..aca23fe03fc 100644
--- a/src/vnet/l2/l2_input.c
+++ b/src/vnet/l2/l2_input.c
@@ -202,8 +202,14 @@ classify_and_dispatch (vlib_main_t * vm,
       /* Get config for the bridge domain interface */
       bd_config = vec_elt_at_index (msm->bd_configs, bd_index0);
 
-      /* Save bridge domain seq_num */
-      vnet_buffer (b0)->l2.bd_sn = bd_config->seq_num;
+      /* Save bridge domain and interface seq_num */
+      /* *INDENT-OFF* */
+      l2fib_seq_num_t sn = {
+        .swif = config->seq_num,
+	.bd = bd_config->seq_num,
+      };
+      /* *INDENT-ON* */
+      vnet_buffer (b0)->l2.l2fib_sn = sn.as_u16;;
 
       /*
        * Process bridge domain feature enables.
@@ -218,9 +224,6 @@ classify_and_dispatch (vlib_main_t * vm,
   /* mask out features from bitmap using packet type and bd config */
   feature_bitmap = config->feature_bitmap & feat_mask;
 
-  /* Save interface seq_num */
-  vnet_buffer (b0)->l2.int_sn = config->seq_num;
-
   /* save for next feature graph nodes */
   vnet_buffer (b0)->l2.feature_bitmap = feature_bitmap;
 
@@ -481,20 +484,12 @@ l2input_intf_config (u32 sw_if_index)
 u32
 l2input_intf_bitmap_enable (u32 sw_if_index, u32 feature_bitmap, u32 enable)
 {
-  l2input_main_t *mp = &l2input_main;
-  l2_input_config_t *config;
-
-  vec_validate (mp->configs, sw_if_index);
-  config = vec_elt_at_index (mp->configs, sw_if_index);
+  l2_input_config_t *config = l2input_intf_config (sw_if_index);
 
   if (enable)
-    {
-      config->feature_bitmap |= feature_bitmap;
-    }
+    config->feature_bitmap |= feature_bitmap;
   else
-    {
-      config->feature_bitmap &= ~feature_bitmap;
-    }
+    config->feature_bitmap &= ~feature_bitmap;
 
   return config->feature_bitmap;
 }
@@ -502,9 +497,7 @@ l2input_intf_bitmap_enable (u32 sw_if_index, u32 feature_bitmap, u32 enable)
 u32
 l2input_set_bridge_features (u32 bd_index, u32 feat_mask, u32 feat_value)
 {
-  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);
+  l2_bridge_domain_t *bd_config = l2input_bd_config (bd_index);;
   bd_validate (bd_config);
   bd_config->feature_bitmap =
     (bd_config->feature_bitmap & ~feat_mask) | feat_value;
@@ -535,7 +528,6 @@ set_int_l2_mode (vlib_main_t * vm, vnet_main_t * vnet_main,	/*           */
   l2_output_config_t *out_config;
   l2_input_config_t *config;
   l2_bridge_domain_t *bd_config;
-  l2_flood_member_t member;
   u64 mac;
   i32 l2_if_adjust = 0;
   u32 slot;
@@ -570,8 +562,8 @@ set_int_l2_mode (vlib_main_t * vm, vnet_main_t * vnet_main,	/*           */
 	}
 
       /* Clear MACs learned on the interface */
-      if ((config->feature_bitmap | L2INPUT_FEAT_LEARN) ||
-	  (bd_config->feature_bitmap | L2INPUT_FEAT_LEARN))
+      if ((config->feature_bitmap & L2INPUT_FEAT_LEARN) ||
+	  (bd_config->feature_bitmap & L2INPUT_FEAT_LEARN))
 	l2fib_flush_int_mac (vm, sw_if_index);
 
       l2_if_adjust--;
@@ -661,8 +653,7 @@ set_int_l2_mode (vlib_main_t * vm, vnet_main_t * vnet_main,	/*           */
 	  config->feature_bitmap &= ~L2INPUT_FEAT_XCONNECT;
 
 	  /* Set up bridge domain */
-	  vec_validate (mp->bd_configs, bd_index);
-	  bd_config = vec_elt_at_index (mp->bd_configs, bd_index);
+	  bd_config = l2input_bd_config (bd_index);
 	  bd_validate (bd_config);
 
 	  /* TODO: think: add l2fib entry even for non-bvi interface? */
@@ -694,9 +685,11 @@ set_int_l2_mode (vlib_main_t * vm, vnet_main_t * vnet_main,	/*           */
 	    }
 
 	  /* Add interface to bridge-domain flood vector */
-	  member.sw_if_index = sw_if_index;
-	  member.flags = bvi ? L2_FLOOD_MEMBER_BVI : L2_FLOOD_MEMBER_NORMAL;
-	  member.shg = shg;
+	  l2_flood_member_t member = {
+	    .sw_if_index = sw_if_index,
+	    .flags = bvi ? L2_FLOOD_MEMBER_BVI : L2_FLOOD_MEMBER_NORMAL,
+	    .shg = shg,
+	  };
 	  bd_add_member (bd_config, &member);
 
 	}
@@ -798,6 +791,12 @@ int_l2_bridge (vlib_main_t * vm,
       goto done;
     }
 
+  if (bd_id > L2_BD_ID_MAX)
+    {
+      error = clib_error_return (0, "bridge domain ID exceed 16M limit",
+				 format_unformat_error, input);
+      goto done;
+    }
   bd_index = bd_find_or_add_bd_index (&bd_main, bd_id);
 
   /* optional bvi  */
@@ -997,10 +996,8 @@ show_int_mode (vlib_main_t * vm,
   char *mode;
   u8 *args;
   vnet_interface_main_t *im = &vnm->interface_main;
-  vnet_sw_interface_t *si, *sis = 0;
-  l2input_main_t *mp = &l2input_main;
-  l2_input_config_t *config;
 
+  vnet_sw_interface_t *si, *sis = 0;
   while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
     {
       u32 sw_if_index;
@@ -1018,7 +1015,6 @@ show_int_mode (vlib_main_t * vm,
 				     format_unformat_error, input);
 	  goto done;
 	}
-
     }
 
   if (vec_len (sis) == 0)	/* Get all interfaces */
@@ -1033,8 +1029,7 @@ show_int_mode (vlib_main_t * vm,
 
   vec_foreach (si, sis)
   {
-    vec_validate (mp->configs, si->sw_if_index);
-    config = vec_elt_at_index (mp->configs, si->sw_if_index);
+    l2_input_config_t *config = l2input_intf_config (si->sw_if_index);
     if (config->bridge)
       {
 	u32 bd_id;