diff options
Diffstat (limited to 'src/plugins/igmp/igmp_api.c')
-rw-r--r-- | src/plugins/igmp/igmp_api.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/src/plugins/igmp/igmp_api.c b/src/plugins/igmp/igmp_api.c index 72c1b0394a8..3f743d8fee1 100644 --- a/src/plugins/igmp/igmp_api.c +++ b/src/plugins/igmp/igmp_api.c @@ -71,7 +71,7 @@ vl_api_igmp_listen_t_handler (vl_api_igmp_listen_t * mp) BAD_SW_IF_INDEX_LABEL; done:; - REPLY_MACRO (IGMP_MSG_ID (VL_API_IGMP_LISTEN_REPLY)); + REPLY_MACRO (VL_API_IGMP_LISTEN_REPLY); } static void @@ -88,7 +88,7 @@ vl_api_igmp_enable_disable_t_handler (vl_api_igmp_enable_disable_t * mp) BAD_SW_IF_INDEX_LABEL; - REPLY_MACRO (IGMP_MSG_ID (VL_API_IGMP_ENABLE_DISABLE_REPLY)); + REPLY_MACRO (VL_API_IGMP_ENABLE_DISABLE_REPLY); } static void @@ -106,7 +106,7 @@ vl_api_igmp_proxy_device_add_del_t_handler (vl_api_igmp_proxy_device_add_del_t BAD_SW_IF_INDEX_LABEL; - REPLY_MACRO (IGMP_MSG_ID (VL_API_IGMP_PROXY_DEVICE_ADD_DEL_REPLY)); + REPLY_MACRO (VL_API_IGMP_PROXY_DEVICE_ADD_DEL_REPLY); } static void @@ -124,8 +124,7 @@ static void BAD_SW_IF_INDEX_LABEL; - REPLY_MACRO (IGMP_MSG_ID - (VL_API_IGMP_PROXY_DEVICE_ADD_DEL_INTERFACE_REPLY)); + REPLY_MACRO (VL_API_IGMP_PROXY_DEVICE_ADD_DEL_INTERFACE_REPLY); } static void @@ -155,7 +154,6 @@ igmp_config_dump (igmp_main_t * im, igmp_group_t *group; igmp_src_t *src; - /* *INDENT-OFF* */ FOR_EACH_GROUP (group, config, ({ FOR_EACH_SRC (src, group, IGMP_FILTER_MODE_INCLUDE, @@ -163,7 +161,6 @@ igmp_config_dump (igmp_main_t * im, send_igmp_details (rp, im, config, group, src, context); })); })); - /* *INDENT-ON* */ } static void @@ -181,12 +178,10 @@ vl_api_igmp_dump_t_handler (vl_api_igmp_dump_t * mp) sw_if_index = ntohl (mp->sw_if_index); if (~0 == sw_if_index) { - /* *INDENT-OFF* */ pool_foreach (config, im->configs) { igmp_config_dump(im, rp, mp->context, config); } - /* *INDENT-ON* */ } else { @@ -209,7 +204,7 @@ vl_api_igmp_clear_interface_t_handler (vl_api_igmp_clear_interface_t * mp) if (config) igmp_clear_config (config); - REPLY_MACRO (IGMP_MSG_ID (VL_API_IGMP_CLEAR_INTERFACE_REPLY)); + REPLY_MACRO (VL_API_IGMP_CLEAR_INTERFACE_REPLY); } static vl_api_group_prefix_type_t @@ -250,7 +245,7 @@ vl_api_igmp_group_prefix_set_t_handler (vl_api_igmp_group_prefix_set_t * mp) ip_prefix_decode (&mp->gp.prefix, &pfx); igmp_group_prefix_set (&pfx, igmp_group_type_api_to_int (mp->gp.type)); - REPLY_MACRO (IGMP_MSG_ID (VL_API_IGMP_GROUP_PREFIX_SET_REPLY)); + REPLY_MACRO (VL_API_IGMP_GROUP_PREFIX_SET_REPLY); } typedef struct igmp_ssm_range_walk_ctx_t_ @@ -343,7 +338,7 @@ vl_api_want_igmp_events_t_handler (vl_api_want_igmp_events_t * mp) rv = VNET_API_ERROR_INVALID_REGISTRATION; done: - REPLY_MACRO (VL_API_WANT_IGMP_EVENTS_REPLY + im->msg_id_base); + REPLY_MACRO (VL_API_WANT_IGMP_EVENTS_REPLY); } static clib_error_t * @@ -402,14 +397,12 @@ igmp_event (igmp_filter_mode_t filter, vnet_get_main (), sw_if_index, format_igmp_filter_mode, filter); - /* *INDENT-OFF* */ 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* */ } /* Set up the API message handling tables */ |