#include <nsh/nsh.api.h>
#undef vl_msg_name_crc_list
-/*
- * 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
- */
-
-#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);
+#define REPLY_MSG_ID_BASE nm->msg_id_base
+#include <vlibapi/api_helper_macros.h>
/* List of message types that this plugin understands */
_(NSH_ADD_DEL_MAP, nsh_add_del_map) \
_(NSH_MAP_DUMP, nsh_map_dump)
+/**
+ * @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)
+{
+ 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);
+
+ 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);
+}
+
+/* *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);
}
}
return 0;
}
-extern vnet_device_class_t nsh_device_class;
extern vnet_hw_interface_class_t nsh_hw_class;
/**
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);
}
}
error = nsh_plugin_api_hookup (vm);
/* Add our API messages to the global name_crc hash table */
- setup_message_id_table (nm, &api_main);
+ setup_message_id_table (nm, vlibapi_get_main ());
vec_free (name);
Code Review / vpp.git / blobdiff