flow: api cleanup

Use autogenerated code

Type: improvement

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

diff --git a/src/vat/api_format.c b/src/vat/api_format.c
index 7b2681b..23de7b9 100644 (file)
--- a/src/vat/api_format.c
+++ b/src/vat/api_format.c
@@ -2873,7 +2873,6 @@ _(tcp_configure_src_addresses_reply)                      \
 _(session_rule_add_del_reply)                          \
 _(ip_container_proxy_add_del_reply)                     \
 _(qos_record_enable_disable_reply)                     \
-_(flow_add_reply)
 
 #define _(n)                                    \
     static void vl_api_##n##_t_handler          \
@@ -3058,7 +3057,6 @@ _(SESSION_RULE_ADD_DEL_REPLY, session_rule_add_del_reply)         \
 _(SESSION_RULES_DETAILS, session_rules_details)                                \
 _(IP_CONTAINER_PROXY_ADD_DEL_REPLY, ip_container_proxy_add_del_reply)  \
 _(QOS_RECORD_ENABLE_DISABLE_REPLY, qos_record_enable_disable_reply)            \
-_(FLOW_ADD_REPLY, flow_add_reply)   \
 
 #define foreach_standalone_reply_msg                                   \
 _(SW_INTERFACE_EVENT, sw_interface_event)

diff --git a/src/vnet/flow/flow.h b/src/vnet/flow/flow.h
index 3ae5b6b..ad61677 100644 (file)
--- a/src/vnet/flow/flow.h
+++ b/src/vnet/flow/flow.h
@@ -279,6 +279,7 @@ typedef struct
   /* vector of flow ranges */
   vnet_flow_range_t *ranges;
 
+  u16 msg_id_base;
 } vnet_flow_main_t;
 
 extern vnet_flow_main_t flow_main;

diff --git a/src/vnet/flow/flow_api.c b/src/vnet/flow/flow_api.c
index 3aa4e0c..4fcff89 100644 (file)
--- a/src/vnet/flow/flow_api.c
+++ b/src/vnet/flow/flow_api.c
@@ -30,28 +30,13 @@
 #include <vnet/ip/ip_types_api.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/flow/flow.api_enum.h>
+#include <vnet/flow/flow.api_types.h>
 
+#define REPLY_MSG_ID_BASE flow_main.msg_id_base
 #include <vlibapi/api_helper_macros.h>
 
-#define foreach_vpe_api_msg         \
-_(FLOW_ADD, flow_add)               \
-_(FLOW_DEL, flow_del)               \
-_(FLOW_ENABLE, flow_enable)         \
-_(FLOW_DISABLE, flow_disable)
-
 static inline void
 ipv4_addr_and_mask_convert (vl_api_ip4_address_and_mask_t * vl_api_addr,
                            ip4_address_and_mask_t * vnet_addr)
@@ -351,46 +336,11 @@ vl_api_flow_disable_t_handler (vl_api_flow_disable_t * mp)
   REPLY_MACRO (VL_API_FLOW_DISABLE_REPLY);
 }
 
-#define vl_msg_name_crc_list
-#include <vnet/flow/flow.api.h>
-#undef vl_msg_name_crc_list
-
-/*
- * flow_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()
- */
-
-
-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_flow;
-#undef _
-}
-
+#include <vnet/flow/flow.api.c>
 static clib_error_t *
 hw_flow_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);
+  flow_main.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 d973b6f..7e26a9b 100644 (file)
--- a/src/vnet/vnet_all_api_h.h
+++ b/src/vnet/vnet_all_api_h.h
@@ -59,7 +59,6 @@
 #include <vnet/devices/pipe/pipe.api.h>
 #include <vnet/syslog/syslog.api.h>
 #include <vnet/devices/virtio/virtio.api.h>
-#include <vnet/flow/flow.api.h>
 
 /*
  * fd.io coding-style-patch-verification: ON