Dedicated SW Interface Event

[vpp.git] / src / vat / api_format.c

diff --git a/src/vat/api_format.c b/src/vat/api_format.c
index f97cdee..ddcd562 100644 (file)
--- a/src/vat/api_format.c
+++ b/src/vat/api_format.c
@@ -972,8 +972,8 @@ static void vl_api_sw_interface_details_t_handler_json
 }
 
 #if VPP_API_TEST_BUILTIN == 0
-static void vl_api_sw_interface_set_flags_t_handler
-  (vl_api_sw_interface_set_flags_t * mp)
+static void vl_api_sw_interface_event_t_handler
+  (vl_api_sw_interface_event_t * mp)
 {
   vat_main_t *vam = &vat_main;
   if (vam->interface_event_display)
@@ -984,8 +984,8 @@ static void vl_api_sw_interface_set_flags_t_handler
 }
 #endif
 
-static void vl_api_sw_interface_set_flags_t_handler_json
-  (vl_api_sw_interface_set_flags_t * mp)
+static void vl_api_sw_interface_event_t_handler_json
+  (vl_api_sw_interface_event_t * mp)
 {
   /* JSON output not supported */
 }
@@ -5026,7 +5026,7 @@ _(LLDP_CONFIG_REPLY, lldp_config_reply)                                 \
 _(SW_INTERFACE_SET_LLDP_REPLY, sw_interface_set_lldp_reply)
 
 #define foreach_standalone_reply_msg                                   \
-_(SW_INTERFACE_SET_FLAGS, sw_interface_set_flags)                       \
+_(SW_INTERFACE_EVENT, sw_interface_event)                               \
 _(VNET_INTERFACE_SIMPLE_COUNTERS, vnet_interface_simple_counters)       \
 _(VNET_INTERFACE_COMBINED_COUNTERS, vnet_interface_combined_counters)   \
 _(VNET_IP4_FIB_COUNTERS, vnet_ip4_fib_counters)                         \
@@ -5772,7 +5772,7 @@ api_sw_interface_set_flags (vat_main_t * vam)
   vl_api_sw_interface_set_flags_t *mp;
   u32 sw_if_index;
   u8 sw_if_index_set = 0;
-  u8 admin_up = 0, link_up = 0;
+  u8 admin_up = 0;
   int ret;
 
   /* Parse args required to build the message */
@@ -5782,10 +5782,6 @@ api_sw_interface_set_flags (vat_main_t * vam)
        admin_up = 1;
       else if (unformat (i, "admin-down"))
        admin_up = 0;
-      else if (unformat (i, "link-up"))
-       link_up = 1;
-      else if (unformat (i, "link-down"))
-       link_up = 0;
       else
        if (unformat (i, "%U", api_unformat_sw_if_index, vam, &sw_if_index))
        sw_if_index_set = 1;
@@ -5805,7 +5801,6 @@ api_sw_interface_set_flags (vat_main_t * vam)
   M (SW_INTERFACE_SET_FLAGS, mp);
   mp->sw_if_index = ntohl (sw_if_index);
   mp->admin_up_down = admin_up;
-  mp->link_up_down = link_up;
 
   /* send it... */
   S (mp);
@@ -7498,7 +7493,7 @@ api_mpls_route_add_del (vat_main_t * vam)
   mpls_label_t *next_hop_out_label_stack = NULL;
   mpls_label_t local_label = MPLS_LABEL_INVALID;
   u8 is_eos = 0;
-  u8 next_hop_proto_is_ip4 = 1;
+  dpo_proto_t next_hop_proto = DPO_PROTO_IP4;
 
   /* Parse args required to build the message */
   while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
@@ -7517,13 +7512,13 @@ api_mpls_route_add_del (vat_main_t * vam)
                         &v4_next_hop_address))
        {
          next_hop_set = 1;
-         next_hop_proto_is_ip4 = 1;
+         next_hop_proto = DPO_PROTO_IP4;
        }
       else if (unformat (i, "via %U", unformat_ip6_address,
                         &v6_next_hop_address))
        {
          next_hop_set = 1;
-         next_hop_proto_is_ip4 = 0;
+         next_hop_proto = DPO_PROTO_IP6;
        }
       else if (unformat (i, "weight %d", &next_hop_weight))
        ;
@@ -7548,12 +7543,12 @@ api_mpls_route_add_del (vat_main_t * vam)
       else if (unformat (i, "lookup-in-ip4-table %d", &next_hop_table_id))
        {
          next_hop_set = 1;
-         next_hop_proto_is_ip4 = 1;
+         next_hop_proto = DPO_PROTO_IP4;
        }
       else if (unformat (i, "lookup-in-ip6-table %d", &next_hop_table_id))
        {
          next_hop_set = 1;
-         next_hop_proto_is_ip4 = 0;
+         next_hop_proto = DPO_PROTO_IP6;
        }
       else if (unformat (i, "next-hop-table %d", &next_hop_table_id))
        ;
@@ -7599,7 +7594,7 @@ api_mpls_route_add_del (vat_main_t * vam)
       mp->mr_create_table_if_needed = create_table_if_needed;
 
       mp->mr_is_add = is_add;
-      mp->mr_next_hop_proto_is_ip4 = next_hop_proto_is_ip4;
+      mp->mr_next_hop_proto = next_hop_proto;
       mp->mr_is_classify = is_classify;
       mp->mr_is_multipath = is_multipath;
       mp->mr_is_resolve_host = resolve_host;
@@ -7622,13 +7617,14 @@ api_mpls_route_add_del (vat_main_t * vam)
 
       if (next_hop_set)
        {
-         if (next_hop_proto_is_ip4)
+         if (DPO_PROTO_IP4 == next_hop_proto)
            {
              clib_memcpy (mp->mr_next_hop,
                           &v4_next_hop_address,
                           sizeof (v4_next_hop_address));
            }
-         else
+         else if (DPO_PROTO_IP6 == next_hop_proto)
+
            {
              clib_memcpy (mp->mr_next_hop,
                           &v6_next_hop_address,