#include <igmp/igmp_ssm_range.h>
/* define message IDs */
-#include <igmp/igmp_msg_enum.h>
-
-/* define message structures */
-#define vl_typedefs
-#include <igmp/igmp_all_api_h.h>
-#undef vl_typedefs
-
-/* define generated endian-swappers */
-#define vl_endianfun
-#include <igmp/igmp_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 <igmp/igmp_all_api_h.h>
-#undef vl_printfun
-
-/* Get the API version number */
-#define vl_api_version(n,v) static u32 api_version=(v);
-#include <igmp/igmp_all_api_h.h>
-#undef vl_api_version
+#include <igmp/igmp.api_enum.h>
+#include <igmp/igmp.api_types.h>
+#include <vnet/format_fns.h>
#include <vlibapi/api_helper_macros.h>
#define IGMP_MSG_ID(_id) (_id + igmp_main.msg_id_base)
-#define foreach_igmp_plugin_api_msg \
-_(IGMP_LISTEN, igmp_listen) \
-_(IGMP_ENABLE_DISABLE, igmp_enable_disable) \
-_(IGMP_PROXY_DEVICE_ADD_DEL, igmp_proxy_device_add_del) \
-_(IGMP_PROXY_DEVICE_ADD_DEL_INTERFACE, igmp_proxy_device_add_del_interface) \
-_(IGMP_DUMP, igmp_dump) \
-_(IGMP_CLEAR_INTERFACE, igmp_clear_interface) \
-_(IGMP_CLEAR_INTERFACE, igmp_clear_interface) \
-_(IGMP_GROUP_PREFIX_SET, igmp_group_prefix_set) \
-_(IGMP_GROUP_PREFIX_DUMP, igmp_group_prefix_dump) \
-_(WANT_IGMP_EVENTS, want_igmp_events) \
-
static void
vl_api_igmp_listen_t_handler (vl_api_igmp_listen_t * mp)
{
}
static void
-send_igmp_details (unix_shared_memory_queue_t * q, igmp_main_t * im,
+send_igmp_details (vl_api_registration_t * rp, igmp_main_t * im,
igmp_config_t * config, igmp_group_t * group,
igmp_src_t * src, u32 context)
{
clib_memcpy (&mp->saddr, &src->key->ip4, sizeof (src->key->ip4));
clib_memcpy (&mp->gaddr, &group->key->ip4, sizeof (group->key->ip4));
- vl_msg_api_send_shmem (q, (u8 *) & mp);
+ vl_api_send_msg (rp, (u8 *) mp);
}
static void
igmp_config_dump (igmp_main_t * im,
- unix_shared_memory_queue_t * q,
+ vl_api_registration_t * rp,
u32 context, igmp_config_t * config)
{
igmp_group_t *group;
({
FOR_EACH_SRC (src, group, IGMP_FILTER_MODE_INCLUDE,
({
- send_igmp_details (q, im, config, group, src, context);
+ send_igmp_details (rp, im, config, group, src, context);
}));
}));
/* *INDENT-ON* */
static void
vl_api_igmp_dump_t_handler (vl_api_igmp_dump_t * mp)
{
- unix_shared_memory_queue_t *q;
igmp_main_t *im = &igmp_main;
igmp_config_t *config;
u32 sw_if_index;
+ vl_api_registration_t *rp;
- q = vl_api_client_index_to_input_queue (mp->client_index);
- if (!q)
+ rp = vl_api_client_index_to_registration (mp->client_index);
+ if (rp == 0)
return;
sw_if_index = ntohl (mp->sw_if_index);
if (~0 == sw_if_index)
{
/* *INDENT-OFF* */
- pool_foreach (config, im->configs,
- ({
- igmp_config_dump(im, q, mp->context, config);
- }));
+ pool_foreach (config, im->configs)
+ {
+ igmp_config_dump(im, rp, mp->context, config);
+ }
/* *INDENT-ON* */
}
else
config = igmp_config_lookup (sw_if_index);
if (config)
{
- igmp_config_dump (im, q, mp->context, config);
+ igmp_config_dump (im, rp, mp->context, config);
}
}
}
typedef struct igmp_ssm_range_walk_ctx_t_
{
- unix_shared_memory_queue_t *q;
+ vl_api_registration_t *rp;
u32 context;
} igmp_ssm_range_walk_ctx_t;
mp->gp.type = igmp_group_type_int_to_api (type);
ip_prefix_encode (pfx, &mp->gp.prefix);
- vl_msg_api_send_shmem (ctx->q, (u8 *) & mp);
+ vl_api_send_msg (ctx->rp, (u8 *) mp);
return (WALK_CONTINUE);
}
static void
vl_api_igmp_group_prefix_dump_t_handler (vl_api_igmp_dump_t * mp)
{
- unix_shared_memory_queue_t *q;
+ vl_api_registration_t *rp;
- q = vl_api_client_index_to_input_queue (mp->client_index);
- if (!q)
+ rp = vl_api_client_index_to_registration (mp->client_index);
+ if (rp == 0)
return;
igmp_ssm_range_walk_ctx_t ctx = {
- .q = q,
+ .rp = rp,
.context = mp->context,
};
}
rv = VNET_API_ERROR_INVALID_REGISTRATION;
-done:;
+done:
REPLY_MACRO (VL_API_WANT_IGMP_EVENTS_REPLY + im->msg_id_base);
}
VL_MSG_API_REAPER_FUNCTION (want_igmp_events_reaper);
void
-send_igmp_event (unix_shared_memory_queue_t * q,
- u32 context,
+send_igmp_event (vl_api_registration_t * rp,
igmp_filter_mode_t filter,
u32 sw_if_index,
const ip46_address_t * saddr, const ip46_address_t * gaddr)
clib_memset (mp, 0, sizeof (*mp));
mp->_vl_msg_id = ntohs ((VL_API_IGMP_EVENT) + igmp_main.msg_id_base);
- mp->context = context;
mp->sw_if_index = htonl (sw_if_index);
mp->filter = htonl (filter);
clib_memcpy (&mp->saddr, &saddr->ip4, sizeof (ip4_address_t));
clib_memcpy (&mp->gaddr, &gaddr->ip4, sizeof (ip4_address_t));
- vl_msg_api_send_shmem (q, (u8 *) & mp);
+ vl_api_send_msg (rp, (u8 *) mp);
}
void
const ip46_address_t * saddr, const ip46_address_t * gaddr)
{
vpe_client_registration_t *api_client;
- unix_shared_memory_queue_t *q;
+ vl_api_registration_t *rp;
igmp_main_t *im;
im = &igmp_main;
/* *INDENT-OFF* */
- pool_foreach (api_client, im->api_clients,
- ({
- q = vl_api_client_index_to_input_queue (api_client->client_index);
- if (q)
- send_igmp_event (q, 0, filter, sw_if_index, saddr, gaddr);
- }));
+ pool_foreach (api_client, im->api_clients)
+ {
+ rp = vl_api_client_index_to_registration (api_client->client_index);
+ if (rp)
+ send_igmp_event (rp, filter, sw_if_index, saddr, gaddr);
+ }
/* *INDENT-ON* */
}
-#define vl_msg_name_crc_list
-#include <igmp/igmp_all_api_h.h>
-#undef vl_msg_name_crc_list
-
-static void
-setup_message_id_table (igmp_main_t * im, api_main_t * am)
-{
-#define _(id,n,crc) \
- vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + im->msg_id_base);
- foreach_vl_msg_name_crc_igmp;
-#undef _
-}
-
/* Set up the API message handling tables */
+#include <igmp/igmp.api.c>
static clib_error_t *
igmp_plugin_api_hookup (vlib_main_t * vm)
{
igmp_main_t *im = &igmp_main;
- api_main_t *am = &api_main;
- u8 *name;
-
- /* Construct the API name */
- name = format (0, "igmp_%08x%c", api_version, 0);
/* Ask for a correctly-sized block of API message decode slots */
- im->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 + im->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_igmp_plugin_api_msg;
-#undef _
-
- /*
- * Set up the (msg_name, crc, message-id) table
- */
- setup_message_id_table (im, am);
-
- vec_free (name);
+ im->msg_id_base = setup_message_id_table ();
+
return 0;
}
Code Review / vpp.git / blobdiff