aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOle Troan <ot@cisco.com>2019-09-27 14:27:16 +0200
committerNeale Ranns <nranns@cisco.com>2019-09-27 16:05:39 +0000
commit087d6c6776bea5eb3ea987bae67fc50be30d0a8b (patch)
tree9ae984a0355aac23ce186f995b952a83b9f92814
parent83c1e9a35b41c3bc871a2508f847e64528efccac (diff)
sctp: remove api boilerplate
Type: refactor Signed-off-by: Ole Troan <ot@cisco.com> Change-Id: I6576b76ef7ba494a8b777d01d75055270d837b24
-rw-r--r--src/plugins/sctp/CMakeLists.txt2
-rw-r--r--src/plugins/sctp/sctp_all_api_h.h16
-rw-r--r--src/plugins/sctp/sctp_api.c67
-rw-r--r--src/plugins/sctp/sctp_msg_enum.h28
4 files changed, 4 insertions, 109 deletions
diff --git a/src/plugins/sctp/CMakeLists.txt b/src/plugins/sctp/CMakeLists.txt
index 0c28fe70524..2916c62eca7 100644
--- a/src/plugins/sctp/CMakeLists.txt
+++ b/src/plugins/sctp/CMakeLists.txt
@@ -29,8 +29,6 @@ add_vpp_plugin(sctp
sctp_input.c
INSTALL_HEADERS
- sctp_all_api_h.h
- sctp_msg_enum.h
sctp_error.def
sctp_packet.h
sctp_timer.h
diff --git a/src/plugins/sctp/sctp_all_api_h.h b/src/plugins/sctp/sctp_all_api_h.h
deleted file mode 100644
index 16bba76239e..00000000000
--- a/src/plugins/sctp/sctp_all_api_h.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2019 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/* Include the generated file, see BUILT_SOURCES in Makefile.am */
-#include <sctp/sctp.api.h>
diff --git a/src/plugins/sctp/sctp_api.c b/src/plugins/sctp/sctp_api.c
index 7702d340aae..bc7a69673ec 100644
--- a/src/plugins/sctp/sctp_api.c
+++ b/src/plugins/sctp/sctp_api.c
@@ -23,34 +23,12 @@
#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
-
-/* 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
-
-#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)
@@ -102,49 +80,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;
}
diff --git a/src/plugins/sctp/sctp_msg_enum.h b/src/plugins/sctp/sctp_msg_enum.h
deleted file mode 100644
index cbf84c659f6..00000000000
--- a/src/plugins/sctp/sctp_msg_enum.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2019 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#ifndef included_sctp_msg_enum_h
-#define included_sctp_msg_enum_h
-
-#include <vppinfra/byte_order.h>
-
-#define vl_msg_id(n,h) n,
-typedef enum {
-#include <sctp/sctp_all_api_h.h>
- /* We'll want to know how many messages IDs we need... */
- VL_MSG_FIRST_AVAILABLE,
-} vl_msg_id_t;
-#undef vl_msg_id
-
-#endif /* included_http_static_msg_enum_h */