X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvpp%2Fapi%2Fcustom_dump.c;h=66a17b27cb1b63281d3d1fb8671df51e12fac6f0;hb=29467b534;hp=0d342a5b420ae751eb94ecb00843c8daecbd7df5;hpb=103ba6ba9ecd1d65bcbd3bb4edc115beb9ee7671;p=vpp.git

diff --git a/src/vpp/api/custom_dump.c b/src/vpp/api/custom_dump.c
index 0d342a5b420..66a17b27cb1 100644
--- a/src/vpp/api/custom_dump.c
+++ b/src/vpp/api/custom_dump.c
@@ -24,7 +24,6 @@
 #include <vnet/fib/fib_api.h>
 #include <vnet/unix/tuntap.h>
 #include <vnet/mpls/mpls.h>
-#include <vnet/dhcp/dhcp_proxy.h>
 #include <vnet/l2tp/l2tp.h>
 #include <vnet/l2/l2_input.h>
 #include <vnet/srv6/sr.h>
@@ -1037,75 +1036,6 @@ vl_api_reset_fib_t_print (vl_api_reset_fib_t * mp, void *handle)
   FINISH;
 }
 
-static void *vl_api_dhcp_proxy_config_t_print
-  (vl_api_dhcp_proxy_config_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: dhcp_proxy_config_2 ");
-
-  s = format (s, "rx_vrf_id %d ", (mp->rx_vrf_id));
-  s = format (s, "server_vrf_id %d ", (mp->server_vrf_id));
-
-  s = format (s, "svr %U ", format_ip46_address,
-	      (ip46_address_t *) & mp->dhcp_server.un);
-  s = format (s, "src %U ", format_ip46_address,
-	      (ip46_address_t *) & mp->dhcp_src_address.un);
-
-  if (mp->is_add == 0)
-    s = format (s, "del ");
-
-  FINISH;
-}
-
-static void *vl_api_dhcp_proxy_set_vss_t_print
-  (vl_api_dhcp_proxy_set_vss_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: dhcp_proxy_set_vss ");
-
-  s = format (s, "tbl_id %d ", (mp->tbl_id));
-
-  if (mp->vss_type == VSS_TYPE_VPN_ID)
-    {
-      s = format (s, "fib_id %d ", (mp->vpn_index));
-      s = format (s, "oui %d ", (mp->oui));
-    }
-  else if (mp->vss_type == VSS_TYPE_ASCII)
-    s = format (s, "vpn_ascii_id %s", mp->vpn_ascii_id);
-
-  if (mp->is_ipv6 != 0)
-    s = format (s, "ipv6 ");
-
-  if (mp->is_add == 0)
-    s = format (s, "del ");
-
-  FINISH;
-}
-
-static void *vl_api_dhcp_client_config_t_print
-  (vl_api_dhcp_client_config_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: dhcp_client_config ");
-
-  s = format (s, "sw_if_index %d ", (mp->client.sw_if_index));
-
-  s = format (s, "hostname %s ", mp->client.hostname);
-
-  s = format (s, "want_dhcp_event %d ", mp->client.want_dhcp_event);
-
-  s = format (s, "pid %d ", (mp->client.pid));
-
-  if (mp->is_add == 0)
-    s = format (s, "del ");
-
-  FINISH;
-}
-
-
 static void *vl_api_set_ip_flow_hash_t_print
   (vl_api_set_ip_flow_hash_t * mp, void *handle)
 {
@@ -1778,8 +1708,10 @@ static void *vl_api_geneve_add_del_tunnel_t_print
   u8 *s;
   s = format (0, "SCRIPT: geneve_add_del_tunnel ");
 
-  ip46_address_t local = to_ip46 (mp->is_ipv6, mp->local_address);
-  ip46_address_t remote = to_ip46 (mp->is_ipv6, mp->remote_address);
+  ip46_address_t local;
+  ip46_address_t remote;
+  ip_address_decode (&mp->remote_address, &remote);
+  ip_address_decode (&mp->local_address, &local);
 
   u8 is_grp = ip46_address_is_multicast (&remote);
   char *remote_name = is_grp ? "group" : "dst";
@@ -3543,6 +3475,21 @@ static void *vl_api_feature_enable_disable_t_print
   FINISH;
 }
 
+static void *vl_api_feature_gso_enable_disable_t_print
+  (vl_api_feature_gso_enable_disable_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: feature_gso_enable_disable ");
+  s = format (s, "sw_if_index %d ", ntohl (mp->sw_if_index));
+  if (mp->enable_disable)
+    s = format (s, "enable");
+  if (!mp->enable_disable)
+    s = format (s, "disable");
+
+  FINISH;
+}
+
 static void *vl_api_sw_interface_tag_add_del_t_print
   (vl_api_sw_interface_tag_add_del_t * mp, void *handle)
 {
@@ -3786,8 +3733,6 @@ _(IP_NEIGHBOR_ADD_DEL, ip_neighbor_add_del)                             \
 _(CREATE_VLAN_SUBIF, create_vlan_subif)                                 \
 _(CREATE_SUBIF, create_subif)                                           \
 _(RESET_FIB, reset_fib)                                                 \
-_(DHCP_PROXY_CONFIG, dhcp_proxy_config)                                 \
-_(DHCP_PROXY_SET_VSS, dhcp_proxy_set_vss)                               \
 _(SET_IP_FLOW_HASH, set_ip_flow_hash)                                   \
 _(SW_INTERFACE_IP6ND_RA_PREFIX, sw_interface_ip6nd_ra_prefix)           \
 _(SW_INTERFACE_IP6ND_RA_CONFIG, sw_interface_ip6nd_ra_config)           \
@@ -3814,7 +3759,6 @@ _(BRIDGE_DOMAIN_SET_MAC_AGE, bridge_domain_set_mac_age)                 \
 _(CLASSIFY_SET_INTERFACE_IP_TABLE, classify_set_interface_ip_table)	\
 _(CLASSIFY_SET_INTERFACE_L2_TABLES, classify_set_interface_l2_tables)	\
 _(ADD_NODE_NEXT, add_node_next)						\
-_(DHCP_CLIENT_CONFIG, dhcp_client_config)	                        \
 _(L2TPV3_CREATE_TUNNEL, l2tpv3_create_tunnel)                           \
 _(L2TPV3_SET_TUNNEL_COOKIES, l2tpv3_set_tunnel_cookies)                 \
 _(L2TPV3_INTERFACE_ENABLE_DISABLE, l2tpv3_interface_enable_disable)     \
@@ -3937,6 +3881,7 @@ _(IOAM_DISABLE, ioam_disable)                                           \
 _(IP_TABLE_DUMP, ip_table_dump)                                         \
 _(IP_ROUTE_DUMP, ip_route_dump)                                         \
 _(FEATURE_ENABLE_DISABLE, feature_enable_disable)			\
+_(FEATURE_GSO_ENABLE_DISABLE, feature_gso_enable_disable)		\
 _(SW_INTERFACE_TAG_ADD_DEL, sw_interface_tag_add_del)			\
 _(HW_INTERFACE_SET_MTU, hw_interface_set_mtu)                           \
 _(P2P_ETHERNET_ADD, p2p_ethernet_add)                                   \