summaryrefslogtreecommitdiffstats
path: root/src/plugins/pppoe/pppoe_test.c
diff options
context:
space:
mode:
authorOle Troan <ot@cisco.com>2019-10-02 16:53:58 +0200
committerDamjan Marion <dmarion@me.com>2019-10-03 12:38:46 +0000
commit25fe57821b1d6549ac58961e942d4f74494d5555 (patch)
treee990a04b2af75bfb5f0e0d89c0ca50537e981fd2 /src/plugins/pppoe/pppoe_test.c
parent7ff64fb97541c769ba423e53166d80b9eef25279 (diff)
pppoe: remove api boilerplate
Type: refactor Signed-off-by: Ole Troan <ot@cisco.com> Change-Id: I42705c508e88dae40a4c19ab20a1340623a57e16
Diffstat (limited to 'src/plugins/pppoe/pppoe_test.c')
-rw-r--r--src/plugins/pppoe/pppoe_test.c81
1 files changed, 3 insertions, 78 deletions
diff --git a/src/plugins/pppoe/pppoe_test.c b/src/plugins/pppoe/pppoe_test.c
index d8ad19dc175..72d186546e7 100644
--- a/src/plugins/pppoe/pppoe_test.c
+++ b/src/plugins/pppoe/pppoe_test.c
@@ -61,35 +61,8 @@ uword unformat_ip46_prefix (unformat_input_t * input, va_list * args)
}
/////////////////////////
-#define vl_msg_id(n,h) n,
-typedef enum {
-#include <pppoe/pppoe.api.h>
- /* We'll want to know how many messages IDs we need... */
- VL_MSG_FIRST_AVAILABLE,
-} vl_msg_id_t;
-#undef vl_msg_id
-
-/* define message structures */
-#define vl_typedefs
-#include <pppoe/pppoe.api.h>
-#undef vl_typedefs
-
-/* declare message handlers for each api */
-
-#define vl_endianfun /* define message structures */
-#include <pppoe/pppoe.api.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...)
-#define vl_printfun
-#include <pppoe/pppoe.api.h>
-#undef vl_printfun
-
-/* Get the API version number. */
-#define vl_api_version(n,v) static u32 api_version=(v);
-#include <pppoe/pppoe.api.h>
-#undef vl_api_version
+#include <pppoe/pppoe.api_enum.h>
+#include <pppoe/pppoe.api_types.h>
typedef struct {
/* API message ID base */
@@ -116,16 +89,6 @@ static void vl_api_pppoe_add_del_session_reply_t_handler
}
}
-
-/*
- * Table of message reply handlers, must include boilerplate handlers
- * we just generated
- */
-#define foreach_vpe_api_reply_msg \
- _(PPPOE_ADD_DEL_SESSION_REPLY, pppoe_add_del_session_reply) \
- _(PPPOE_SESSION_DETAILS, pppoe_session_details)
-
-
static int
api_pppoe_add_del_session (vat_main_t * vam)
{
@@ -271,42 +234,4 @@ api_pppoe_session_dump (vat_main_t * vam)
return ret;
}
-/*
- * List of messages that the api test plugin sends,
- * and that the data plane plugin processes
- */
-#define foreach_vpe_api_msg \
-_(pppoe_add_del_session, \
- " client-addr <client-addr> session-id <nn>" \
- " [encap-if-index <nn>] [decap-next [ip4|ip6|node <name>]]" \
- " local-mac <local-mac> client-mac <client-mac> [del]") \
-_(pppoe_session_dump, "[<intfc> | sw_if_index <nn>]") \
-
-static void
-pppoe_api_hookup (vat_main_t *vam)
-{
- pppoe_test_main_t * pem = &pppoe_test_main;
- /* Hook up handlers for replies from the data plane plug-in */
-#define _(N,n) \
- vl_msg_api_set_handlers((VL_API_##N + pem->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_vpe_api_reply_msg;
-#undef _
-
- /* API messages we can send */
-#define _(n,h) hash_set_mem (vam->function_by_name, #n, api_##n);
- foreach_vpe_api_msg;
-#undef _
-
- /* Help strings */
-#define _(n,h) hash_set_mem (vam->help_by_name, #n, h);
- foreach_vpe_api_msg;
-#undef _
-}
-
-VAT_PLUGIN_REGISTER(pppoe);
+#include <pppoe/pppoe.api_test.c>