devices: af_packet api cleanup

Use autogenerated code.
Does not change API definitions.

Type: improvement

Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
Change-Id: Ic7979755494a2fd23b9fa3d74e14f6b9ea0a46d0

3 files changed, 8 insertions, 229 deletions

diff --git a/src/vat/api_format.c b/src/vat/api_format.c
index cc0e8c3251f..f5c8291dd66 100644
--- a/src/vat/api_format.c
+++ b/src/vat/api_format.c
@@ -718,35 +718,6 @@ static void vl_api_create_loopback_instance_reply_t_handler_json
   vam->result_ready = 1;
 }
 
-static void vl_api_af_packet_create_reply_t_handler
-  (vl_api_af_packet_create_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  i32 retval = ntohl (mp->retval);
-
-  vam->retval = retval;
-  vam->regenerate_interface_table = 1;
-  vam->sw_if_index = ntohl (mp->sw_if_index);
-  vam->result_ready = 1;
-}
-
-static void vl_api_af_packet_create_reply_t_handler_json
-  (vl_api_af_packet_create_reply_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t node;
-
-  vat_json_init_object (&node);
-  vat_json_object_add_int (&node, "retval", ntohl (mp->retval));
-  vat_json_object_add_uint (&node, "sw_if_index", ntohl (mp->sw_if_index));
-
-  vat_json_print (vam->ofp, &node);
-  vat_json_free (&node);
-
-  vam->retval = ntohl (mp->retval);
-  vam->result_ready = 1;
-}
-
 static void vl_api_create_vlan_subif_reply_t_handler
   (vl_api_create_vlan_subif_reply_t * mp)
 {
@@ -2005,7 +1976,6 @@ _(want_interface_events_reply)                          \
 _(sw_interface_clear_stats_reply)                       \
 _(ioam_enable_reply)                                    \
 _(ioam_disable_reply)                                   \
-_(af_packet_delete_reply)                               \
 _(sw_interface_span_enable_disable_reply)               \
 _(ip_source_and_port_range_check_add_del_reply)         \
 _(ip_source_and_port_range_check_interface_add_del_reply)\
@@ -2134,9 +2104,6 @@ _(GET_NODE_GRAPH_REPLY, get_node_graph_reply)                           \
 _(SW_INTERFACE_CLEAR_STATS_REPLY, sw_interface_clear_stats_reply)      \
 _(IOAM_ENABLE_REPLY, ioam_enable_reply)                   \
 _(IOAM_DISABLE_REPLY, ioam_disable_reply)                     \
-_(AF_PACKET_CREATE_REPLY, af_packet_create_reply)                       \
-_(AF_PACKET_DELETE_REPLY, af_packet_delete_reply)                       \
-_(AF_PACKET_DETAILS, af_packet_details)					\
 _(MPLS_TUNNEL_DETAILS, mpls_tunnel_details)                             \
 _(MPLS_TABLE_DETAILS, mpls_table_details)                               \
 _(MPLS_ROUTE_DETAILS, mpls_route_details)                               \
@@ -7481,145 +7448,6 @@ api_get_node_graph (vat_main_t * vam)
   return ret;
 }
 
-static int
-api_af_packet_create (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_af_packet_create_t *mp;
-  u8 *host_if_name = 0;
-  u8 hw_addr[6];
-  u8 random_hw_addr = 1;
-  int ret;
-
-  clib_memset (hw_addr, 0, sizeof (hw_addr));
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "name %s", &host_if_name))
-	vec_add1 (host_if_name, 0);
-      else if (unformat (i, "hw_addr %U", unformat_ethernet_address, hw_addr))
-	random_hw_addr = 0;
-      else
-	break;
-    }
-
-  if (!vec_len (host_if_name))
-    {
-      errmsg ("host-interface name must be specified");
-      return -99;
-    }
-
-  if (vec_len (host_if_name) > 64)
-    {
-      errmsg ("host-interface name too long");
-      return -99;
-    }
-
-  M (AF_PACKET_CREATE, mp);
-
-  clib_memcpy (mp->host_if_name, host_if_name, vec_len (host_if_name));
-  clib_memcpy (mp->hw_addr, hw_addr, 6);
-  mp->use_random_hw_addr = random_hw_addr;
-  vec_free (host_if_name);
-
-  S (mp);
-
-  /* *INDENT-OFF* */
-  W2 (ret,
-      ({
-        if (ret == 0)
-          fprintf (vam->ofp ? vam->ofp : stderr,
-                   " new sw_if_index = %d\n", vam->sw_if_index);
-      }));
-  /* *INDENT-ON* */
-  return ret;
-}
-
-static int
-api_af_packet_delete (vat_main_t * vam)
-{
-  unformat_input_t *i = vam->input;
-  vl_api_af_packet_delete_t *mp;
-  u8 *host_if_name = 0;
-  int ret;
-
-  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
-    {
-      if (unformat (i, "name %s", &host_if_name))
-	vec_add1 (host_if_name, 0);
-      else
-	break;
-    }
-
-  if (!vec_len (host_if_name))
-    {
-      errmsg ("host-interface name must be specified");
-      return -99;
-    }
-
-  if (vec_len (host_if_name) > 64)
-    {
-      errmsg ("host-interface name too long");
-      return -99;
-    }
-
-  M (AF_PACKET_DELETE, mp);
-
-  clib_memcpy (mp->host_if_name, host_if_name, vec_len (host_if_name));
-  vec_free (host_if_name);
-
-  S (mp);
-  W (ret);
-  return ret;
-}
-
-static void vl_api_af_packet_details_t_handler
-  (vl_api_af_packet_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-
-  print (vam->ofp, "%-16s %d",
-	 mp->host_if_name, clib_net_to_host_u32 (mp->sw_if_index));
-}
-
-static void vl_api_af_packet_details_t_handler_json
-  (vl_api_af_packet_details_t * mp)
-{
-  vat_main_t *vam = &vat_main;
-  vat_json_node_t *node = NULL;
-
-  if (VAT_JSON_ARRAY != vam->json_tree.type)
-    {
-      ASSERT (VAT_JSON_NONE == vam->json_tree.type);
-      vat_json_init_array (&vam->json_tree);
-    }
-  node = vat_json_array_add (&vam->json_tree);
-
-  vat_json_init_object (node);
-  vat_json_object_add_uint (node, "sw_if_index", ntohl (mp->sw_if_index));
-  vat_json_object_add_string_copy (node, "dev_name", mp->host_if_name);
-}
-
-static int
-api_af_packet_dump (vat_main_t * vam)
-{
-  vl_api_af_packet_dump_t *mp;
-  vl_api_control_ping_t *mp_ping;
-  int ret;
-
-  print (vam->ofp, "\n%-16s %s", "dev_name", "sw_if_index");
-  /* Get list of tap interfaces */
-  M (AF_PACKET_DUMP, mp);
-  S (mp);
-
-  /* Use a control ping for synchronization */
-  MPING (CONTROL_PING, mp_ping);
-  S (mp_ping);
-
-  W (ret);
-  return ret;
-}
-
 static u8 *
 format_fib_api_path_nh_proto (u8 * s, va_list * args)
 {
@@ -9962,9 +9790,6 @@ _(get_node_graph, " ")                                                  \
 _(sw_interface_clear_stats,"<intfc> | sw_if_index <nn>")                \
 _(ioam_enable, "[trace] [pow] [ppc <encap|decap>]")                     \
 _(ioam_disable, "")                                                     \
-_(af_packet_create, "name <host interface name> [hw_addr <mac>]")       \
-_(af_packet_delete, "name <host interface name>")                       \
-_(af_packet_dump, "")							\
 _(mpls_tunnel_dump, "tunnel_index <tunnel-id>")                         \
 _(mpls_table_dump, "")                                                  \
 _(mpls_route_dump, "table-id <ID>")                                     \
diff --git a/src/vnet/devices/af_packet/af_packet_api.c b/src/vnet/devices/af_packet/af_packet_api.c
index 58d45be4960..d4d041ffb3c 100644
--- a/src/vnet/devices/af_packet/af_packet_api.c
+++ b/src/vnet/devices/af_packet/af_packet_api.c
@@ -24,29 +24,14 @@
 #include <vnet/api_errno.h>
 #include <vnet/devices/af_packet/af_packet.h>
 
-#include <vnet/vnet_msg_enum.h>
-
-#define vl_typedefs		/* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_typedefs
-
-#define vl_endianfun		/* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-#define vl_printfun
-#include <vnet/vnet_all_api_h.h>
-#undef vl_printfun
+#include <vnet/format_fns.h>
+#include <vnet/devices/af_packet/af_packet.api_enum.h>
+#include <vnet/devices/af_packet/af_packet.api_types.h>
 
+#define REPLY_MSG_ID_BASE msg_id_base
 #include <vlibapi/api_helper_macros.h>
 
-#define foreach_vpe_api_msg                                          \
-_(AF_PACKET_CREATE, af_packet_create)                                \
-_(AF_PACKET_DELETE, af_packet_delete)                                \
-_(AF_PACKET_SET_L4_CKSUM_OFFLOAD, af_packet_set_l4_cksum_offload)    \
-_(AF_PACKET_DUMP, af_packet_dump)
+static u16 msg_id_base;
 
 static void
 vl_api_af_packet_create_t_handler (vl_api_af_packet_create_t * mp)
@@ -112,7 +97,7 @@ af_packet_send_details (vpe_api_main_t * am,
   vl_api_af_packet_details_t *mp;
   mp = vl_msg_api_alloc (sizeof (*mp));
   clib_memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = htons (VL_API_AF_PACKET_DETAILS);
+  mp->_vl_msg_id = htons (REPLY_MSG_ID_BASE + VL_API_AF_PACKET_DETAILS);
   mp->sw_if_index = htonl (af_packet_if->sw_if_index);
   clib_memcpy (mp->host_if_name, af_packet_if->host_if_name,
 	       MIN (ARRAY_LEN (mp->host_if_name) - 1,
@@ -148,44 +133,14 @@ vl_api_af_packet_dump_t_handler (vl_api_af_packet_dump_t * mp)
   vec_free (out_af_packet_ifs);
 }
 
-/*
- * af_packet_api_hookup
- * Add vpe's API message handlers to the table.
- * vlib has already mapped shared memory and
- * added the client registration handlers.
- * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
- */
-#define vl_msg_name_crc_list
-#include <vnet/vnet_all_api_h.h>
-#undef vl_msg_name_crc_list
-
-static void
-setup_message_id_table (api_main_t * am)
-{
-#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
-  foreach_vl_msg_name_crc_af_packet;
-#undef _
-}
-
+#include <vnet/devices/af_packet/af_packet.api.c>
 static clib_error_t *
 af_packet_api_hookup (vlib_main_t * vm)
 {
-  api_main_t *am = vlibapi_get_main ();
-
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
-                           vl_api_##n##_t_handler,              \
-                           vl_noop_handler,                     \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1);
-  foreach_vpe_api_msg;
-#undef _
-
   /*
    * Set up the (msg_name, crc, message-id) table
    */
-  setup_message_id_table (am);
+  REPLY_MSG_ID_BASE = setup_message_id_table ();
 
   return 0;
 }
diff --git a/src/vnet/vnet_all_api_h.h b/src/vnet/vnet_all_api_h.h
index 802661fd66b..7868882fa6b 100644
--- a/src/vnet/vnet_all_api_h.h
+++ b/src/vnet/vnet_all_api_h.h
@@ -33,7 +33,6 @@
 #include <vnet/format_fns.h>
 #endif
 
-#include <vnet/devices/af_packet/af_packet.api.h>
 #include <vnet/devices/virtio/vhost_user.api.h>
 #include <vnet/interface.api.h>
 #include <vnet/l2/l2.api.h>