X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvpp%2Fapi%2Fcustom_dump.c;h=0bd4fb8c4679ccff91aec9c3ccac7a8e0957601b;hb=3337bd22002e9b78459082c34f7b78370b177eb0;hp=e8d143b360947a527577334a830dfda53f628188;hpb=daff1784037376f4a5caec2f5975f9b5fc23d5a4;p=vpp.git diff --git a/src/vpp/api/custom_dump.c b/src/vpp/api/custom_dump.c index e8d143b3609..0bd4fb8c467 100644 --- a/src/vpp/api/custom_dump.c +++ b/src/vpp/api/custom_dump.c @@ -1200,7 +1200,7 @@ static void *vl_api_sr_localsid_add_del_t_print { case SR_BEHAVIOR_END: s = format (s, "Address: %U\nBehavior: End", - format_ip6_address, (ip6_address_t *) mp->localsid_addr); + format_ip6_address, (ip6_address_t *) mp->localsid.addr); s = format (s, (mp->end_psp ? "End.PSP: True" : "End.PSP: False")); break; case SR_BEHAVIOR_X: @@ -1208,9 +1208,9 @@ static void *vl_api_sr_localsid_add_del_t_print format (s, "Address: %U\nBehavior: X (Endpoint with Layer-3 cross-connect)" "\nIface: %U\nNext hop: %U", format_ip6_address, - (ip6_address_t *) mp->localsid_addr, + (ip6_address_t *) mp->localsid.addr, format_vnet_sw_if_index_name, vnm, ntohl (mp->sw_if_index), - format_ip6_address, (ip6_address_t *) mp->nh_addr); + format_ip6_address, (ip6_address_t *) mp->nh_addr6); s = format (s, (mp->end_psp ? "End.PSP: True" : "End.PSP: False")); break; case SR_BEHAVIOR_DX4: @@ -1218,25 +1218,25 @@ static void *vl_api_sr_localsid_add_del_t_print format (s, "Address: %U\nBehavior: DX4 (Endpoint with decapsulation with IPv4 cross-connect)" "\nIface: %U\nNext hop: %U", format_ip6_address, - (ip6_address_t *) mp->localsid_addr, + (ip6_address_t *) mp->localsid.addr, format_vnet_sw_if_index_name, vnm, ntohl (mp->sw_if_index), - format_ip4_address, (ip4_address_t *) mp->nh_addr); + format_ip4_address, (ip4_address_t *) mp->nh_addr4); break; case SR_BEHAVIOR_DX6: s = format (s, "Address: %U\nBehavior: DX6 (Endpoint with decapsulation with IPv6 cross-connect)" "\nIface: %UNext hop: %U", format_ip6_address, - (ip6_address_t *) mp->localsid_addr, + (ip6_address_t *) mp->localsid.addr, format_vnet_sw_if_index_name, vnm, ntohl (mp->sw_if_index), - format_ip6_address, (ip6_address_t *) mp->nh_addr); + format_ip6_address, (ip6_address_t *) mp->nh_addr6); break; case SR_BEHAVIOR_DX2: s = format (s, "Address: %U\nBehavior: DX2 (Endpoint with decapulation and Layer-2 cross-connect)" "\nIface: %U", format_ip6_address, - (ip6_address_t *) mp->localsid_addr, + (ip6_address_t *) mp->localsid.addr, format_vnet_sw_if_index_name, vnm, ntohl (mp->sw_if_index)); break; case SR_BEHAVIOR_DT6: @@ -1244,20 +1244,20 @@ static void *vl_api_sr_localsid_add_del_t_print format (s, "Address: %U\nBehavior: DT6 (Endpoint with decapsulation and specific IPv6 table lookup)" "\nTable: %u", format_ip6_address, - (ip6_address_t *) mp->localsid_addr, ntohl (mp->fib_table)); + (ip6_address_t *) mp->localsid.addr, ntohl (mp->fib_table)); break; case SR_BEHAVIOR_DT4: s = format (s, "Address: %U\nBehavior: DT4 (Endpoint with decapsulation and specific IPv4 table lookup)" "\nTable: %u", format_ip6_address, - (ip6_address_t *) mp->localsid_addr, ntohl (mp->fib_table)); + (ip6_address_t *) mp->localsid.addr, ntohl (mp->fib_table)); break; default: if (mp->behavior >= SR_BEHAVIOR_LAST) { s = format (s, "Address: %U\n Behavior: %u", - format_ip6_address, (ip6_address_t *) mp->localsid_addr, + format_ip6_address, (ip6_address_t *) mp->localsid.addr, mp->behavior); } else @@ -1310,10 +1310,10 @@ static void *vl_api_sr_policy_add_t_print u8 *s; ip6_address_t *segments = 0, *seg; - ip6_address_t *this_address = (ip6_address_t *) mp->segments; + ip6_address_t *this_address = (ip6_address_t *) mp->sids.sids; int i; - for (i = 0; i < mp->n_segments; i++) + for (i = 0; i < mp->sids.num_sids; i++) { vec_add2 (segments, seg, 1); clib_memcpy (seg->as_u8, this_address->as_u8, sizeof (*this_address)); @@ -1352,10 +1352,10 @@ static void *vl_api_sr_policy_mod_t_print u8 *s; ip6_address_t *segments = 0, *seg; - ip6_address_t *this_address = (ip6_address_t *) mp->segments; + ip6_address_t *this_address = (ip6_address_t *) mp->sids.sids; int i; - for (i = 0; i < mp->n_segments; i++) + for (i = 0; i < mp->sids.num_sids; i++) { vec_add2 (segments, seg, 1); clib_memcpy (seg->as_u8, this_address->as_u8, sizeof (*this_address)); @@ -1634,6 +1634,20 @@ static void *vl_api_vxlan_add_del_tunnel_t_print FINISH; } +static void *vl_api_vxlan_offload_rx_t_print + (vl_api_vxlan_offload_rx_t * mp, void *handle) +{ + u8 *s; + s = format (0, "SCRIPT: vxlan_offload_rx "); + + s = format (s, "hw hw_if_index %d ", ntohl (mp->hw_if_index)); + s = format (s, "rx sw_if_index %d ", ntohl (mp->sw_if_index)); + if (!mp->enable) + s = format (s, "del "); + + FINISH; +} + static void *vl_api_vxlan_tunnel_dump_t_print (vl_api_vxlan_tunnel_dump_t * mp, void *handle) { @@ -3256,8 +3270,8 @@ static void *vl_api_sw_interface_tag_add_del_t_print FINISH; } -static void *vl_api_sw_interface_set_mtu_t_print - (vl_api_sw_interface_set_mtu_t * mp, void *handle) +static void *vl_api_hw_interface_set_mtu_t_print + (vl_api_hw_interface_set_mtu_t * mp, void *handle) { u8 *s; @@ -3564,6 +3578,7 @@ _(L2TPV3_SET_LOOKUP_KEY, l2tpv3_set_lookup_key) \ _(SW_IF_L2TPV3_TUNNEL_DUMP, sw_if_l2tpv3_tunnel_dump) \ _(VXLAN_ADD_DEL_TUNNEL, vxlan_add_del_tunnel) \ _(VXLAN_TUNNEL_DUMP, vxlan_tunnel_dump) \ +_(VXLAN_OFFLOAD_RX, vxlan_offload_rx) \ _(GENEVE_ADD_DEL_TUNNEL, geneve_add_del_tunnel) \ _(GENEVE_TUNNEL_DUMP, geneve_tunnel_dump) \ _(GRE_ADD_DEL_TUNNEL, gre_add_del_tunnel) \ @@ -3671,7 +3686,7 @@ _(IP_FIB_DUMP, ip_fib_dump) \ _(IP6_FIB_DUMP, ip6_fib_dump) \ _(FEATURE_ENABLE_DISABLE, feature_enable_disable) \ _(SW_INTERFACE_TAG_ADD_DEL, sw_interface_tag_add_del) \ -_(SW_INTERFACE_SET_MTU, sw_interface_set_mtu) \ +_(HW_INTERFACE_SET_MTU, hw_interface_set_mtu) \ _(P2P_ETHERNET_ADD, p2p_ethernet_add) \ _(P2P_ETHERNET_DEL, p2p_ethernet_del) \ _(TCP_CONFIGURE_SRC_ADDRESSES, tcp_configure_src_addresses) \