X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Ftcp%2Ftcp_api.c;h=ac4314f0e83c8a5dcb7b1d1dde31f970f68a4582;hb=4e783b9c901cf90e58c3f921bb17170ab23e540a;hp=7f574630147454a277a725a309a54d1a60672fe1;hpb=c5df8c71cc867d8120a25e4bd6d065aa63d9011c;p=vpp.git

diff --git a/src/vnet/tcp/tcp_api.c b/src/vnet/tcp/tcp_api.c
index 7f574630147..ac4314f0e83 100644
--- a/src/vnet/tcp/tcp_api.c
+++ b/src/vnet/tcp/tcp_api.c
@@ -22,6 +22,8 @@
 
 #include <vnet/tcp/tcp.h>
 
+#include <vnet/ip/ip_types_api.h>
+
 #include <vnet/vnet_msg_enum.h>
 
 #define vl_typedefs		/* define message structures */
@@ -51,20 +53,28 @@ 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);
 }
 
@@ -83,7 +93,7 @@ setup_message_id_table (api_main_t * am)
 static clib_error_t *
 tcp_api_hookup (vlib_main_t * vm)
 {
-  api_main_t *am = &api_main;
+  api_main_t *am = vlibapi_get_main ();
 
 #define _(N,n)                                                  \
     vl_msg_api_set_handlers(VL_API_##N, #n,                     \