summaryrefslogtreecommitdiffstats
path: root/src/plugins/flowperpkt
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/flowperpkt')
-rw-r--r--src/plugins/flowperpkt/flowperpkt_test.c45
1 files changed, 4 insertions, 41 deletions
diff --git a/src/plugins/flowperpkt/flowperpkt_test.c b/src/plugins/flowperpkt/flowperpkt_test.c
index 716818ffe0a..9211ebe32dd 100644
--- a/src/plugins/flowperpkt/flowperpkt_test.c
+++ b/src/plugins/flowperpkt/flowperpkt_test.c
@@ -19,6 +19,7 @@
#include <vlibmemory/api.h>
#include <vlibsocket/api.h>
#include <vppinfra/error.h>
+#include <vlibapi/vat_helper_macros.h>
/**
* @file vpp_api_test plugin
@@ -88,47 +89,9 @@ foreach_standard_reply_retval_handler;
_(FLOWPERPKT_TX_INTERFACE_ADD_DEL_REPLY, \
flowperpkt_tx_interface_add_del_reply)
-
-/* M: construct, but don't yet send a message */
-
-#define M(T,t) \
-do { \
- vam->result_ready = 0; \
- mp = vl_msg_api_alloc(sizeof(*mp)); \
- memset (mp, 0, sizeof (*mp)); \
- mp->_vl_msg_id = ntohs (VL_API_##T + sm->msg_id_base); \
- mp->client_index = vam->my_client_index; \
-} while(0);
-
-#define M2(T,t,n) \
-do { \
- vam->result_ready = 0; \
- mp = vl_msg_api_alloc(sizeof(*mp)+(n)); \
- memset (mp, 0, sizeof (*mp)); \
- mp->_vl_msg_id = ntohs (VL_API_##T + sm->msg_id_base); \
- mp->client_index = vam->my_client_index; \
-} while(0);
-
-/* S: send a message */
-#define S (vl_msg_api_send_shmem (vam->vl_input_queue, (u8 *)&mp))
-
-/* W: wait for results, with timeout */
-#define W \
-do { \
- timeout = vat_time_now (vam) + 1.0; \
- \
- while (vat_time_now (vam) < timeout) { \
- if (vam->result_ready == 1) { \
- return (vam->retval); \
- } \
- } \
- return -99; \
-} while(0);
-
static int
api_flowperpkt_tx_interface_add_del (vat_main_t * vam)
{
- flowperpkt_test_main_t *sm = &flowperpkt_test_main;
unformat_input_t *i = vam->input;
f64 timeout;
int enable_disable = 1;
@@ -177,8 +140,8 @@ api_flowperpkt_tx_interface_add_del (vat_main_t * vam)
#define foreach_vpe_api_msg \
_(flowperpkt_tx_interface_add_del, "<intfc> [disable]")
-void
-vat_api_hookup (vat_main_t * vam)
+static void
+flowperpkt_vat_api_hookup (vat_main_t * vam)
{
flowperpkt_test_main_t *sm = &flowperpkt_test_main;
/* Hook up handlers for replies from the data plane plug-in */
@@ -218,7 +181,7 @@ vat_plugin_register (vat_main_t * vam)
/* Don't attempt to hook up API messages if the data plane plugin is AWOL */
if (sm->msg_id_base != (u16) ~ 0)
- vat_api_hookup (vam);
+ flowperpkt_vat_api_hookup (vam);
vec_free (name);