Add sw_if_index to af_packet_create and various clean ups

[vpp.git] / vpp / api / custom_dump.c

diff --git a/vpp/api/custom_dump.c b/vpp/api/custom_dump.c
index ba41b1f..388c7e5 100644 (file)
--- a/vpp/api/custom_dump.c
+++ b/vpp/api/custom_dump.c
@@ -26,8 +26,6 @@
 #include <vnet/l2tp/l2tp.h>
 #include <vnet/l2/l2_input.h>
 #include <vnet/sr/sr_packet.h>
-//#include <vnet/nsh-gre/nsh_gre.h> //alagalah testing nsh-gre removal
-#include <vnet/nsh/nsh.h> //alagalah testing nsh-gre removal
 #include <vnet/vxlan-gpe/vxlan_gpe.h>
 #include <vlib/vlib.h>
 #include <vlib/unix/unix.h>
@@ -1337,10 +1335,12 @@ static void * vl_api_vxlan_add_del_tunnel_t_print
     s = format (0, "SCRIPT: vxlan_add_del_tunnel ");
 
     s = format (s, "dst %U ", format_ip46_address,
-                (ip46_address_t *)&(mp->dst_address));
+                (ip46_address_t *)&(mp->dst_address),
+               mp->is_ipv6 ? IP46_TYPE_IP6 : IP46_TYPE_IP4);
 
     s = format (s, "src %U ", format_ip46_address,
-                (ip46_address_t *)&(mp->src_address));
+                (ip46_address_t *)&(mp->src_address),
+               mp->is_ipv6 ? IP46_TYPE_IP6 : IP46_TYPE_IP4);
 
     if (mp->encap_vrf_id)
         s = format (s, "encap-vrf-id %d ", ntohl(mp->encap_vrf_id));
@@ -1582,8 +1582,9 @@ static void *vl_api_vxlan_gpe_add_del_tunnel_t_print
 
     s = format (0, "SCRIPT: vxlan_gpe_add_del_tunnel ");
 
-    s = format (s, "local %U remote %U ", format_ip4_address, &mp->local,
-                format_ip4_address, &mp->remote);
+    s = format (s, "local %U ", format_ip46_address, &mp->local, mp->is_ipv6);
+
+    s = format (s, "remote %U ", format_ip46_address, &mp->remote, mp->is_ipv6);
 
     s = format (s, "protocol %d ", ntohl(mp->protocol));
 
@@ -1601,6 +1602,18 @@ static void *vl_api_vxlan_gpe_add_del_tunnel_t_print
     FINISH;
 }
 
+static void * vl_api_vxlan_gpe_tunnel_dump_t_print
+(vl_api_vxlan_gpe_tunnel_dump_t * mp, void *handle)
+{
+    u8 * s;
+
+    s = format (0, "SCRIPT: vxlan_gpe_tunnel_dump ");
+
+    s = format (s, "sw_if_index %d ", ntohl(mp->sw_if_index));
+
+    FINISH;
+}
+
 static void *vl_api_interface_name_renumber_t_print 
 (vl_api_interface_name_renumber_t * mp, void * handle)
 {
@@ -1704,6 +1717,32 @@ static void * vl_api_cop_whitelist_enable_disable_t_print
     FINISH;
 }
 
+static void * vl_api_af_packet_create_t_print 
+(vl_api_af_packet_create_t * mp, void *handle)
+{
+    u8 * s;
+
+    s = format (0, "SCRIPT: af_packet_create ");
+    s = format (s, "host_if_name %s ", mp->host_if_name);
+    if ( mp->use_random_hw_addr)
+      s = format (s, "hw_addr random ");
+    else
+      s = format (s, "hw_addr %U ", format_ethernet_address, mp->hw_addr);
+
+    FINISH;
+}
+
+static void * vl_api_af_packet_delete_t_print 
+(vl_api_af_packet_delete_t * mp, void *handle)
+{
+    u8 * s;
+
+    s = format (0, "SCRIPT: af_packet_delete ");
+    s = format (s, "host_if_name %s ", mp->host_if_name);
+
+    FINISH;
+}
+
 static void *vl_api_sw_interface_clear_stats_t_print
 (vl_api_sw_interface_clear_stats_t * mp, void *handle)
 {
@@ -1790,7 +1829,8 @@ _(MEMCLNT_CREATE, memclnt_create)                                 \
 _(SW_INTERFACE_VHOST_USER_DUMP, sw_interface_vhost_user_dump)           \
 _(SHOW_VERSION, show_version)                                           \
 _(L2_FIB_TABLE_DUMP, l2_fib_table_dump)                                 \
-_(VXLAN_GPE_ADD_DEL_TUNNEL, vxlan_gpe_add_del_tunnel)                  \
+_(VXLAN_GPE_ADD_DEL_TUNNEL, vxlan_gpe_add_del_tunnel)                          \
+_(VXLAN_GPE_TUNNEL_DUMP, vxlan_gpe_tunnel_dump)                         \
 _(INTERFACE_NAME_RENUMBER, interface_name_renumber)                    \
 _(WANT_IP4_ARP_EVENTS, want_ip4_arp_events)                             \
 _(INPUT_ACL_SET_INTERFACE, input_acl_set_interface)                     \
@@ -1800,6 +1840,8 @@ _(DELETE_LOOPBACK, delete_loopback)                                     \
 _(BD_IP_MAC_ADD_DEL, bd_ip_mac_add_del)                                        \
 _(COP_INTERFACE_ENABLE_DISABLE, cop_interface_enable_disable)          \
 _(COP_WHITELIST_ENABLE_DISABLE, cop_whitelist_enable_disable)           \
+_(AF_PACKET_CREATE, af_packet_create)                                  \
+_(AF_PACKET_DELETE, af_packet_delete)                                  \
 _(SW_INTERFACE_CLEAR_STATS, sw_interface_clear_stats)
 
 void vl_msg_api_custom_dump_configure (api_main_t *am)