From ec61e1057c823ce2b273fda9ee156ff2facf4df5 Mon Sep 17 00:00:00 2001 From: Filip Tehlar Date: Tue, 22 Jun 2021 20:39:03 +0000 Subject: tcp: api cleanup Use autogenerated code. Does not change API definitions. Type: improvement Signed-off-by: Filip Tehlar Change-Id: I3c06e9cb3fabdcdce9c17e93cfedfd771295f589 --- src/vat/api_format.c | 49 ----------------------------------------------- src/vnet/tcp/tcp.h | 3 +++ src/vnet/tcp/tcp_api.c | 49 ++++++----------------------------------------- src/vnet/vnet_all_api_h.h | 1 - 4 files changed, 9 insertions(+), 93 deletions(-) diff --git a/src/vat/api_format.c b/src/vat/api_format.c index 86b247eb2da..1a437558080 100644 --- a/src/vat/api_format.c +++ b/src/vat/api_format.c @@ -1911,7 +1911,6 @@ _(l2_interface_pbb_tag_rewrite_reply) \ _(sw_interface_tag_add_del_reply) \ _(sw_interface_add_del_mac_address_reply) \ _(hw_interface_set_mtu_reply) \ -_(tcp_configure_src_addresses_reply) \ _(session_rule_add_del_reply) \ _(ip_container_proxy_add_del_reply) \ @@ -2043,7 +2042,6 @@ _(SW_INTERFACE_ADD_DEL_MAC_ADDRESS_REPLY, sw_interface_add_del_mac_address_reply _(L2_XCONNECT_DETAILS, l2_xconnect_details) \ _(HW_INTERFACE_SET_MTU_REPLY, hw_interface_set_mtu_reply) \ _(SW_INTERFACE_GET_TABLE_REPLY, sw_interface_get_table_reply) \ -_(TCP_CONFIGURE_SRC_ADDRESSES_REPLY, tcp_configure_src_addresses_reply) \ _(APP_NAMESPACE_ADD_DEL_REPLY, app_namespace_add_del_reply) \ _(SESSION_RULE_ADD_DEL_REPLY, session_rule_add_del_reply) \ _(SESSION_RULES_DETAILS, session_rules_details) \ @@ -8124,52 +8122,6 @@ api_hw_interface_set_mtu (vat_main_t * vam) return ret; } -static int -api_tcp_configure_src_addresses (vat_main_t * vam) -{ - vl_api_tcp_configure_src_addresses_t *mp; - unformat_input_t *i = vam->input; - vl_api_address_t first, last; - u8 range_set = 0; - u32 vrf_id = 0; - int ret; - - while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) - { - if (unformat (i, "%U - %U", - unformat_vl_api_address, &first, - unformat_vl_api_address, &last)) - { - if (range_set) - { - errmsg ("one range per message (range already set)"); - return -99; - } - range_set = 1; - } - else if (unformat (i, "vrf %d", &vrf_id)) - ; - else - break; - } - - if (range_set == 0) - { - errmsg ("address range not set"); - return -99; - } - - M (TCP_CONFIGURE_SRC_ADDRESSES, mp); - - mp->vrf_id = ntohl (vrf_id); - clib_memcpy (&mp->first_address, &first, sizeof (first)); - clib_memcpy (&mp->last_address, &last, sizeof (last)); - - S (mp); - W (ret); - return ret; -} - static void vl_api_app_namespace_add_del_reply_t_handler (vl_api_app_namespace_add_del_reply_t * mp) { @@ -9236,7 +9188,6 @@ _(sw_interface_add_del_mac_address, " | sw_if_index " \ _(l2_xconnect_dump, "") \ _(hw_interface_set_mtu, " | hw_if_index mtu ") \ _(sw_interface_get_table, " | sw_if_index [ipv6]") \ -_(tcp_configure_src_addresses, "first-last [vrf ]") \ _(sock_init_shm, "size ") \ _(app_namespace_add_del, "[add] id secret sw_if_index ")\ _(session_rule_add_del, "[add|del] proto / " \ 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 #include - #include -#include - -#define vl_typedefs /* define message structures */ -#include -#undef vl_typedefs - -#define vl_endianfun /* define message structures */ -#include -#undef vl_endianfun +#include -/* instantiate all the print functions we know about */ -#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) -#define vl_printfun -#include -#undef vl_printfun +#include +#include +#define REPLY_MSG_ID_BASE tcp_main.msg_id_base #include -#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 -#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 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 #include #include -#include #include #include -- cgit 1.2.3-korg