diff options
| -rw-r--r-- | src/plugins/ioam.am | 3 | ||||
| -rw-r--r-- | src/plugins/ioam/analyse/ip6/ip6_ioam_analyse.c | 1 | ||||
| -rw-r--r-- | src/plugins/ioam/export-common/ioam_export.h | 5 | ||||
| -rw-r--r-- | src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.c | 1 | ||||
| -rw-r--r-- | src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_thread.c | 1 | ||||
| -rw-r--r-- | src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_node.c | 2 | ||||
| -rw-r--r-- | src/plugins/ioam/export/ioam_export_thread.c | 1 | ||||
| -rw-r--r-- | src/plugins/ioam/export/node.c | 1 |
8 files changed, 9 insertions, 6 deletions
diff --git a/src/plugins/ioam.am b/src/plugins/ioam.am index 40bb8f5b..4ac69aac 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 c22ef0f4..39442b62 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 dd48a93b..2bf3fd54 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 b703b8d0..cef60903 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 58508ebf..618278c6 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 8120f4a7..1395413a 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 d2eb2009..5f1d9643 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 b32d7841..9b61c902 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") |