tcp: avoid fr segments less than mss if possible

[vpp.git] / src / vnet / tcp / tcp_api.c

diff --git a/src/vnet/tcp/tcp_api.c b/src/vnet/tcp/tcp_api.c
index db488e1..dce0003 100644 (file)
--- a/src/vnet/tcp/tcp_api.c
+++ b/src/vnet/tcp/tcp_api.c
@@ -21,28 +21,16 @@
 #include <vlibmemory/api.h>
 
 #include <vnet/tcp/tcp.h>
+#include <vnet/ip/ip_types_api.h>
 
-#include <vnet/vnet_msg_enum.h>
+#include <vnet/format_fns.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/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)
@@ -51,65 +39,45 @@ static void
   vl_api_tcp_configure_src_addresses_reply_t *rmp;
   u32 vrf_id;
   int rv;
+  ip46_address_t first_address, last_address;
+  ip46_type_t fa_af, la_af;
 
   vrf_id = clib_net_to_host_u32 (mp->vrf_id);
 
-  if (mp->is_ipv6)
+  fa_af = ip_address_decode (&mp->first_address, &first_address);
+  la_af = ip_address_decode (&mp->last_address, &last_address);
+
+  if (fa_af != la_af)
+    {
+      rv = VNET_API_ERROR_INVALID_VALUE;
+      goto error;
+    }
+
+  if (fa_af == IP46_TYPE_IP6)
     rv = tcp_configure_v6_source_address_range
-      (vm,
-       (ip6_address_t *) mp->first_address,
-       (ip6_address_t *) mp->last_address, vrf_id);
+      (vm, &first_address.ip6, &last_address.ip6, vrf_id);
   else
     rv = tcp_configure_v4_source_address_range
-      (vm,
-       (ip4_address_t *) mp->first_address,
-       (ip4_address_t *) mp->last_address, vrf_id);
+      (vm, &first_address.ip4, &last_address.ip4, vrf_id);
 
+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;
 }
 
 VLIB_API_INIT_FUNCTION (tcp_api_hookup);
 
-void
-tcp_api_reference (void)
-{
-}
-
 /*
  * fd.io coding-style-patch-verification: ON
  *