summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorOle Troan <ot@cisco.com>2018-09-11 11:26:12 +0200
committerNeale Ranns <nranns@cisco.com>2018-09-11 12:12:51 +0000
commit958cff701dfb86f25407b14f7da5375a9503dfbe (patch)
tree71119b8a1edd516adf9b6e76a8a252f43c4ed32a /src
parent0be66e160f480dd325882409bfefdf042dfe6d1c (diff)
VAT: plugin load errors
- NSH plugin overrode vat_api_hookup() - Missing format function in mactime. Change-Id: I2dcbc2522d8f525d223c2ee3bb667111d1b3b78e Signed-off-by: Ole Troan <ot@cisco.com>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/mactime/mactime_test.c21
-rw-r--r--src/plugins/nsh/nsh_test.c5
2 files changed, 22 insertions, 4 deletions
diff --git a/src/plugins/mactime/mactime_test.c b/src/plugins/mactime/mactime_test.c
index 309b101bad9..351493daf24 100644
--- a/src/plugins/mactime/mactime_test.c
+++ b/src/plugins/mactime/mactime_test.c
@@ -129,6 +129,23 @@ api_mactime_enable_disable (vat_main_t * vam)
return ret;
}
+/* These two ought to be in a library somewhere but they aren't */
+static uword
+my_unformat_mac_address (unformat_input_t * input, va_list * args)
+{
+ u8 *a = va_arg (*args, u8 *);
+ return unformat (input, "%x:%x:%x:%x:%x:%x", &a[0], &a[1], &a[2], &a[3],
+ &a[4], &a[5]);
+}
+
+static u8 *
+my_format_mac_address (u8 * s, va_list * args)
+{
+ u8 *a = va_arg (*args, u8 *);
+ return format (s, "%02x:%02x:%02x:%02x:%02x:%02x",
+ a[0], a[1], a[2], a[3], a[4], a[5]);
+}
+
static int
api_mactime_add_del_range (vat_main_t * vam)
{
@@ -163,7 +180,7 @@ api_mactime_add_del_range (vat_main_t * vam)
allow = 1;
else if (unformat (i, "drop-static"))
drop = 1;
- else if (unformat (i, "mac %U", unformat_mac_address, mac_address))
+ else if (unformat (i, "mac %U", my_unformat_mac_address, mac_address))
mac_set = 1;
else if (unformat (i, "del"))
is_add = 0;
@@ -200,7 +217,7 @@ api_mactime_add_del_range (vat_main_t * vam)
/* Cough up a device name if none set */
if (name_set == 0)
{
- device_name = format (0, "mac %U%c", format_mac_address,
+ device_name = format (0, "mac %U%c", my_format_mac_address,
mac_address, 0);
}
diff --git a/src/plugins/nsh/nsh_test.c b/src/plugins/nsh/nsh_test.c
index 396e84ca30d..3867289f737 100644
--- a/src/plugins/nsh/nsh_test.c
+++ b/src/plugins/nsh/nsh_test.c
@@ -365,7 +365,8 @@ _(nsh_entry_dump, "") \
_(nsh_add_del_map, "nsp <nn> nsi <nn> [del] mapped-nsp <nn> mapped-nsi <nn> [encap-gre-intf <nn> | encap-vxlan-gpe-intf <nn> | encap-none]") \
_(nsh_map_dump, "")
-void vat_api_hookup (vat_main_t *vam)
+static void
+nsh_vat_api_hookup (vat_main_t *vam)
{
nsh_test_main_t * sm = &nsh_test_main;
/* Hook up handlers for replies from the data plane plug-in */
@@ -403,7 +404,7 @@ clib_error_t * vat_plugin_register (vat_main_t *vam)
sm->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name);
if (sm->msg_id_base != (u16) ~0)
- vat_api_hookup (vam);
+ nsh_vat_api_hookup (vam);
vec_free(name);