l2fib: MAC: Fix uint64 to u8 byte array

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

diff --git a/src/vnet/l2/l2_input.c b/src/vnet/l2/l2_input.c
index 9a3148c..f60dd18 100644 (file)
--- a/src/vnet/l2/l2_input.c
+++ b/src/vnet/l2/l2_input.c
@@ -60,6 +60,29 @@ l2input_get_feat_names (void)
   return l2input_feat_names;
 }
 
+u8 *
+format_l2_input_features (u8 * s, va_list * args)
+{
+  static char *display_names[] = {
+#define _(sym,name) #sym,
+    foreach_l2input_feat
+#undef _
+  };
+  u32 feature_bitmap = va_arg (*args, u32);
+
+  if (feature_bitmap == 0)
+    {
+      s = format (s, "  none configured");
+      return s;
+    }
+
+  feature_bitmap &= ~L2INPUT_FEAT_DROP;        /* Not a feature */
+  int i;
+  for (i = L2INPUT_N_FEAT; i >= 0; i--)
+    if (feature_bitmap & (1 << i))
+      s = format (s, "%10s (%s)\n", display_names[i], l2input_feat_names[i]);
+  return s;
+}
 
 typedef struct
 {
@@ -115,10 +138,7 @@ typedef enum
 
 
 static_always_inline void
-classify_and_dispatch (vlib_main_t * vm,
-                      vlib_node_runtime_t * node,
-                      u32 thread_index,
-                      l2input_main_t * msm, vlib_buffer_t * b0, u32 * next0)
+classify_and_dispatch (l2input_main_t * msm, vlib_buffer_t * b0, u32 * next0)
 {
   /*
    * Load L2 input feature struct
@@ -187,12 +207,7 @@ classify_and_dispatch (vlib_main_t * vm,
     }
 
 
-  if (config->xconnect)
-    {
-      /* Set the output interface */
-      vnet_buffer (b0)->sw_if_index[VLIB_TX] = config->output_sw_if_index;
-    }
-  else
+  if (config->bridge)
     {
       /* Do bridge-domain processing */
       bd_index0 = config->bd_index;
@@ -210,6 +225,7 @@ classify_and_dispatch (vlib_main_t * vm,
       };
       /* *INDENT-ON* */
       vnet_buffer (b0)->l2.l2fib_sn = sn.as_u16;;
+      vnet_buffer (b0)->l2.bd_age = bd_config->mac_age;
 
       /*
        * Process bridge domain feature enables.
@@ -220,6 +236,13 @@ classify_and_dispatch (vlib_main_t * vm,
        */
       feat_mask = feat_mask & bd_config->feature_bitmap;
     }
+  else if (config->xconnect)
+    {
+      /* Set the output interface */
+      vnet_buffer (b0)->sw_if_index[VLIB_TX] = config->output_sw_if_index;
+    }
+  else
+    feat_mask = L2INPUT_FEAT_DROP;
 
   /* mask out features from bitmap using packet type and bd config */
   feature_bitmap = config->feature_bitmap & feat_mask;
@@ -240,7 +263,6 @@ l2input_node_inline (vlib_main_t * vm,
   u32 n_left_from, *from, *to_next;
   l2input_next_t next_index;
   l2input_main_t *msm = &l2input_main;
-  u32 thread_index = vlib_get_thread_index ();
 
   from = vlib_frame_vector_args (frame);
   n_left_from = frame->n_vectors;      /* number of packets to process */
@@ -353,10 +375,10 @@ l2input_node_inline (vlib_main_t * vm,
          vlib_node_increment_counter (vm, l2input_node.index,
                                       L2INPUT_ERROR_L2INPUT, 4);
 
-         classify_and_dispatch (vm, node, thread_index, msm, b0, &next0);
-         classify_and_dispatch (vm, node, thread_index, msm, b1, &next1);
-         classify_and_dispatch (vm, node, thread_index, msm, b2, &next2);
-         classify_and_dispatch (vm, node, thread_index, msm, b3, &next3);
+         classify_and_dispatch (msm, b0, &next0);
+         classify_and_dispatch (msm, b1, &next1);
+         classify_and_dispatch (msm, b2, &next2);
+         classify_and_dispatch (msm, b3, &next3);
 
          /* verify speculative enqueues, maybe switch current next frame */
          /* if next0==next1==next_index then nothing special needs to be done */
@@ -396,7 +418,7 @@ l2input_node_inline (vlib_main_t * vm,
          vlib_node_increment_counter (vm, l2input_node.index,
                                       L2INPUT_ERROR_L2INPUT, 1);
 
-         classify_and_dispatch (vm, node, thread_index, msm, b0, &next0);
+         classify_and_dispatch (msm, b0, &next0);
 
          /* verify speculative enqueue, maybe switch current next frame */
          vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
@@ -528,7 +550,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;
-  u64 mac;
   i32 l2_if_adjust = 0;
   u32 slot;
 
@@ -550,8 +571,7 @@ set_int_l2_mode (vlib_main_t * vm, vnet_main_t * vnet_main, /*           */
          config->bvi = 0;
 
          /* delete the l2fib entry for the bvi interface */
-         mac = *((u64 *) hi->hw_address);
-         l2fib_del_entry (mac, config->bd_index);
+         l2fib_del_entry (hi->hw_address, config->bd_index);
 
          /* Make loop output node send packet back to ethernet-input node */
          slot =
@@ -574,8 +594,8 @@ set_int_l2_mode (vlib_main_t * vm, vnet_main_t * vnet_main, /*           */
     }
 
   /* Make sure vector is big enough */
-  vec_validate_init_empty (l2om->next_nodes.output_node_index_vec,
-                          sw_if_index, L2OUTPUT_NEXT_DROP);
+  vec_validate_init_empty (l2om->output_node_index_vec, sw_if_index,
+                          L2OUTPUT_NEXT_DROP);
 
   /* Initialize the l2-input configuration for the interface */
   if (mode == MODE_L3)
@@ -594,8 +614,7 @@ set_int_l2_mode (vlib_main_t * vm, vnet_main_t * vnet_main, /*           */
 
       /* Make sure any L2-output packet to this interface now in L3 mode is
        * dropped. This may happen if L2 FIB MAC entry is stale */
-      l2om->next_nodes.output_node_index_vec[sw_if_index] =
-       L2OUTPUT_NEXT_BAD_INTF;
+      l2om->output_node_index_vec[sw_if_index] = L2OUTPUT_NEXT_BAD_INTF;
     }
   else
     {
@@ -618,7 +637,7 @@ set_int_l2_mode (vlib_main_t * vm, vnet_main_t * vnet_main, /*           */
          config->xconnect = 0;
          config->bridge = 1;
          config->bd_index = bd_index;
-         *l2fib_swif_seq_num (sw_if_index) += 1;
+         *l2fib_valid_swif_seq_num (sw_if_index) += 1;
 
          /*
           * Enable forwarding, flooding, learning and ARP termination by default
@@ -651,8 +670,7 @@ set_int_l2_mode (vlib_main_t * vm, vnet_main_t * vnet_main, /*           */
              config->bvi = 1;
 
              /* create the l2fib entry for the bvi interface */
-             mac = *((u64 *) hi->hw_address);
-             l2fib_add_fwd_entry (mac, bd_index, sw_if_index, 1, 1);   /* static + bvi */
+             l2fib_add_fwd_entry (hi->hw_address, bd_index, sw_if_index, 1, 1);        /* static + bvi */
 
              /* Disable learning by default. no use since l2fib entry is static. */
              config->feature_bitmap &= ~L2INPUT_FEAT_LEARN;