From 3b0d7e42f65eaf8d84cfe26e2e9f5244c554b934 Mon Sep 17 00:00:00 2001 From: Ole Trøan Date: Fri, 15 Mar 2019 16:14:41 +0000 Subject: Revert "API: Cleanup APIs interface.api" This reverts commit e63325e3ca03c847963863446345e6c80a2c0cfd. Allow time for CSIT to accommodate. Change-Id: I59435e4ab5e05e36a2796c3bf44889b5d4823cc2 Signed-off-by: ot@cisco.com --- src/vpp/api/custom_dump.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) (limited to 'src/vpp') diff --git a/src/vpp/api/custom_dump.c b/src/vpp/api/custom_dump.c index fa7091d310e..ab98954abbc 100644 --- a/src/vpp/api/custom_dump.c +++ b/src/vpp/api/custom_dump.c @@ -112,7 +112,7 @@ static void *vl_api_sw_interface_set_flags_t_print s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index)); - if (ntohl (mp->flags) & IF_STATUS_API_FLAG_ADMIN_UP) + if (mp->admin_up_down) s = format (s, "admin-up "); else s = format (s, "admin-down "); @@ -159,12 +159,12 @@ static void *vl_api_sw_interface_event_t_print s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index)); - if (ntohl (mp->flags) & IF_STATUS_API_FLAG_ADMIN_UP) + if (mp->admin_up_down) s = format (s, "admin-up "); else s = format (s, "admin-down "); - if (ntohl (mp->flags) & IF_STATUS_API_FLAG_LINK_UP) + if (mp->link_up_down) s = format (s, "link-up"); else s = format (s, "link-down"); @@ -179,18 +179,17 @@ static void *vl_api_sw_interface_add_del_address_t_print (vl_api_sw_interface_add_del_address_t * mp, void *handle) { u8 *s; - ip46_address_t address; s = format (0, "SCRIPT: sw_interface_add_del_address "); s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index)); - if (ip_address_decode (&mp->prefix.address, &address) == IP46_TYPE_IP6) + if (mp->is_ipv6) s = format (s, "%U/%d ", format_ip6_address, - (ip6_address_t *) & address.ip6, mp->prefix.address_length); + (ip6_address_t *) mp->address, mp->address_length); else s = format (s, "%U/%d ", format_ip4_address, - (ip4_address_t *) & address.ip4, mp->prefix.address_length); + (ip4_address_t *) mp->address, mp->address_length); if (mp->is_add == 0) s = format (s, "del "); @@ -1061,15 +1060,15 @@ static void *vl_api_create_vlan_subif_t_print FINISH; } -#define foreach_create_subif_flag \ -_(0, "no_tags") \ -_(1, "one_tag") \ -_(2, "two_tags") \ -_(3, "dot1ad") \ -_(4, "exact_match") \ -_(5, "default_sub") \ -_(6, "outer_vlan_id_any") \ -_(7, "inner_vlan_id_any") +#define foreach_create_subif_bit \ +_(no_tags) \ +_(one_tag) \ +_(two_tags) \ +_(dot1ad) \ +_(exact_match) \ +_(default_sub) \ +_(outer_vlan_id_any) \ +_(inner_vlan_id_any) static void *vl_api_create_subif_t_print (vl_api_create_subif_t * mp, void *handle) @@ -1088,8 +1087,8 @@ static void *vl_api_create_subif_t_print if (mp->inner_vlan_id) s = format (s, "inner_vlan_id %d ", ntohs (mp->inner_vlan_id)); -#define _(a,b) if (mp->sub_if_flags & (1 << a)) s = format (s, "%s ", b); - foreach_create_subif_flag; +#define _(a) if (mp->a) s = format (s, "%s ", #a); + foreach_create_subif_bit; #undef _ FINISH; -- cgit 1.2.3-korg