From 3bde40778cc2bf5fab6b13d81eca0180f7d27af3 Mon Sep 17 00:00:00 2001 From: Vengada Date: Thu, 9 Mar 2017 22:05:02 -0800 Subject: VPP changes to support iOAM over NSH-MD2. Separate trace data structure definitions into two files to share code with NSH plugin (iOAM) Change-Id: I0192551f71678e4f814bc6a7d25200a1580f3033 Signed-off-by: Vengada --- src/plugins/ioam/lib-trace/trace_util.h | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'src/plugins/ioam/lib-trace/trace_util.h') diff --git a/src/plugins/ioam/lib-trace/trace_util.h b/src/plugins/ioam/lib-trace/trace_util.h index c8b504701e4..61f18d9173a 100644 --- a/src/plugins/ioam/lib-trace/trace_util.h +++ b/src/plugins/ioam/lib-trace/trace_util.h @@ -62,7 +62,6 @@ typedef struct vnet_main_t *vnet_main; } trace_main_t; -extern trace_main_t trace_main; /* * Initialize Trace profile @@ -70,19 +69,6 @@ extern trace_main_t trace_main; int trace_util_init (void); -/* - * Find a trace profile - */ - -always_inline trace_profile * -trace_profile_find (void) -{ - trace_main_t *sm = &trace_main; - - return (&(sm->profile)); -} - - /* setup and clean up profile */ int trace_profile_create (trace_profile * profile, u8 trace_type, u8 num_elts, u32 trace_tsp, u32 node_id, u32 app_data); @@ -94,10 +80,12 @@ typedef CLIB_PACKED (struct { u8 ioam_trace_type; u8 data_list_elts_left; - u32 elts[0]; /* Variable type. So keep it generic */ + u32 elts[0]; /* Variable type. So keep it generic */ }) ioam_trace_hdr_t; /* *INDENT-ON* */ + + #define BIT_TTL_NODEID (1<<0) #define BIT_ING_INTERFACE (1<<1) #define BIT_EGR_INTERFACE (1<<2) @@ -218,7 +206,7 @@ typedef struct } ioam_trace_ts_app_t; static inline u8 -fetch_trace_data_size (u8 trace_type) +fetch_trace_data_size (u16 trace_type) { u8 trace_data_size = 0; -- cgit 1.2.3-korg