summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--gmod/Makefile.am2
-rw-r--r--gmod/gmod/mod_vpp.c6
-rw-r--r--src/vat/main.c1
-rw-r--r--src/vnet/interface_api.c1
-rw-r--r--src/vpp/api/api.c2
5 files changed, 6 insertions, 6 deletions
diff --git a/gmod/Makefile.am b/gmod/Makefile.am
index e57f578862a..643e170df98 100644
--- a/gmod/Makefile.am
+++ b/gmod/Makefile.am
@@ -21,7 +21,7 @@ libgmodvpp_la_SOURCES = gmod/mod_vpp.c
libgmodvpp_la_LDFLAGS = -module -avoid-version
-libgmodvpp_la_LIBADD = -lsvm -lsvmdb -lvppinfra
+libgmodvpp_la_LIBADD = -lsvm -lsvmdb -lvppinfra -lapr-1
gconfdir = $(prefix)/etc/conf.d
gconf_DATA = gmod/vpp.conf
diff --git a/gmod/gmod/mod_vpp.c b/gmod/gmod/mod_vpp.c
index 572f9ef58ab..71479d2afba 100644
--- a/gmod/gmod/mod_vpp.c
+++ b/gmod/gmod/mod_vpp.c
@@ -37,14 +37,14 @@ static int vpp_metric_init (apr_pool_t *p)
int i;
if (str_params) {
- debug_msg("[mod_vpp]Received string params: %s", str_params);
+ clib_warning("[mod_vpp]Received string params: %s", str_params);
}
/* Multiple name/value pair parameters. */
if (list_params) {
- debug_msg("[mod_vpp]Received following params list: ");
+ clib_warning("[mod_vpp]Received following params list: ");
params = (mmparam*) list_params->elts;
for(i=0; i< list_params->nelts; i++) {
- debug_msg("\tParam: %s = %s", params[i].name, params[i].value);
+ clib_warning("\tParam: %s = %s", params[i].name, params[i].value);
}
}
diff --git a/src/vat/main.c b/src/vat/main.c
index e01d15ec026..9e8bb2fe599 100644
--- a/src/vat/main.c
+++ b/src/vat/main.c
@@ -19,7 +19,6 @@
vat_main_t vat_main;
#include <vlibapi/api_helper_macros.h>
-vpe_api_main_t vpe_api_main;
void
vat_suspend (vlib_main_t * vm, f64 interval)
diff --git a/src/vnet/interface_api.c b/src/vnet/interface_api.c
index 39c062714bf..0b4fa81a767 100644
--- a/src/vnet/interface_api.c
+++ b/src/vnet/interface_api.c
@@ -46,6 +46,7 @@
#undef vl_printfun
#include <vlibapi/api_helper_macros.h>
+vpe_api_main_t vpe_api_main;
#define foreach_vpe_api_msg \
_(SW_INTERFACE_SET_FLAGS, sw_interface_set_flags) \
diff --git a/src/vpp/api/api.c b/src/vpp/api/api.c
index 8df40406131..7f6a125e478 100644
--- a/src/vpp/api/api.c
+++ b/src/vpp/api/api.c
@@ -158,7 +158,7 @@ typedef enum
} resolve_t;
static vlib_node_registration_t vpe_resolver_process_node;
-vpe_api_main_t vpe_api_main;
+extern vpe_api_main_t vpe_api_main;
static int arp_change_delete_callback (u32 pool_index, u8 * notused);
static int nd_change_delete_callback (u32 pool_index, u8 * notused);