aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/ioam/export
diff options
context:
space:
mode:
authorAkshayaNadahalli <anadahal@cisco.com>2016-12-23 17:46:08 +0530
committerDamjan Marion <dmarion.lists@gmail.com>2017-01-04 17:52:59 +0000
commita90ba9d3d0daf583f225617e57252f172e99df21 (patch)
treea957442cc1ca31d7b7ad57df8d5c7d72d9dc71d3 /src/plugins/ioam/export
parent8db1c76e9ab7b0c5cd334673db3c98b8fe82a1c4 (diff)
Merging all ioam plugin libraries to single library
Double commit from 1702 branch to master. Change-Id: I33a646ba45848c7400df4271e4933e28e62c9ad7 Signed-off-by: AkshayaNadahalli <anadahal@cisco.com> (cherry picked from commit e4e9fbbb7c8fa4385ae31072d60ad8621fe798a4) Signed-off-by: AkshayaNadahalli <anadahal@cisco.com>
Diffstat (limited to 'src/plugins/ioam/export')
-rw-r--r--src/plugins/ioam/export/ioam_export.c23
1 files changed, 3 insertions, 20 deletions
diff --git a/src/plugins/ioam/export/ioam_export.c b/src/plugins/ioam/export/ioam_export.c
index b122e445b28..06634baaf4b 100644
--- a/src/plugins/ioam/export/ioam_export.c
+++ b/src/plugins/ioam/export/ioam_export.c
@@ -81,26 +81,6 @@ do { \
#define foreach_ioam_export_plugin_api_msg \
_(IOAM_EXPORT_IP6_ENABLE_DISABLE, ioam_export_ip6_enable_disable)
-/*
- * This routine exists to convince the vlib plugin framework that
- * we haven't accidentally copied a random .dll into the plugin directory.
- *
- * Also collects global variable pointers passed from the vpp engine
- */
-
-clib_error_t *
-vlib_plugin_register (vlib_main_t * vm, vnet_plugin_handoff_t * h,
- int from_early_init)
-{
- ioam_export_main_t *em = &ioam_export_main;
- clib_error_t *error = 0;
-
- em->vlib_main = vm;
- em->vnet_main = h->vnet_main;
-
- return error;
-}
-
/* Action function shared between message handler and debug CLI */
int
@@ -250,6 +230,9 @@ ioam_export_init (vlib_main_t * vm)
u32 node_index = export_node.index;
vlib_node_t *ip6_hbyh_node = NULL;
+ em->vlib_main = vm;
+ em->vnet_main = vnet_get_main ();
+
name = format (0, "ioam_export_%08x%c", api_version, 0);
/* Ask for a correctly-sized block of API message decode slots */