#include <vnet/api_errno.h>
#include <vnet/feature/feature.h>
#include <vnet/fib/fib_table.h>
-
+#include <vnet/ip/ip_types_api.h>
#include <vppinfra/byte_order.h>
#include <vlibmemory/api.h>
#include <pppoe/pppoe.h>
-
-#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
-
-/* define generated endian-swappers */
-#define vl_endianfun
-#include <pppoe/pppoe.api.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 <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
-
-#define vl_msg_name_crc_list
-#include <pppoe/pppoe.api.h>
-#undef vl_msg_name_crc_list
+#include <vnet/format_fns.h>
+#include <pppoe/pppoe.api_enum.h>
+#include <pppoe/pppoe.api_types.h>
#define REPLY_MSG_ID_BASE pem->msg_id_base
#include <vlibapi/api_helper_macros.h>
-static void
-setup_message_id_table (pppoe_main_t * pem, api_main_t * am)
-{
-#define _(id,n,crc) \
- vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + pem->msg_id_base);
- foreach_vl_msg_name_crc_pppoe;
-#undef _
-}
-
-#define foreach_pppoe_plugin_api_msg \
-_(PPPOE_ADD_DEL_SESSION, pppoe_add_del_session) \
-_(PPPOE_SESSION_DUMP, pppoe_session_dump)
-
static void vl_api_pppoe_add_del_session_t_handler
(vl_api_pppoe_add_del_session_t * mp)
{
vnet_pppoe_add_del_session_args_t a = {
.is_add = mp->is_add,
- .is_ip6 = mp->is_ipv6,
.decap_fib_index = decap_fib_index,
.session_id = ntohs (mp->session_id),
- .client_ip = to_ip46 (mp->is_ipv6, mp->client_ip),
};
+ ip_address_decode (&mp->client_ip, &a.client_ip);
clib_memcpy (a.client_mac, mp->client_mac, 6);
u32 sw_if_index = ~0;
}
static void send_pppoe_session_details
- (pppoe_session_t * t, unix_shared_memory_queue_t * q, u32 context)
+ (pppoe_session_t * t, vl_api_registration_t * reg, u32 context)
{
vl_api_pppoe_session_details_t *rmp;
ip4_main_t *im4 = &ip4_main;
u8 is_ipv6 = !ip46_address_is_ip4 (&t->client_ip);
rmp = vl_msg_api_alloc (sizeof (*rmp));
- memset (rmp, 0, sizeof (*rmp));
+ clib_memset (rmp, 0, sizeof (*rmp));
rmp->_vl_msg_id = ntohs (VL_API_PPPOE_SESSION_DETAILS);
+ ip_address_encode (&t->client_ip, is_ipv6 ? IP46_TYPE_IP6 : IP46_TYPE_IP4,
+ &rmp->client_ip);
+
if (is_ipv6)
{
- memcpy (rmp->client_ip, t->client_ip.ip6.as_u8, 16);
rmp->decap_vrf_id = htonl (im6->fibs[t->decap_fib_index].ft_table_id);
}
else
{
- memcpy (rmp->client_ip, t->client_ip.ip4.as_u8, 4);
rmp->decap_vrf_id = htonl (im4->fibs[t->decap_fib_index].ft_table_id);
}
rmp->session_id = htons (t->session_id);
clib_memcpy (rmp->local_mac, t->local_mac, 6);
clib_memcpy (rmp->client_mac, t->client_mac, 6);
rmp->sw_if_index = htonl (t->sw_if_index);
- rmp->is_ipv6 = is_ipv6;
rmp->context = context;
- vl_msg_api_send_shmem (q, (u8 *) & rmp);
+ vl_api_send_msg (reg, (u8 *) rmp);
}
static void
vl_api_pppoe_session_dump_t_handler (vl_api_pppoe_session_dump_t * mp)
{
- unix_shared_memory_queue_t *q;
+ vl_api_registration_t *reg;
pppoe_main_t *pem = &pppoe_main;
pppoe_session_t *t;
u32 sw_if_index;
- q = vl_api_client_index_to_input_queue (mp->client_index);
- if (q == 0)
- {
- return;
- }
+ reg = vl_api_client_index_to_registration (mp->client_index);
+ if (!reg)
+ return;
sw_if_index = ntohl (mp->sw_if_index);
/* *INDENT-OFF* */
pool_foreach (t, pem->sessions,
({
- send_pppoe_session_details(t, q, mp->context);
+ send_pppoe_session_details(t, reg, mp->context);
}));
/* *INDENT-ON* */
}
return;
}
t = &pem->sessions[pem->session_index_by_sw_if_index[sw_if_index]];
- send_pppoe_session_details (t, q, mp->context);
+ send_pppoe_session_details (t, reg, mp->context);
}
}
-
-static clib_error_t *
-pppoe_api_hookup (vlib_main_t * vm)
+static void
+vl_api_pppoe_add_del_cp_t_handler (vl_api_pppoe_add_del_cp_t * mp)
{
+ vl_api_pppoe_add_del_cp_reply_t *rmp;
+ i32 rv = 0;
pppoe_main_t *pem = &pppoe_main;
- u8 *name = format (0, "pppoe_%08x%c", api_version, 0);
- pem->msg_id_base = vl_msg_api_get_msg_ids
- ((char *) name, VL_MSG_FIRST_AVAILABLE);
+ rv = pppoe_add_del_cp (ntohl (mp->sw_if_index), mp->is_add);
-#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_pppoe_plugin_api_msg;
-#undef _
+ /* *INDENT-OFF* */
+ REPLY_MACRO(VL_API_PPPOE_ADD_DEL_CP_REPLY);
+ /* *INDENT-ON* */
+}
- /* Add our API messages to the global name_crc hash table */
- setup_message_id_table (pem, &api_main);
+#include <pppoe/pppoe.api.c>
+static clib_error_t *
+pppoe_api_hookup (vlib_main_t * vm)
+{
+ pppoe_main_t *pem = &pppoe_main;
+ pem->msg_id_base = setup_message_id_table ();
return 0;
}
Code Review / vpp.git / blobdiff