BD/API:add bridge_domain_set_mac_age api

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

diff --git a/src/vnet/l2/l2_api.c b/src/vnet/l2/l2_api.c
index a3cc49b..ffcc790 100644 (file)
--- a/src/vnet/l2/l2_api.c
+++ b/src/vnet/l2/l2_api.c
@@ -48,16 +48,14 @@
 _(L2_XCONNECT_DUMP, l2_xconnect_dump)                       \
 _(L2_FIB_CLEAR_TABLE, l2_fib_clear_table)                   \
 _(L2_FIB_TABLE_DUMP, l2_fib_table_dump)                     \
-_(L2_FIB_TABLE_ENTRY, l2_fib_table_entry)                   \
 _(L2FIB_ADD_DEL, l2fib_add_del)                             \
 _(L2_FLAGS, l2_flags)                                       \
 _(BRIDGE_DOMAIN_ADD_DEL, bridge_domain_add_del)             \
 _(BRIDGE_DOMAIN_DUMP, bridge_domain_dump)                   \
-_(BRIDGE_DOMAIN_DETAILS, bridge_domain_details)             \
-_(BRIDGE_DOMAIN_SW_IF_DETAILS, bridge_domain_sw_if_details) \
 _(BRIDGE_FLAGS, bridge_flags)                               \
 _(L2_INTERFACE_VLAN_TAG_REWRITE, l2_interface_vlan_tag_rewrite) \
-_(L2_INTERFACE_PBB_TAG_REWRITE, l2_interface_pbb_tag_rewrite)
+_(L2_INTERFACE_PBB_TAG_REWRITE, l2_interface_pbb_tag_rewrite) \
+_(BRIDGE_DOMAIN_SET_MAC_AGE, bridge_domain_set_mac_age)
 
 static void
 send_l2_xconnect_details (unix_shared_memory_queue_t * q, u32 context,
@@ -140,12 +138,6 @@ send_l2fib_table_entry (vpe_api_main_t * am,
   vl_msg_api_send_shmem (q, (u8 *) & mp);
 }
 
-static void
-vl_api_l2_fib_table_entry_t_handler (vl_api_l2_fib_table_entry_t * mp)
-{
-  clib_warning ("BUG");
-}
-
 static void
 vl_api_l2_fib_table_dump_t_handler (vl_api_l2_fib_table_dump_t * mp)
 {
@@ -253,17 +245,13 @@ vl_api_l2_flags_t_handler (vl_api_l2_flags_t * mp)
 {
   vl_api_l2_flags_reply_t *rmp;
   int rv = 0;
-  u32 sw_if_index = ntohl (mp->sw_if_index);
-  u32 flags = ntohl (mp->feature_bitmap);
   u32 rbm = 0;
 
   VALIDATE_SW_IF_INDEX (mp);
 
-#define _(a,b) \
-    if (flags & L2INPUT_FEAT_ ## a) \
-        rbm = l2input_intf_bitmap_enable (sw_if_index, L2INPUT_FEAT_ ## a, mp->is_set);
-  foreach_l2input_feat;
-#undef _
+  u32 sw_if_index = ntohl (mp->sw_if_index);
+  u32 flags = ntohl (mp->feature_bitmap) & L2INPUT_VALID_MASK;
+  rbm = l2input_intf_bitmap_enable (sw_if_index, flags, mp->is_set);
 
   BAD_SW_IF_INDEX_LABEL;
 
@@ -275,6 +263,26 @@ vl_api_l2_flags_t_handler (vl_api_l2_flags_t * mp)
   /* *INDENT-ON* */
 }
 
+static void
+vl_api_bridge_domain_set_mac_age_t_handler (vl_api_bridge_domain_set_mac_age_t
+                                           * mp)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  bd_main_t *bdm = &bd_main;
+  vl_api_bridge_domain_set_mac_age_reply_t *rmp;
+  int rv = 0;
+  u32 bd_id = ntohl (mp->bd_id);
+  uword *p = hash_get (bdm->bd_index_by_bd_id, bd_id);
+  if (p == 0)
+    {
+      rv = VNET_API_ERROR_NO_SUCH_ENTRY;
+      goto out;
+    }
+  bd_set_mac_age (vm, *p, mp->mac_age);
+out:
+  REPLY_MACRO (VL_API_BRIDGE_DOMAIN_SET_MAC_AGE_REPLY);
+}
+
 static void
 vl_api_bridge_domain_add_del_t_handler (vl_api_bridge_domain_add_del_t * mp)
 {
@@ -329,19 +337,6 @@ vl_api_bridge_domain_add_del_t_handler (vl_api_bridge_domain_add_del_t * mp)
   REPLY_MACRO (VL_API_BRIDGE_DOMAIN_ADD_DEL_REPLY);
 }
 
-static void
-vl_api_bridge_domain_details_t_handler (vl_api_bridge_domain_details_t * mp)
-{
-  clib_warning ("BUG");
-}
-
-static void
-  vl_api_bridge_domain_sw_if_details_t_handler
-  (vl_api_bridge_domain_sw_if_details_t * mp)
-{
-  clib_warning ("BUG");
-}
-
 static void
 send_bridge_domain_details (unix_shared_memory_queue_t * q,
                            l2_bridge_domain_t * bd_config,