diff options
Diffstat (limited to 'src/vnet')
| -rw-r--r-- | src/vnet/tcp/tcp.h | 3 | ||||
| -rw-r--r-- | src/vnet/tcp/tcp_api.c | 49 | ||||
| -rw-r--r-- | src/vnet/vnet_all_api_h.h | 1 |
3 files changed, 9 insertions, 44 deletions
diff --git a/src/vnet/tcp/tcp.h b/src/vnet/tcp/tcp.h index 1e6cf8a9ae8..60b9095aea2 100644 --- a/src/vnet/tcp/tcp.h +++ b/src/vnet/tcp/tcp.h @@ -256,6 +256,9 @@ typedef struct _tcp_main /** Protocol configuration */ tcp_configuration_t cfg; + + /** message ID base for API */ + u16 msg_id_base; } tcp_main_t; extern tcp_main_t tcp_main; diff --git a/src/vnet/tcp/tcp_api.c b/src/vnet/tcp/tcp_api.c index 8b169f8f1e3..dce0003708c 100644 --- a/src/vnet/tcp/tcp_api.c +++ b/src/vnet/tcp/tcp_api.c @@ -21,30 +21,16 @@ #include <vlibmemory/api.h> #include <vnet/tcp/tcp.h> - #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 +#include <vnet/format_fns.h> -/* 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/tcp/tcp.api_enum.h> +#include <vnet/tcp/tcp.api_types.h> +#define REPLY_MSG_ID_BASE tcp_main.msg_id_base #include <vlibapi/api_helper_macros.h> -#define foreach_tcp_api_msg \ -_(TCP_CONFIGURE_SRC_ADDRESSES, tcp_configure_src_addresses) - static void vl_api_tcp_configure_src_addresses_t_handler (vl_api_tcp_configure_src_addresses_t * mp) @@ -78,37 +64,14 @@ error: REPLY_MACRO (VL_API_TCP_CONFIGURE_SRC_ADDRESSES_REPLY); } -#define vl_msg_name_crc_list -#include <vnet/tcp/tcp.api.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_tcp; -#undef _ -} - +#include <vnet/tcp/tcp.api.c> static clib_error_t * tcp_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_tcp_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 4e54b443ac4..9f5c2109852 100644 --- a/src/vnet/vnet_all_api_h.h +++ b/src/vnet/vnet_all_api_h.h @@ -40,7 +40,6 @@ #include <vnet/session/session.api.h> #include <vnet/mpls/mpls.api.h> #include <vnet/srmpls/sr_mpls.api.h> -#include <vnet/tcp/tcp.api.h> #include <vnet/syslog/syslog.api.h> #include <vnet/devices/virtio/virtio.api.h> |