#include <vnet/ip/ip.h>
#include <arpa/inet.h>
+#define __plugin_msg_base acl_test_main.msg_id_base
+#include <vlibapi/vat_helper_macros.h>
+
uword unformat_sw_if_index (unformat_input_t * input, va_list * args);
/* Declare message IDs */
_(MACIP_ACL_INTERFACE_GET_REPLY, macip_acl_interface_get_reply) \
_(ACL_PLUGIN_GET_VERSION_REPLY, acl_plugin_get_version_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_acl_plugin_get_version (vat_main_t * vam)
{
acl_test_main_t * sm = &acl_test_main;
static int api_acl_del (vat_main_t * vam)
{
- acl_test_main_t * sm = &acl_test_main;
unformat_input_t * i = vam->input;
f64 timeout;
vl_api_acl_del_t * mp;
}
/* Construct the API message */
- M(ACL_DEL, acl_del);
+ M(ACL_DEL, mp);
mp->acl_index = ntohl(acl_index);
/* send it... */
static int api_macip_acl_del (vat_main_t * vam)
{
- acl_test_main_t * sm = &acl_test_main;
unformat_input_t * i = vam->input;
f64 timeout;
vl_api_acl_del_t * mp;
}
/* Construct the API message */
- M(MACIP_ACL_DEL, acl_del);
+ M(MACIP_ACL_DEL, mp);
mp->acl_index = ntohl(acl_index);
/* send it... */
static int api_acl_interface_add_del (vat_main_t * vam)
{
- acl_test_main_t * sm = &acl_test_main;
unformat_input_t * i = vam->input;
f64 timeout;
vl_api_acl_interface_add_del_t * mp;
/* Construct the API message */
- M(ACL_INTERFACE_ADD_DEL, acl_interface_add_del);
+ M(ACL_INTERFACE_ADD_DEL, mp);
mp->acl_index = ntohl(acl_index);
mp->sw_if_index = ntohl(sw_if_index);
mp->is_add = is_add;
static int api_macip_acl_interface_add_del (vat_main_t * vam)
{
- acl_test_main_t * sm = &acl_test_main;
unformat_input_t * i = vam->input;
f64 timeout;
vl_api_macip_acl_interface_add_del_t * mp;
/* Construct the API message */
- M(MACIP_ACL_INTERFACE_ADD_DEL, macip_acl_interface_add_del);
+ M(MACIP_ACL_INTERFACE_ADD_DEL, mp);
mp->acl_index = ntohl(acl_index);
mp->sw_if_index = ntohl(sw_if_index);
mp->is_add = is_add;
static int api_acl_interface_set_acl_list (vat_main_t * vam)
{
- acl_test_main_t * sm = &acl_test_main;
unformat_input_t * i = vam->input;
f64 timeout;
vl_api_acl_interface_set_acl_list_t * mp;
}
/* Construct the API message */
- M2(ACL_INTERFACE_SET_ACL_LIST, acl_interface_set_acl_list, sizeof(u32) * (vec_len(inacls) + vec_len(outacls)));
+ M2(ACL_INTERFACE_SET_ACL_LIST, mp, sizeof(u32) * (vec_len(inacls) + vec_len(outacls)));
mp->sw_if_index = ntohl(sw_if_index);
mp->n_input = vec_len(inacls);
mp->count = vec_len(inacls) + vec_len(outacls);
static int api_acl_interface_list_dump (vat_main_t * vam)
{
- acl_test_main_t * sm = &acl_test_main;
unformat_input_t * i = vam->input;
f64 timeout;
u32 sw_if_index = ~0;
}
/* Construct the API message */
- M(ACL_INTERFACE_LIST_DUMP, acl_interface_list_dump);
+ M(ACL_INTERFACE_LIST_DUMP, mp);
mp->sw_if_index = ntohl (sw_if_index);
/* send it... */
static int api_acl_dump (vat_main_t * vam)
{
- acl_test_main_t * sm = &acl_test_main;
unformat_input_t * i = vam->input;
f64 timeout;
u32 acl_index = ~0;
}
/* Construct the API message */
- M(ACL_DUMP, acl_dump);
+ M(ACL_DUMP, mp);
mp->acl_index = ntohl (acl_index);
/* send it... */
static int api_macip_acl_dump (vat_main_t * vam)
{
- acl_test_main_t * sm = &acl_test_main;
unformat_input_t * i = vam->input;
f64 timeout;
u32 acl_index = ~0;
}
/* Construct the API message */
- M(MACIP_ACL_DUMP, macip_acl_dump);
+ M(MACIP_ACL_DUMP, mp);
mp->acl_index = ntohl (acl_index);
/* send it... */
_(macip_acl_interface_get, "")
-
-void vat_api_hookup (vat_main_t *vam)
+static
+void acl_vat_api_hookup (vat_main_t *vam)
{
acl_test_main_t * sm = &acl_test_main;
/* Hook up handlers for replies from the data plane plug-in */
sm->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name);
if (sm->msg_id_base != (u16) ~0)
- vat_api_hookup (vam);
+ acl_vat_api_hookup (vam);
vec_free(name);