api_main_init (vlib_main_t * vm)
{
vat_main_t *vam = &vat_main;
+ int rv;
+ int vat_plugin_init (vat_main_t * vam);
vam->vlib_main = vm;
vam->my_client_index = (u32) ~ 0;
+ /* Ensure that vam->inbuf is never NULL */
+ vec_validate (vam->inbuf, 0);
+ vec_validate (vam->cmd_reply, 0);
+ vec_reset_length (vam->cmd_reply);
init_error_string_table (vam);
- vat_api_hookup (vam);
+ rv = vat_plugin_init (vam);
+ if (rv)
+ clib_warning ("vat_plugin_init returned %d", rv);
+
return 0;
}
VLIB_INIT_FUNCTION (api_main_init);
+void
+vat_plugin_hash_create (void)
+{
+ vat_main_t *vam = &vat_main;
+
+ vam->sw_if_index_by_interface_name = hash_create_string (0, sizeof (uword));
+ vam->function_by_name = hash_create_string (0, sizeof (uword));
+ vam->help_by_name = hash_create_string (0, sizeof (uword));
+}
+
+static void
+maybe_register_api_client (vat_main_t * vam)
+{
+ vl_api_registration_t **regpp;
+ vl_api_registration_t *regp;
+ svm_region_t *svm;
+ void *oldheap;
+ api_main_t *am = &api_main;
+
+ if (vam->my_client_index != ~0)
+ return;
+
+ pool_get (am->vl_clients, regpp);
+
+ svm = am->vlib_rp;
+
+ pthread_mutex_lock (&svm->mutex);
+ oldheap = svm_push_data_heap (svm);
+ *regpp = clib_mem_alloc (sizeof (vl_api_registration_t));
+
+ regp = *regpp;
+ memset (regp, 0, sizeof (*regp));
+ regp->registration_type = REGISTRATION_TYPE_SHMEM;
+ regp->vl_api_registration_pool_index = regpp - am->vl_clients;
+ regp->vlib_rp = svm;
+ regp->shmem_hdr = am->shmem_hdr;
+
+ /* Loopback connection */
+ regp->vl_input_queue = am->shmem_hdr->vl_input_queue;
+
+ regp->name = format (0, "%s", "vpp-internal");
+ vec_add1 (regp->name, 0);
+
+ pthread_mutex_unlock (&svm->mutex);
+ svm_pop_heap (oldheap);
+
+ vam->my_client_index = vl_msg_api_handle_from_index_and_epoch
+ (regp->vl_api_registration_pool_index,
+ am->shmem_hdr->application_restarts);
+}
+
static clib_error_t *
api_command_fn (vlib_main_t * vm,
unformat_input_t * input, vlib_cli_command_t * cmd)
int (*fp) (vat_main_t *);
api_main_t *am = &api_main;
+ maybe_register_api_client (vam);
+
vam->vl_input_queue = am->shmem_hdr->vl_input_queue;
- vec_reset_length (vam->inbuf);
+ /* vec_validated in the init routine */
+ _vec_len (vam->inbuf) = 0;
+
vam->input = &_input;
while (((c = unformat_get_input (input)) != '\n') &&
(c != UNFORMAT_END_OF_INPUT))
vec_add1 (vam->inbuf, c);
- /* Add 1 octet's worth of extra space in case there are no args... */
+ /* Null-terminate the command */
vec_add1 (vam->inbuf, 0);
- /*$$$$ reinstall macro evaluator */
+ /* In case no args given */
+ vec_add1 (vam->inbuf, 0);
/* Split input into cmd + args */
this_cmd = cmdp = vam->inbuf;
+ /* Skip leading whitespace */
while (cmdp < (this_cmd + vec_len (this_cmd)))
{
if (*cmdp == ' ' || *cmdp == '\t' || *cmdp == '\n')
}
argsp = cmdp;
+
+ /* Advance past the command */
while (argsp < (this_cmd + vec_len (this_cmd)))
{
- if (*argsp != ' ' && *argsp != '\t' && *argsp != '\n')
+ if (*argsp != ' ' && *argsp != '\t' && *argsp != '\n' && *argsp != 0)
{
argsp++;
}
else
break;
}
+ /* NULL terminate the command */
*argsp++ = 0;
- while (argsp < (this_cmd + vec_len (this_cmd)))
- {
- if (*argsp == ' ' || *argsp == '\t' || *argsp == '\n')
- {
- argsp++;
- }
- else
- break;
- }
+ /* No arguments? Ensure that argsp points to a proper (empty) string */
+ if (argsp == (this_cmd + vec_len (this_cmd) - 1))
+ argsp[0] = 0;
+ else
+ while (argsp < (this_cmd + vec_len (this_cmd)))
+ {
+ if (*argsp == ' ' || *argsp == '\t' || *argsp == '\n')
+ {
+ argsp++;
+ }
+ else
+ break;
+ }
/* Blank input line? */
if (*cmdp == 0)
VLIB_CLI_COMMAND (api_command, static) =
{
.path = "binary-api",
- .short_help = "binary-api <name> [<args>]",
+ .short_help = "binary-api [help] <name> [<args>]",
.function = api_command_fn,
};
/* *INDENT-ON* */
vec_free (s);
}
+u16
+vl_client_get_first_plugin_msg_id (const char *plugin_name)
+{
+ api_main_t *am = &api_main;
+ vl_api_msg_range_t *rp;
+ uword *p;
+
+ p = hash_get_mem (am->msg_range_by_name, plugin_name);
+ if (p == 0)
+ return ~0;
+
+ rp = vec_elt_at_index (am->msg_ranges, p[0]);
+
+ return (rp->first_msg_id);
+}
+
+uword
+unformat_sw_if_index (unformat_input_t * input, va_list * args)
+{
+ u32 *result = va_arg (*args, u32 *);
+ vnet_main_t *vnm = vnet_get_main ();
+ u32 sw_if_index = ~0;
+
+ if (unformat (input, "%U", unformat_vnet_sw_interface, vnm, &sw_if_index))
+ {
+ *result = sw_if_index;
+ return 1;
+ }
+ return 0;
+}
+
/*
* fd.io coding-style-patch-verification: ON
*