diff options
author | 2016-12-23 17:46:08 +0530 | |
---|---|---|
committer | 2016-12-24 14:11:36 +0000 | |
commit | e4e9fbbb7c8fa4385ae31072d60ad8621fe798a4 (patch) | |
tree | 5e94ac41ad1ea327da09907bfc7aeff7dabd7373 /plugins/ioam-plugin/ioam/encap/ip6_ioam_e2e.c | |
parent | fe7cdfa629ae5b79bb5ce3c43911a370153d872e (diff) |
Merging all ioam plugin libraries to single library
Change-Id: I33a646ba45848c7400df4271e4933e28e62c9ad7
Signed-off-by: AkshayaNadahalli <anadahal@cisco.com>
Diffstat (limited to 'plugins/ioam-plugin/ioam/encap/ip6_ioam_e2e.c')
-rw-r--r-- | plugins/ioam-plugin/ioam/encap/ip6_ioam_e2e.c | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/plugins/ioam-plugin/ioam/encap/ip6_ioam_e2e.c b/plugins/ioam-plugin/ioam/encap/ip6_ioam_e2e.c index 0839cdceca7..2831a351d4f 100644 --- a/plugins/ioam-plugin/ioam/encap/ip6_ioam_e2e.c +++ b/plugins/ioam-plugin/ioam/encap/ip6_ioam_e2e.c @@ -25,8 +25,6 @@ #include <vppinfra/elog.h> #include <vnet/ip/ip6_hop_by_hop.h> -#include <vnet/plugin/plugin.h> - #include "ip6_ioam_e2e.h" ioam_e2e_main_t ioam_e2e_main; @@ -167,23 +165,6 @@ VLIB_CLI_COMMAND (ioam_show_e2e_cmd, static) = { }; /* - * 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) -{ - clib_error_t * error = 0; - - ioam_e2e_main.vlib_main = vm; - ioam_e2e_main.vnet_main = h->vnet_main; - return error; -} - -/* * Init handler E2E headet handling. * Init hanlder registers encap, decap, trace and Rewrite handlers. */ @@ -222,6 +203,9 @@ ioam_e2e_init (vlib_main_t * vm) "HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE Flow handler failed")); } + ioam_e2e_main.vlib_main = vm; + ioam_e2e_main.vnet_main = vnet_get_main(); + return (0); } |