X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fsctp%2Fsctp_api.c;h=d804fcb36a40126049476b9dc7b373fcf4f39279;hb=1307b2eb2cb309f74f3b5e2194ea88cf922667b4;hp=7702d340aaeae61ce673c60bab4479160920d318;hpb=3ffe6cadf083d1a0bc32e4a37d56b42a1153ff7b;p=vpp.git

diff --git a/src/plugins/sctp/sctp_api.c b/src/plugins/sctp/sctp_api.c
index 7702d340aae..d804fcb36a4 100644
--- a/src/plugins/sctp/sctp_api.c
+++ b/src/plugins/sctp/sctp_api.c
@@ -21,36 +21,17 @@
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
 
-#include <sctp/sctp.h>
-
-#include <sctp/sctp_msg_enum.h>
-
-#define vl_typedefs		/* define message structures */
-#include <sctp/sctp_all_api_h.h>
-#undef vl_typedefs
-
-#define vl_endianfun		/* define message structures */
-#include <sctp/sctp_all_api_h.h>
-#undef vl_endianfun
+#include <vnet/ip/ip_types_api.h>
+#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 <sctp/sctp_all_api_h.h>
-#undef vl_printfun
+#include <sctp/sctp.h>
 
-#define vl_api_version(n,v) static u32 api_version=(v);
-#include <sctp/sctp_all_api_h.h>
-#undef vl_api_version
+#include <sctp/sctp.api_enum.h>
+#include <sctp/sctp.api_types.h>
 
 #define REPLY_MSG_ID_BASE sctp_main.msg_id_base
 #include <vlibapi/api_helper_macros.h>
 
-#define foreach_sctp_plugin_api_msg					\
-_(SCTP_ADD_SRC_DST_CONNECTION, sctp_add_src_dst_connection)		\
-_(SCTP_DEL_SRC_DST_CONNECTION, sctp_del_src_dst_connection)		\
-_(SCTP_CONFIG, sctp_config)
-
 static void
   vl_api_sctp_add_src_dst_connection_t_handler
   (vl_api_sctp_add_src_dst_connection_t * mp)
@@ -58,15 +39,15 @@ static void
   vlib_main_t *vm = vlib_get_main ();
   vl_api_sctp_add_src_dst_connection_reply_t *rmp;
   int rv;
+  ip46_address_t src, dst;
 
-  if (mp->is_ipv6)
-    rv = sctp_sub_connection_add_ip6
-      (vm,
-       (ip6_address_t *) mp->src_address, (ip6_address_t *) mp->dst_address);
+  ip_address_decode (&mp->src_address, &src);
+  ip_address_decode (&mp->dst_address, &dst);
+
+  if (ip46_address_is_ip4 (&src) && ip46_address_is_ip4 (&dst))
+    rv = sctp_sub_connection_add_ip4 (vm, &src.ip4, &dst.ip4);
   else
-    rv = sctp_sub_connection_add_ip4
-      (vm,
-       (ip4_address_t *) mp->src_address, (ip4_address_t *) mp->dst_address);
+    rv = sctp_sub_connection_add_ip6 (vm, &src.ip6, &dst.ip6);
 
   REPLY_MACRO (VL_API_SCTP_ADD_SRC_DST_CONNECTION_REPLY);
 }
@@ -77,13 +58,15 @@ static void
 {
   vl_api_sctp_del_src_dst_connection_reply_t *rmp;
   int rv;
+  ip46_address_t src, dst;
+
+  ip_address_decode (&mp->src_address, &src);
+  ip_address_decode (&mp->dst_address, &dst);
 
-  if (mp->is_ipv6)
-    rv = sctp_sub_connection_del_ip6
-      ((ip6_address_t *) mp->src_address, (ip6_address_t *) mp->dst_address);
+  if (ip46_address_is_ip4 (&src) && ip46_address_is_ip4 (&dst))
+    rv = sctp_sub_connection_del_ip4 (&src.ip4, &dst.ip4);
   else
-    rv = sctp_sub_connection_del_ip4
-      ((ip4_address_t *) mp->src_address, (ip4_address_t *) mp->dst_address);
+    rv = sctp_sub_connection_del_ip6 (&src.ip6, &dst.ip6);
 
   REPLY_MACRO (VL_API_SCTP_ADD_SRC_DST_CONNECTION_REPLY);
 }
@@ -102,49 +85,12 @@ vl_api_sctp_config_t_handler (vl_api_sctp_config_t * mp)
   REPLY_MACRO (VL_API_SCTP_CONFIG_REPLY);
 }
 
-#define vl_msg_name_crc_list
-#include <sctp/sctp_all_api_h.h>
-#undef vl_msg_name_crc_list
-
-static void
-setup_message_id_table (sctp_main_t * sm, api_main_t * am)
-{
-#define _(id,n,crc) \
-  vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + sm->msg_id_base);
-  foreach_vl_msg_name_crc_sctp;
-#undef _
-}
-
+#include <sctp/sctp.api.c>
 clib_error_t *
 sctp_plugin_api_hookup (vlib_main_t * vm)
 {
-  sctp_main_t *sm = &sctp_main;
-  api_main_t *am = &api_main;
-  u8 *name;
-
-  /* Construct the API name */
-  name = format (0, "sctp_%08x%c", api_version, 0);
-
   /* Ask for a correctly-sized block of API message decode slots */
-  sctp_main.msg_id_base = vl_msg_api_get_msg_ids
-    ((char *) name, VL_MSG_FIRST_AVAILABLE);
-
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers((VL_API_##N + sm->msg_id_base),     \
-                           #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_sctp_plugin_api_msg;
-#undef _
-
-  /*
-   * Set up the (msg_name, crc, message-id) table
-   */
-  setup_message_id_table (sm, am);
-  vec_free (name);
+  sctp_main.msg_id_base = setup_message_id_table ();
 
   return 0;
 }