summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorVengada <venggovi@cisco.com>2017-03-21 01:04:46 -0700
committerNeale Ranns <nranns@cisco.com>2017-03-22 07:20:55 +0000
commitcacdea3bb9be44a468795c04bb468d2cfb321d76 (patch)
tree25137b291bdc006769b4361e33676fb1e4daf4c5 /src/plugins
parentd2a59bed1e6b368a46608fd8ff631b770af8805f (diff)
Initial draft of VPP changes to cleanup iOAM export.
This is needed for iOAM export for NSH. Change-Id: I702934b2cde8b1c07ec5c299d5fcd98dce94c62c Signed-off-by: Vengada <venggovi@cisco.com>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/ioam.am3
-rw-r--r--src/plugins/ioam/analyse/ip6/ip6_ioam_analyse.c1
-rw-r--r--src/plugins/ioam/export-common/ioam_export.h5
-rw-r--r--src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.c1
-rw-r--r--src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_thread.c1
-rw-r--r--src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_node.c2
-rw-r--r--src/plugins/ioam/export/ioam_export_thread.c1
-rw-r--r--src/plugins/ioam/export/node.c1
8 files changed, 9 insertions, 6 deletions
diff --git a/src/plugins/ioam.am b/src/plugins/ioam.am
index 40bb8f5b661..4ac69aacd53 100644
--- a/src/plugins/ioam.am
+++ b/src/plugins/ioam.am
@@ -87,7 +87,8 @@ ioam_trace_test_plugin_la_SOURCES = \
vppapitestplugins_LTLIBRARIES += ioam_trace_test_plugin.la
nobase_include_HEADERS += \
- ioam/lib-trace/trace_util.h
+ ioam/lib-trace/trace_util.h \
+ ioam/export-common/ioam_export.h
########################################
# VxLAN-GPE
diff --git a/src/plugins/ioam/analyse/ip6/ip6_ioam_analyse.c b/src/plugins/ioam/analyse/ip6/ip6_ioam_analyse.c
index c22ef0f46fd..39442b6215f 100644
--- a/src/plugins/ioam/analyse/ip6/ip6_ioam_analyse.c
+++ b/src/plugins/ioam/analyse/ip6/ip6_ioam_analyse.c
@@ -20,6 +20,7 @@
#include <vnet/ip/ip.h>
#include <ioam/ipfixcollector/ipfixcollector.h>
+extern ioam_export_main_t ioam_export_main;
static clib_error_t *
ioam_analyse_enable_disable (vlib_main_t * vm,
int is_add, int is_export, int remote_listen)
diff --git a/src/plugins/ioam/export-common/ioam_export.h b/src/plugins/ioam/export-common/ioam_export.h
index dd48a93b36b..2bf3fd5400b 100644
--- a/src/plugins/ioam/export-common/ioam_export.h
+++ b/src/plugins/ioam/export-common/ioam_export.h
@@ -76,11 +76,6 @@ typedef struct
u32 export_process_node_index;
} ioam_export_main_t;
-extern ioam_export_main_t ioam_export_main;
-extern ioam_export_main_t vxlan_gpe_ioam_export_main;
-
-extern vlib_node_registration_t export_node;
-extern vlib_node_registration_t vxlan_export_node;
#define DEFAULT_EXPORT_SIZE (3 * CLIB_CACHE_LINE_BYTES)
/*
diff --git a/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.c b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.c
index b703b8d04af..cef60903559 100644
--- a/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.c
+++ b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.c
@@ -61,6 +61,7 @@
_(VXLAN_GPE_IOAM_EXPORT_ENABLE_DISABLE, vxlan_gpe_ioam_export_enable_disable)
ioam_export_main_t vxlan_gpe_ioam_export_main;
+extern vlib_node_registration_t vxlan_export_node;
extern void vxlan_gpe_set_next_override (uword next);
/* Action function shared between message handler and debug CLI */
diff --git a/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_thread.c b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_thread.c
index 58508ebf10e..618278c6093 100644
--- a/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_thread.c
+++ b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_thread.c
@@ -20,6 +20,7 @@
#include <ioam/export-common/ioam_export.h>
static vlib_node_registration_t vxlan_gpe_ioam_export_process_node;
+extern ioam_export_main_t vxlan_gpe_ioam_export_main;
static uword
vxlan_gpe_ioam_export_process (vlib_main_t * vm,
diff --git a/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_node.c b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_node.c
index 8120f4a768d..1395413ac9d 100644
--- a/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_node.c
+++ b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_node.c
@@ -41,6 +41,8 @@ format_export_trace (u8 * s, va_list * args)
}
vlib_node_registration_t vxlan_export_node;
+extern vlib_node_registration_t export_node;
+extern ioam_export_main_t vxlan_gpe_ioam_export_main;
#define foreach_export_error \
_(RECORDED, "Packets recorded for export")
diff --git a/src/plugins/ioam/export/ioam_export_thread.c b/src/plugins/ioam/export/ioam_export_thread.c
index d2eb200936a..5f1d964355a 100644
--- a/src/plugins/ioam/export/ioam_export_thread.c
+++ b/src/plugins/ioam/export/ioam_export_thread.c
@@ -20,6 +20,7 @@
#include <ioam/export-common/ioam_export.h>
static vlib_node_registration_t ioam_export_process_node;
+extern ioam_export_main_t ioam_export_main;
static uword
ioam_export_process (vlib_main_t * vm,
diff --git a/src/plugins/ioam/export/node.c b/src/plugins/ioam/export/node.c
index b32d7841690..9b61c902ecf 100644
--- a/src/plugins/ioam/export/node.c
+++ b/src/plugins/ioam/export/node.c
@@ -41,6 +41,7 @@ format_export_trace (u8 * s, va_list * args)
}
vlib_node_registration_t export_node;
+extern ioam_export_main_t ioam_export_main;
#define foreach_export_error \
_(RECORDED, "Packets recorded for export")