#include <vlibapi/api.h>
#include <vlibmemory/api.h>
#include <vpp/app/version.h>
+#include <vlibapi/api_helper_macros.h>
-/* define message IDs */
-#define vl_msg_id(n,h) n,
-typedef enum
+#include <plugins/nsh/nsh.api_enum.h>
+#include <plugins/nsh/nsh.api_types.h>
+
+/**
+ * @brief CLI function for NSH admin up/down
+ *
+ * @param *vnm
+ * @param nsh_hw_if
+ * @param flag
+ *
+ * @return *rc
+ *
+ */
+static clib_error_t *
+nsh_interface_admin_up_down (vnet_main_t * vnm, u32 nsh_hw_if, u32 flags)
{
-#include <nsh/nsh.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 <nsh/nsh.api.h>
-#undef vl_typedefs
-
-/* define generated endian-swappers */
-#define vl_endianfun
-#include <nsh/nsh.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 <nsh/nsh.api.h>
-#undef vl_printfun
-
-/* Get the API version number */
-#define vl_api_version(n,v) static u32 api_version=(v);
-#include <nsh/nsh.api.h>
-#undef vl_api_version
-
-#define vl_msg_name_crc_list
-#include <nsh/nsh.api.h>
-#undef vl_msg_name_crc_list
+ if (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP)
+ vnet_hw_interface_set_flags (vnm, nsh_hw_if,
+ VNET_HW_INTERFACE_FLAG_LINK_UP);
+ else
+ vnet_hw_interface_set_flags (vnm, nsh_hw_if, 0);
-/*
- * A handy macro to set up a message reply.
- * Assumes that the following variables are available:
- * mp - pointer to request message
- * rmp - pointer to reply message type
- * rv - return value
+ return 0;
+}
+
+/**
+ * @brief Naming for NSH tunnel
+ *
+ * @param *s formatting string
+ * @param *args
+ *
+ * @return *s formatted string
+ *
*/
+static u8 *
+format_nsh_name (u8 * s, va_list * args)
+{
+ u32 dev_instance = va_arg (*args, u32);
+ return format (s, "nsh_tunnel%d", dev_instance);
+}
-#define REPLY_MACRO(t) \
- do { \
- unix_shared_memory_queue_t * q = \
- vl_api_client_index_to_input_queue (mp->client_index); \
- if (!q) \
- return; \
- \
- rmp = vl_msg_api_alloc (sizeof (*rmp)); \
- rmp->_vl_msg_id = ntohs((t)+nm->msg_id_base); \
- rmp->context = mp->context; \
- rmp->retval = ntohl(rv); \
- \
- vl_msg_api_send_shmem (q, (u8 *)&rmp); \
- } while(0);
-
-#define REPLY_MACRO2(t, body) \
- do { \
- unix_shared_memory_queue_t * q; \
- rv = vl_msg_api_pd_handler (mp, rv); \
- q = vl_api_client_index_to_input_queue (mp->client_index); \
- if (!q) \
- return; \
- \
- rmp = vl_msg_api_alloc (sizeof (*rmp)); \
- rmp->_vl_msg_id = ntohs((t)+nm->msg_id_base); \
- rmp->context = mp->context; \
- rmp->retval = ntohl(rv); \
- do {body;} while (0); \
- vl_msg_api_send_shmem (q, (u8 *)&rmp); \
- } while(0);
-
-/* List of message types that this plugin understands */
-
-#define foreach_nsh_plugin_api_msg \
- _(NSH_ADD_DEL_ENTRY, nsh_add_del_entry) \
- _(NSH_ENTRY_DUMP, nsh_entry_dump) \
- _(NSH_ADD_DEL_MAP, nsh_add_del_map) \
- _(NSH_MAP_DUMP, nsh_map_dump)
+/* *INDENT-OFF* */
+VNET_DEVICE_CLASS (nsh_device_class, static) = {
+ .name = "NSH",
+ .format_device_name = format_nsh_name,
+ .admin_up_down_function = nsh_interface_admin_up_down,
+};
+/* *INDENT-ON* */
static void send_nsh_entry_details
- (nsh_entry_t * t, unix_shared_memory_queue_t * q, u32 context)
+ (nsh_entry_t * t, vl_api_registration_t * rp, u32 context)
{
vl_api_nsh_entry_details_t *rmp;
nsh_main_t *nm = &nsh_main;
rmp->context = context;
- vl_msg_api_send_shmem (q, (u8 *) & rmp);
+ vl_api_send_msg (rp, (u8 *) rmp);
}
static void send_nsh_map_details
- (nsh_map_t * t, unix_shared_memory_queue_t * q, u32 context)
+ (nsh_map_t * t, vl_api_registration_t * rp, u32 context)
{
vl_api_nsh_map_details_t *rmp;
nsh_main_t *nm = &nsh_main;
rmp->context = context;
- vl_msg_api_send_shmem (q, (u8 *) & rmp);
+ vl_api_send_msg (rp, (u8 *) rmp);
}
static void
vl_api_nsh_map_dump_t_handler (vl_api_nsh_map_dump_t * mp)
{
- unix_shared_memory_queue_t *q;
nsh_main_t *nm = &nsh_main;
nsh_map_t *t;
u32 map_index;
+ vl_api_registration_t *rp;
- q = vl_api_client_index_to_input_queue (mp->client_index);
- if (q == 0)
- {
- return;
- }
+ rp = vl_api_client_index_to_registration (mp->client_index);
+ if (rp == 0)
+ return;
map_index = ntohl (mp->map_index);
if (~0 == map_index)
{
- pool_foreach (t, nm->nsh_mappings, (
- {
- send_nsh_map_details (t, q,
- mp->context);
- }
- ));
+ pool_foreach (t, nm->nsh_mappings)
+ {
+ send_nsh_map_details (t, rp, mp->context);
+ }
}
else
{
return;
}
t = &nm->nsh_mappings[map_index];
- send_nsh_map_details (t, q, mp->context);
+ send_nsh_map_details (t, rp, mp->context);
}
}
vl_api_nsh_add_del_map_t_handler (vl_api_nsh_add_del_map_t * mp)
{
vl_api_nsh_add_del_map_reply_t *rmp;
- nsh_main_t *nm = &nsh_main;
int rv;
- nsh_add_del_map_args_t _a, *a = &_a;
+ nsh_add_del_map_args_t _a = { 0 }, *a = &_a;
u32 map_index = ~0;
a->is_add = mp->is_add;
return 0;
}
-extern vnet_device_class_t nsh_device_class;
extern vnet_hw_interface_class_t nsh_hw_class;
/**
{
nsh_hw_if = nm->free_nsh_tunnel_hw_if_indices
[vec_len (nm->free_nsh_tunnel_hw_if_indices) - 1];
- _vec_len (nm->free_nsh_tunnel_hw_if_indices) -= 1;
+ vec_dec_len (nm->free_nsh_tunnel_hw_if_indices, 1);
hi = vnet_get_hw_interface (vnm, nsh_hw_if);
hi->dev_instance = map_index;
(vl_api_nsh_add_del_entry_t * mp)
{
vl_api_nsh_add_del_entry_reply_t *rmp;
- nsh_main_t *nm = &nsh_main;
int rv;
- nsh_add_del_entry_args_t _a, *a = &_a;
+ nsh_add_del_entry_args_t _a = { 0 }, *a = &_a;
u32 entry_index = ~0;
u8 tlvs_len = 0;
u8 *data = 0;
static void
vl_api_nsh_entry_dump_t_handler (vl_api_nsh_entry_dump_t * mp)
{
- unix_shared_memory_queue_t *q;
nsh_main_t *nm = &nsh_main;
nsh_entry_t *t;
u32 entry_index;
+ vl_api_registration_t *rp;
- q = vl_api_client_index_to_input_queue (mp->client_index);
- if (q == 0)
- {
- return;
- }
+ rp = vl_api_client_index_to_registration (mp->client_index);
+ if (rp == 0)
+ return;
entry_index = ntohl (mp->entry_index);
if (~0 == entry_index)
{
- pool_foreach (t, nm->nsh_entries, (
- {
- send_nsh_entry_details (t, q,
- mp->context);
- }
- ));
+ pool_foreach (t, nm->nsh_entries)
+ {
+ send_nsh_entry_details (t, rp, mp->context);
+ }
}
else
{
return;
}
t = &nm->nsh_entries[entry_index];
- send_nsh_entry_details (t, q, mp->context);
+ send_nsh_entry_details (t, rp, mp->context);
}
}
-static void
-setup_message_id_table (nsh_main_t * nm, api_main_t * am)
-{
-#define _(id,n,crc) \
- vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + nm->msg_id_base);
- foreach_vl_msg_name_crc_nsh;
-#undef _
-}
+#include <nsh/nsh.api.c>
/* Set up the API message handling tables */
-static clib_error_t *
-nsh_plugin_api_hookup (vlib_main_t * vm)
-{
- nsh_main_t *nm __attribute__ ((unused)) = &nsh_main;
-#define _(N,n) \
- vl_msg_api_set_handlers((VL_API_##N + nm->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_nsh_plugin_api_msg;
-#undef _
-
- return 0;
-}
-
clib_error_t *
nsh_api_init (vlib_main_t * vm, nsh_main_t * nm)
{
- clib_error_t *error;
- u8 *name;
-
- name = format (0, "nsh_%08x%c", api_version, 0);
-
- /* Set up the API */
- nm->msg_id_base = vl_msg_api_get_msg_ids
- ((char *) name, VL_MSG_FIRST_AVAILABLE);
-
- error = nsh_plugin_api_hookup (vm);
-
/* Add our API messages to the global name_crc hash table */
- setup_message_id_table (nm, &api_main);
+ nm->msg_id_base = setup_message_id_table ();
- vec_free (name);
-
- return error;
+ return 0;
}
/*
Code Review / vpp.git / blobdiff