Move iOAM Trace as a plugin

Change-Id: I78322e91485e5429871bd356f668b8ed90f4265a
Signed-off-by: Vengada Govindan <venggovi@cisco.com>

3 files changed, 547 insertions, 822 deletions

diff --git a/vnet/vnet/ip/ip6_hop_by_hop.c b/vnet/vnet/ip/ip6_hop_by_hop.c
index 7038556848c..2a037033d13 100644
--- a/vnet/vnet/ip/ip6_hop_by_hop.c
+++ b/vnet/vnet/ip/ip6_hop_by_hop.c
@@ -25,180 +25,33 @@
 
 #include <vnet/ip/ip6_hop_by_hop.h>
 
-/* Timestamp precision multipliers for seconds, milliseconds, microseconds
- * and nanoseconds respectively.
- */
-static f64 trace_tsp_mul[4] = {1, 1e3, 1e6, 1e9};
-
-char *ppc_state[] = {"None", "Encap", "Decap"};
+char *ppc_state[] = { "None", "Encap", "Decap" };
 
 ip6_hop_by_hop_ioam_main_t ip6_hop_by_hop_ioam_main;
 
 #define foreach_ip6_hbyh_ioam_input_next	\
   _(IP6_REWRITE, "ip6-rewrite")			\
   _(IP6_LOOKUP, "ip6-lookup")			\
-  _(DROP, "error-drop")                        
+  _(DROP, "error-drop")
 
-typedef enum {
+typedef enum
+{
 #define _(s,n) IP6_HBYH_IOAM_INPUT_NEXT_##s,
   foreach_ip6_hbyh_ioam_input_next
 #undef _
-  IP6_HBYH_IOAM_INPUT_N_NEXT,
+    IP6_HBYH_IOAM_INPUT_N_NEXT,
 } ip6_hbyh_ioam_input_next_t;
 
-typedef union {
-    u64 as_u64;
-    u32 as_u32[2];
-} time_u64_t;
-
-static inline u8
-fetch_trace_data_size(u8 trace_type)
-{
-  u8 trace_data_size = 0;
-
-  if (trace_type == TRACE_TYPE_IF_TS_APP)   
-      trace_data_size = sizeof(ioam_trace_if_ts_app_t);
-  else if(trace_type == TRACE_TYPE_IF)      
-      trace_data_size = sizeof(ioam_trace_if_t);
-  else if(trace_type == TRACE_TYPE_TS)      
-      trace_data_size = sizeof(ioam_trace_ts_t);
-  else if(trace_type == TRACE_TYPE_APP)     
-      trace_data_size = sizeof(ioam_trace_app_t);
-  else if(trace_type == TRACE_TYPE_TS_APP)  
-      trace_data_size = sizeof(ioam_trace_ts_app_t);
-
-  return trace_data_size;
-}
-
-static u8 * format_ioam_data_list_element (u8 * s, va_list * args)
-{ 
-  u32 *elt = va_arg (*args, u32 *);
-  u8  *trace_type_p = va_arg (*args, u8 *);
-  u8  trace_type = *trace_type_p;
 
 
-  if (trace_type & BIT_TTL_NODEID)
-    {
-      u32 ttl_node_id_host_byte_order = clib_net_to_host_u32 (*elt);
-      s = format (s, "ttl 0x%x node id 0x%x ",
-              ttl_node_id_host_byte_order>>24,
-              ttl_node_id_host_byte_order & 0x00FFFFFF);
-
-      elt++;
-    }
- 
-  if (trace_type & BIT_ING_INTERFACE && trace_type & BIT_ING_INTERFACE)
-    {
-        u32 ingress_host_byte_order = clib_net_to_host_u32(*elt);
-        s = format (s, "ingress 0x%x egress 0x%x ", 
-                   ingress_host_byte_order >> 16, 
-                   ingress_host_byte_order &0xFFFF);
-        elt++;
-    }
- 
-  if (trace_type & BIT_TIMESTAMP)
-    {
-        u32 ts_in_host_byte_order = clib_net_to_host_u32 (*elt);
-        s = format (s, "ts 0x%x \n", ts_in_host_byte_order);
-        elt++;
-    }
- 
-  if (trace_type & BIT_APPDATA)
-    {
-        u32 appdata_in_host_byte_order = clib_net_to_host_u32 (*elt);
-        s = format (s, "app 0x%x ", appdata_in_host_byte_order);
-        elt++;
-    }
- 
-  return s;
-}
-
-u8 *
-ip6_hbh_ioam_trace_data_list_trace_handler (u8 *s, ip6_hop_by_hop_option_t *opt)
-{
-  ioam_trace_option_t *trace;
-  u8 trace_data_size_in_words = 0;
-  u32 *elt;
-  int elt_index = 0;
-
-  trace = (ioam_trace_option_t *)opt;
-#if 0
-  s = format (s, "  Trace Type 0x%x , %d elts left ts msb(s) 0x%x\n", trace->ioam_trace_type, trace->data_list_elts_left,
-	      t->timestamp_msbs);
-#endif
-  s = format (s, "  Trace Type 0x%x , %d elts left\n", trace->ioam_trace_type, trace->data_list_elts_left);
-  trace_data_size_in_words = fetch_trace_data_size(trace->ioam_trace_type)/4;
-  elt = &trace->elts[0];
-  while ((u8 *) elt < ((u8 *)(&trace->elts[0]) + trace->hdr.length - 2
-			/* -2 accounts for ioam_trace_type,elts_left */)) {
-    s = format (s, "    [%d] %U\n",elt_index,
-		format_ioam_data_list_element,
-		elt, &trace->ioam_trace_type);
-    elt_index++;
-    elt += trace_data_size_in_words;
-  }
-  return (s);
-}
-
-int
-ip6_hbh_ioam_trace_data_list_handler (vlib_buffer_t *b, ip6_header_t *ip, ip6_hop_by_hop_option_t *opt)
-{
-  ip6_main_t * im = &ip6_main;
-  ip_lookup_main_t * lm = &im->lookup_main;
-  ip6_hop_by_hop_ioam_main_t * hm = &ip6_hop_by_hop_ioam_main;
-  u8 elt_index = 0;
-  ioam_trace_option_t *trace = (ioam_trace_option_t *)opt;
-  u32 adj_index = vnet_buffer (b)->ip.adj_index[VLIB_TX];
-  ip_adjacency_t *adj = ip_get_adjacency (lm, adj_index);
-  time_u64_t time_u64;
-  u32 *elt;
-  int rv = 0;
-
-  time_u64.as_u64 = 0;
-
-  if (PREDICT_TRUE (trace->data_list_elts_left)) {
-    trace->data_list_elts_left--;
-    /* fetch_trace_data_size returns in bytes. Convert it to 4-bytes
-     * to skip to this node's location.
-     */
-    elt_index = trace->data_list_elts_left * fetch_trace_data_size(trace->ioam_trace_type) / 4;
-    elt = &trace->elts[elt_index];
-    if (trace->ioam_trace_type & BIT_TTL_NODEID) {
-      *elt = clib_host_to_net_u32 ((ip->hop_limit<<24) | hm->node_id);
-      elt++;
-    }
-
-    if (trace->ioam_trace_type & BIT_ING_INTERFACE) {
-      *elt = (vnet_buffer(b)->sw_if_index[VLIB_RX]&0xFFFF) << 16 | (adj->rewrite_header.sw_if_index & 0xFFFF);
-      *elt = clib_host_to_net_u32(*elt);
-      elt++;
-    }
-                 
-    if (trace->ioam_trace_type & BIT_TIMESTAMP) {
-      /* Send least significant 32 bits */
-      f64 time_f64 = (f64)(((f64)hm->unix_time_0) + (vlib_time_now(hm->vlib_main) - hm->vlib_time_0));
-
-      time_u64.as_u64 = time_f64 * trace_tsp_mul[hm->trace_tsp];
-      *elt = clib_host_to_net_u32(time_u64.as_u32[0]);
-      elt++;
-    }
-
-    if (trace->ioam_trace_type & BIT_APPDATA) {
-      /* $$$ set elt0->app_data */
-      *elt = clib_host_to_net_u32(hm->app_data);
-      elt++;
-    }
-  }
-  return (rv);
-}
-
 /* The main h-b-h tracer will be invoked, no need to do much here */
 int
 ip6_hbh_add_register_option (u8 option,
 			     u8 size,
-			     int rewrite_options(u8 *rewrite_string, u8 rewrite_size))
+			     int rewrite_options (u8 * rewrite_string,
+						  u8 * rewrite_size))
 {
-  ip6_hop_by_hop_ioam_main_t * hm = &ip6_hop_by_hop_ioam_main;
+  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
 
   ASSERT (option < ARRAY_LEN (hm->add_options));
 
@@ -208,14 +61,14 @@ ip6_hbh_add_register_option (u8 option,
 
   hm->add_options[option] = rewrite_options;
   hm->options_size[option] = size;
-  
+
   return (0);
 }
 
 int
 ip6_hbh_add_unregister_option (u8 option)
 {
-  ip6_hop_by_hop_ioam_main_t * hm = &ip6_hop_by_hop_ioam_main;
+  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
 
   ASSERT (option < ARRAY_LEN (hm->add_options));
 
@@ -228,20 +81,21 @@ ip6_hbh_add_unregister_option (u8 option)
   return (0);
 }
 
-typedef struct {
+typedef struct
+{
   u32 next_index;
 } ip6_add_hop_by_hop_trace_t;
 
 /* packet trace format function */
-static u8 * format_ip6_add_hop_by_hop_trace (u8 * s, va_list * args)
+static u8 *
+format_ip6_add_hop_by_hop_trace (u8 * s, va_list * args)
 {
   CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
   CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  ip6_add_hop_by_hop_trace_t * t = va_arg (*args, 
-                                            ip6_add_hop_by_hop_trace_t *);
-  
-  s = format (s, "IP6_ADD_HOP_BY_HOP: next index %d",
-              t->next_index);
+  ip6_add_hop_by_hop_trace_t *t = va_arg (*args,
+					  ip6_add_hop_by_hop_trace_t *);
+
+  s = format (s, "IP6_ADD_HOP_BY_HOP: next index %d", t->next_index);
   return s;
 }
 
@@ -250,14 +104,15 @@ vlib_node_registration_t ip6_add_hop_by_hop_node;
 #define foreach_ip6_add_hop_by_hop_error \
 _(PROCESSED, "Pkts w/ added ip6 hop-by-hop options")
 
-typedef enum {
+typedef enum
+{
 #define _(sym,str) IP6_ADD_HOP_BY_HOP_ERROR_##sym,
   foreach_ip6_add_hop_by_hop_error
 #undef _
-  IP6_ADD_HOP_BY_HOP_N_ERROR,
+    IP6_ADD_HOP_BY_HOP_N_ERROR,
 } ip6_add_hop_by_hop_error_t;
 
-static char * ip6_add_hop_by_hop_error_strings[] = {
+static char *ip6_add_hop_by_hop_error_strings[] = {
 #define _(sym,string) string,
   foreach_ip6_add_hop_by_hop_error
 #undef _
@@ -265,14 +120,13 @@ static char * ip6_add_hop_by_hop_error_strings[] = {
 
 static uword
 ip6_add_hop_by_hop_node_fn (vlib_main_t * vm,
-		  vlib_node_runtime_t * node,
-		  vlib_frame_t * frame)
+			    vlib_node_runtime_t * node, vlib_frame_t * frame)
 {
-  ip6_hop_by_hop_ioam_main_t * hm = &ip6_hop_by_hop_ioam_main;
-  u32 n_left_from, * from, * to_next;
+  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
+  u32 n_left_from, *from, *to_next;
   ip_lookup_next_t next_index;
   u32 processed = 0;
-  u8 * rewrite = hm->rewrite;
+  u8 *rewrite = hm->rewrite;
   u32 rewrite_length = vec_len (rewrite);
 
   from = vlib_frame_vector_args (frame);
@@ -283,99 +137,102 @@ ip6_add_hop_by_hop_node_fn (vlib_main_t * vm,
     {
       u32 n_left_to_next;
 
-      vlib_get_next_frame (vm, node, next_index,
-			   to_next, n_left_to_next);
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
       while (n_left_from >= 4 && n_left_to_next >= 2)
-        {
-          u32 bi0, bi1;
-          vlib_buffer_t * b0, *b1;
-          u32 next0, next1;
-          ip6_header_t * ip0, *ip1;
-          ip6_hop_by_hop_header_t * hbh0, *hbh1;
-          u64 * copy_src0, * copy_dst0, *copy_src1, *copy_dst1;
-          u16 new_l0, new_l1;
-
-          /* Prefetch next iteration. */
-          {
-            vlib_buffer_t * p2, * p3;
-
-            p2 = vlib_get_buffer (vm, from[2]);
-            p3 = vlib_get_buffer (vm, from[3]);
-
-            vlib_prefetch_buffer_header (p2, LOAD);
-            vlib_prefetch_buffer_header (p3, LOAD);
-
-            CLIB_PREFETCH (p2->data - rewrite_length, 2 * CLIB_CACHE_LINE_BYTES, STORE);
-            CLIB_PREFETCH (p3->data - rewrite_length, 2 * CLIB_CACHE_LINE_BYTES, STORE);
-          }
-
-          /* speculatively enqueue b0 and b1 to the current next frame */
-          to_next[0] = bi0 = from[0];
-          to_next[1] = bi1 = from[1];
-          from += 2;
-          to_next += 2;
-          n_left_from -= 2;
-          n_left_to_next -= 2;
-
-          b0 = vlib_get_buffer (vm, bi0);
-          b1 = vlib_get_buffer (vm, bi1);
-
-          /* $$$$$ Dual loop: process 2 x packets here $$$$$ */
-          ASSERT (b0->current_data == 0);
-          ASSERT (b1->current_data == 0);
-
-          ip0 = vlib_buffer_get_current (b0);
-          ip1 = vlib_buffer_get_current (b1);
-
-          /* Copy the ip header left by the required amount */
-          copy_dst0 = (u64 *)(((u8 *)ip0) - rewrite_length);
-          copy_dst1 = (u64 *)(((u8 *)ip1) - rewrite_length);
-          copy_src0 = (u64 *) ip0;
-          copy_src1 = (u64 *) ip1;
-
-          copy_dst0 [0] = copy_src0 [0];
-          copy_dst0 [1] = copy_src0 [1];
-          copy_dst0 [2] = copy_src0 [2];
-          copy_dst0 [3] = copy_src0 [3];
-          copy_dst0 [4] = copy_src0 [4];
-
-          copy_dst1 [0] = copy_src1 [0];
-          copy_dst1 [1] = copy_src1 [1];
-          copy_dst1 [2] = copy_src1 [2];
-          copy_dst1 [3] = copy_src1 [3];
-          copy_dst1 [4] = copy_src1 [4];
-
-          vlib_buffer_advance (b0, - (word)rewrite_length);
-          vlib_buffer_advance (b1, - (word)rewrite_length);
-          ip0 = vlib_buffer_get_current (b0);
-          ip1 = vlib_buffer_get_current (b1);
-
-          hbh0 = (ip6_hop_by_hop_header_t *)(ip0 + 1);
-          hbh1 = (ip6_hop_by_hop_header_t *)(ip1 + 1);
-          /* $$$ tune, rewrite_length is a multiple of 8 */
-          clib_memcpy (hbh0, rewrite, rewrite_length);
-          clib_memcpy (hbh1, rewrite, rewrite_length);
-          /* Patch the protocol chain, insert the h-b-h (type 0) header */
-          hbh0->protocol = ip0->protocol;
-          hbh1->protocol = ip1->protocol;
-          ip0->protocol = 0;
-          ip1->protocol = 0;
-          new_l0 = clib_net_to_host_u16 (ip0->payload_length) + rewrite_length;
-          new_l1 = clib_net_to_host_u16 (ip1->payload_length) + rewrite_length;
-          ip0->payload_length = clib_host_to_net_u16 (new_l0);
-          ip1->payload_length = clib_host_to_net_u16 (new_l1);
-
-          /* Populate the (first) h-b-h list elt */
-          next0 = IP6_HBYH_IOAM_INPUT_NEXT_IP6_LOOKUP;
-          next1 = IP6_HBYH_IOAM_INPUT_NEXT_IP6_LOOKUP;
-
-
-          /* $$$$$ End of processing 2 x packets $$$$$ */
-
-          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE)))
-            {
-              if (b0->flags & VLIB_BUFFER_IS_TRACED)
-                {
+	{
+	  u32 bi0, bi1;
+	  vlib_buffer_t *b0, *b1;
+	  u32 next0, next1;
+	  ip6_header_t *ip0, *ip1;
+	  ip6_hop_by_hop_header_t *hbh0, *hbh1;
+	  u64 *copy_src0, *copy_dst0, *copy_src1, *copy_dst1;
+	  u16 new_l0, new_l1;
+
+	  /* Prefetch next iteration. */
+	  {
+	    vlib_buffer_t *p2, *p3;
+
+	    p2 = vlib_get_buffer (vm, from[2]);
+	    p3 = vlib_get_buffer (vm, from[3]);
+
+	    vlib_prefetch_buffer_header (p2, LOAD);
+	    vlib_prefetch_buffer_header (p3, LOAD);
+
+	    CLIB_PREFETCH (p2->data - rewrite_length,
+			   2 * CLIB_CACHE_LINE_BYTES, STORE);
+	    CLIB_PREFETCH (p3->data - rewrite_length,
+			   2 * CLIB_CACHE_LINE_BYTES, STORE);
+	  }
+
+	  /* speculatively enqueue b0 and b1 to the current next frame */
+	  to_next[0] = bi0 = from[0];
+	  to_next[1] = bi1 = from[1];
+	  from += 2;
+	  to_next += 2;
+	  n_left_from -= 2;
+	  n_left_to_next -= 2;
+
+	  b0 = vlib_get_buffer (vm, bi0);
+	  b1 = vlib_get_buffer (vm, bi1);
+
+	  /* $$$$$ Dual loop: process 2 x packets here $$$$$ */
+	  ASSERT (b0->current_data == 0);
+	  ASSERT (b1->current_data == 0);
+
+	  ip0 = vlib_buffer_get_current (b0);
+	  ip1 = vlib_buffer_get_current (b1);
+
+	  /* Copy the ip header left by the required amount */
+	  copy_dst0 = (u64 *) (((u8 *) ip0) - rewrite_length);
+	  copy_dst1 = (u64 *) (((u8 *) ip1) - rewrite_length);
+	  copy_src0 = (u64 *) ip0;
+	  copy_src1 = (u64 *) ip1;
+
+	  copy_dst0[0] = copy_src0[0];
+	  copy_dst0[1] = copy_src0[1];
+	  copy_dst0[2] = copy_src0[2];
+	  copy_dst0[3] = copy_src0[3];
+	  copy_dst0[4] = copy_src0[4];
+
+	  copy_dst1[0] = copy_src1[0];
+	  copy_dst1[1] = copy_src1[1];
+	  copy_dst1[2] = copy_src1[2];
+	  copy_dst1[3] = copy_src1[3];
+	  copy_dst1[4] = copy_src1[4];
+
+	  vlib_buffer_advance (b0, -(word) rewrite_length);
+	  vlib_buffer_advance (b1, -(word) rewrite_length);
+	  ip0 = vlib_buffer_get_current (b0);
+	  ip1 = vlib_buffer_get_current (b1);
+
+	  hbh0 = (ip6_hop_by_hop_header_t *) (ip0 + 1);
+	  hbh1 = (ip6_hop_by_hop_header_t *) (ip1 + 1);
+	  /* $$$ tune, rewrite_length is a multiple of 8 */
+	  clib_memcpy (hbh0, rewrite, rewrite_length);
+	  clib_memcpy (hbh1, rewrite, rewrite_length);
+	  /* Patch the protocol chain, insert the h-b-h (type 0) header */
+	  hbh0->protocol = ip0->protocol;
+	  hbh1->protocol = ip1->protocol;
+	  ip0->protocol = 0;
+	  ip1->protocol = 0;
+	  new_l0 =
+	    clib_net_to_host_u16 (ip0->payload_length) + rewrite_length;
+	  new_l1 =
+	    clib_net_to_host_u16 (ip1->payload_length) + rewrite_length;
+	  ip0->payload_length = clib_host_to_net_u16 (new_l0);
+	  ip1->payload_length = clib_host_to_net_u16 (new_l1);
+
+	  /* Populate the (first) h-b-h list elt */
+	  next0 = IP6_HBYH_IOAM_INPUT_NEXT_IP6_LOOKUP;
+	  next1 = IP6_HBYH_IOAM_INPUT_NEXT_IP6_LOOKUP;
+
+
+	  /* $$$$$ End of processing 2 x packets $$$$$ */
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
+	    {
+	      if (b0->flags & VLIB_BUFFER_IS_TRACED)
+		{
 		  ip6_add_hop_by_hop_trace_t *t =
 		    vlib_add_trace (vm, node, b0, sizeof (*t));
 		  t->next_index = next0;
@@ -387,23 +244,23 @@ ip6_add_hop_by_hop_node_fn (vlib_main_t * vm,
 		  t->next_index = next1;
 		}
 	    }
-	  processed+=2;
+	  processed += 2;
 	  /* verify speculative enqueues, maybe switch current next frame */
 	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
 					   to_next, n_left_to_next,
 					   bi0, bi1, next0, next1);
-        }
+	}
       while (n_left_from > 0 && n_left_to_next > 0)
 	{
-          u32 bi0;
-	  vlib_buffer_t * b0;
-          u32 next0;
-          ip6_header_t * ip0;
-          ip6_hop_by_hop_header_t * hbh0;
-          u64 * copy_src0, * copy_dst0;
-          u16 new_l0;
-          
-          /* speculatively enqueue b0 to the current next frame */
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+	  u32 next0;
+	  ip6_header_t *ip0;
+	  ip6_hop_by_hop_header_t *hbh0;
+	  u64 *copy_src0, *copy_dst0;
+	  u16 new_l0;
+
+	  /* speculatively enqueue b0 to the current next frame */
 	  bi0 = from[0];
 	  to_next[0] = bi0;
 	  from += 1;
@@ -413,43 +270,44 @@ ip6_add_hop_by_hop_node_fn (vlib_main_t * vm,
 
 	  b0 = vlib_get_buffer (vm, bi0);
 
-          ip0 = vlib_buffer_get_current (b0);
-
-          /* Copy the ip header left by the required amount */
-          copy_dst0 = (u64 *)(((u8 *)ip0) - rewrite_length);
-          copy_src0 = (u64 *) ip0;
-
-          copy_dst0 [0] = copy_src0 [0];
-          copy_dst0 [1] = copy_src0 [1];
-          copy_dst0 [2] = copy_src0 [2];
-          copy_dst0 [3] = copy_src0 [3];
-          copy_dst0 [4] = copy_src0 [4];
-          vlib_buffer_advance (b0, - (word)rewrite_length);
-          ip0 = vlib_buffer_get_current (b0);
-
-          hbh0 = (ip6_hop_by_hop_header_t *)(ip0 + 1);
-          /* $$$ tune, rewrite_length is a multiple of 8 */
-          clib_memcpy (hbh0, rewrite, rewrite_length);
-          /* Patch the protocol chain, insert the h-b-h (type 0) header */
-          hbh0->protocol = ip0->protocol;
-          ip0->protocol = 0;
-          new_l0 = clib_net_to_host_u16 (ip0->payload_length) + rewrite_length;
-          ip0->payload_length = clib_host_to_net_u16 (new_l0);
-          
-          /* Populate the (first) h-b-h list elt */
-          next0 = IP6_HBYH_IOAM_INPUT_NEXT_IP6_LOOKUP;
-
-          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE) 
-                            && (b0->flags & VLIB_BUFFER_IS_TRACED))) 
-            {
-              ip6_add_hop_by_hop_trace_t *t = 
-                 vlib_add_trace (vm, node, b0, sizeof (*t));
-              t->next_index = next0;
-            }
-            
-          processed++;
-
-          /* verify speculative enqueue, maybe switch current next frame */
+	  ip0 = vlib_buffer_get_current (b0);
+
+	  /* Copy the ip header left by the required amount */
+	  copy_dst0 = (u64 *) (((u8 *) ip0) - rewrite_length);
+	  copy_src0 = (u64 *) ip0;
+
+	  copy_dst0[0] = copy_src0[0];
+	  copy_dst0[1] = copy_src0[1];
+	  copy_dst0[2] = copy_src0[2];
+	  copy_dst0[3] = copy_src0[3];
+	  copy_dst0[4] = copy_src0[4];
+	  vlib_buffer_advance (b0, -(word) rewrite_length);
+	  ip0 = vlib_buffer_get_current (b0);
+
+	  hbh0 = (ip6_hop_by_hop_header_t *) (ip0 + 1);
+	  /* $$$ tune, rewrite_length is a multiple of 8 */
+	  clib_memcpy (hbh0, rewrite, rewrite_length);
+	  /* Patch the protocol chain, insert the h-b-h (type 0) header */
+	  hbh0->protocol = ip0->protocol;
+	  ip0->protocol = 0;
+	  new_l0 =
+	    clib_net_to_host_u16 (ip0->payload_length) + rewrite_length;
+	  ip0->payload_length = clib_host_to_net_u16 (new_l0);
+
+	  /* Populate the (first) h-b-h list elt */
+	  next0 = IP6_HBYH_IOAM_INPUT_NEXT_IP6_LOOKUP;
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
+			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
+	    {
+	      ip6_add_hop_by_hop_trace_t *t =
+		vlib_add_trace (vm, node, b0, sizeof (*t));
+	      t->next_index = next0;
+	    }
+
+	  processed++;
+
+	  /* verify speculative enqueue, maybe switch current next frame */
 	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
 					   to_next, n_left_to_next,
 					   bi0, next0);
@@ -458,54 +316,56 @@ ip6_add_hop_by_hop_node_fn (vlib_main_t * vm,
       vlib_put_next_frame (vm, node, next_index, n_left_to_next);
     }
 
-  vlib_node_increment_counter (vm, ip6_add_hop_by_hop_node.index, 
-                               IP6_ADD_HOP_BY_HOP_ERROR_PROCESSED, processed);
+  vlib_node_increment_counter (vm, ip6_add_hop_by_hop_node.index,
+			       IP6_ADD_HOP_BY_HOP_ERROR_PROCESSED, processed);
   return frame->n_vectors;
 }
 
-VLIB_REGISTER_NODE (ip6_add_hop_by_hop_node) = {
-  .function = ip6_add_hop_by_hop_node_fn,
-  .name = "ip6-add-hop-by-hop",
-  .vector_size = sizeof (u32),
-  .format_trace = format_ip6_add_hop_by_hop_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-  
-  .n_errors = ARRAY_LEN(ip6_add_hop_by_hop_error_strings),
-  .error_strings = ip6_add_hop_by_hop_error_strings,
-
-  /* See ip/lookup.h */
-  .n_next_nodes = IP6_HBYH_IOAM_INPUT_N_NEXT,
-  .next_nodes = {
+VLIB_REGISTER_NODE (ip6_add_hop_by_hop_node) =	/* *INDENT-OFF* */
+{
+  .function = ip6_add_hop_by_hop_node_fn,.name =
+    "ip6-add-hop-by-hop",.vector_size = sizeof (u32),.format_trace =
+    format_ip6_add_hop_by_hop_trace,.type =
+    VLIB_NODE_TYPE_INTERNAL,.n_errors =
+    ARRAY_LEN (ip6_add_hop_by_hop_error_strings),.error_strings =
+    ip6_add_hop_by_hop_error_strings,
+    /* See ip/lookup.h */
+    .n_next_nodes = IP6_HBYH_IOAM_INPUT_N_NEXT,.next_nodes =
+  {
 #define _(s,n) [IP6_HBYH_IOAM_INPUT_NEXT_##s] = n,
     foreach_ip6_hbyh_ioam_input_next
 #undef _
-  },
-};
+  }
+,};
 
-VLIB_NODE_FUNCTION_MULTIARCH (ip6_add_hop_by_hop_node, ip6_add_hop_by_hop_node_fn)
+/* *INDENT-ON* */
 
+VLIB_NODE_FUNCTION_MULTIARCH (ip6_add_hop_by_hop_node,
+			      ip6_add_hop_by_hop_node_fn)
 /* The main h-b-h tracer was already invoked, no need to do much here */
-typedef struct {
-  u32 next_index;
-} ip6_pop_hop_by_hop_trace_t;
+     typedef struct
+     {
+       u32 next_index;
+     } ip6_pop_hop_by_hop_trace_t;
 
 /* packet trace format function */
-static u8 * format_ip6_pop_hop_by_hop_trace (u8 * s, va_list * args)
+     static u8 *format_ip6_pop_hop_by_hop_trace (u8 * s, va_list * args)
 {
   CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
   CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  ip6_pop_hop_by_hop_trace_t * t = va_arg (*args, ip6_pop_hop_by_hop_trace_t *);
-  
-  s = format (s, "IP6_POP_HOP_BY_HOP: next index %d",
-              t->next_index);
+  ip6_pop_hop_by_hop_trace_t *t =
+    va_arg (*args, ip6_pop_hop_by_hop_trace_t *);
+
+  s = format (s, "IP6_POP_HOP_BY_HOP: next index %d", t->next_index);
   return s;
 }
 
 int
 ip6_hbh_pop_register_option (u8 option,
-			     int options(ip6_header_t *ip, ip6_hop_by_hop_option_t *opt))
+			     int options (ip6_header_t * ip,
+					  ip6_hop_by_hop_option_t * opt))
 {
-  ip6_hop_by_hop_ioam_main_t * hm = &ip6_hop_by_hop_ioam_main;
+  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
 
   ASSERT (option < ARRAY_LEN (hm->pop_options));
 
@@ -521,7 +381,7 @@ ip6_hbh_pop_register_option (u8 option,
 int
 ip6_hbh_pop_unregister_option (u8 option)
 {
-  ip6_hop_by_hop_ioam_main_t * hm = &ip6_hop_by_hop_ioam_main;
+  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
 
   ASSERT (option < ARRAY_LEN (hm->pop_options));
 
@@ -540,32 +400,35 @@ _(PROCESSED, "Pkts w/ removed ip6 hop-by-hop options")  \
 _(NO_HOHO, "Pkts w/ no ip6 hop-by-hop options")         \
 _(OPTION_FAILED, "ip6 pop hop-by-hop failed to process")
 
-typedef enum {
+typedef enum
+{
 #define _(sym,str) IP6_POP_HOP_BY_HOP_ERROR_##sym,
   foreach_ip6_pop_hop_by_hop_error
 #undef _
-  IP6_POP_HOP_BY_HOP_N_ERROR,
+    IP6_POP_HOP_BY_HOP_N_ERROR,
 } ip6_pop_hop_by_hop_error_t;
 
-static char * ip6_pop_hop_by_hop_error_strings[] = {
+static char *ip6_pop_hop_by_hop_error_strings[] = {
 #define _(sym,string) string,
   foreach_ip6_pop_hop_by_hop_error
 #undef _
 };
 
-static inline void ioam_pop_hop_by_hop_processing (vlib_main_t * vm,
-                                                ip6_header_t *ip0,
-                                                ip6_hop_by_hop_header_t *hbh0)
+static inline void
+ioam_pop_hop_by_hop_processing (vlib_main_t * vm,
+				ip6_header_t * ip0,
+				ip6_hop_by_hop_header_t * hbh0)
 {
-  ip6_hop_by_hop_ioam_main_t * hm = &ip6_hop_by_hop_ioam_main;
+  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
   ip6_hop_by_hop_option_t *opt0, *limit0;
   u8 type0;
 
-  if (!hbh0 || !ip0) return;
+  if (!hbh0 || !ip0)
+    return;
 
-  opt0 = (ip6_hop_by_hop_option_t *)(hbh0+1);
+  opt0 = (ip6_hop_by_hop_option_t *) (hbh0 + 1);
   limit0 = (ip6_hop_by_hop_option_t *)
-    ((u8 *)hbh0 + ((hbh0->length+1)<<3));
+    ((u8 *) hbh0 + ((hbh0->length + 1) << 3));
 
   /* Scan the set of h-b-h options, process ones that we understand */
   while (opt0 < limit0)
@@ -573,63 +436,65 @@ static inline void ioam_pop_hop_by_hop_processing (vlib_main_t * vm,
       type0 = opt0->type;
       switch (type0)
 	{
-	case 0: /* Pad1 */
-	  opt0 = (ip6_hop_by_hop_option_t *) ((u8 *)opt0) + 1;
+	case 0:		/* Pad1 */
+	  opt0 = (ip6_hop_by_hop_option_t *) ((u8 *) opt0) + 1;
 	  continue;
-	case 1: /* PadN */
+	case 1:		/* PadN */
 	  break;
 	default:
 	  if (hm->pop_options[type0])
 	    {
-	      if ((*hm->pop_options[type0])(ip0, opt0) < 0)
-	      {
-		vlib_node_increment_counter (vm, ip6_pop_hop_by_hop_node.index, 
-                               IP6_POP_HOP_BY_HOP_ERROR_OPTION_FAILED, 1);
-	      }
+	      if ((*hm->pop_options[type0]) (ip0, opt0) < 0)
+		{
+		  vlib_node_increment_counter (vm,
+					       ip6_pop_hop_by_hop_node.index,
+					       IP6_POP_HOP_BY_HOP_ERROR_OPTION_FAILED,
+					       1);
+		}
 	    }
 	}
-      	opt0 = (ip6_hop_by_hop_option_t *) (((u8 *)opt0) + opt0->length + sizeof (ip6_hop_by_hop_option_t));
+      opt0 =
+	(ip6_hop_by_hop_option_t *) (((u8 *) opt0) + opt0->length +
+				     sizeof (ip6_hop_by_hop_option_t));
     }
 }
 
 static uword
 ip6_pop_hop_by_hop_node_fn (vlib_main_t * vm,
-		  vlib_node_runtime_t * node,
-		  vlib_frame_t * frame)
+			    vlib_node_runtime_t * node, vlib_frame_t * frame)
 {
-  ip6_main_t * im = &ip6_main;
-  ip_lookup_main_t * lm = &im->lookup_main;
-  u32 n_left_from, * from, * to_next;
+  ip6_main_t *im = &ip6_main;
+  ip_lookup_main_t *lm = &im->lookup_main;
+  u32 n_left_from, *from, *to_next;
   ip_lookup_next_t next_index;
   u32 processed = 0;
   u32 no_header = 0;
-  
+
   from = vlib_frame_vector_args (frame);
   n_left_from = frame->n_vectors;
   next_index = node->cached_next_index;
-  
+
   while (n_left_from > 0)
     {
       u32 n_left_to_next;
 
-      vlib_get_next_frame (vm, node, next_index,
-			   to_next, n_left_to_next);
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
 
       while (n_left_from >= 4 && n_left_to_next >= 2)
 	{
-          u32 bi0, bi1;
-	  vlib_buffer_t * b0, * b1;
+	  u32 bi0, bi1;
+	  vlib_buffer_t *b0, *b1;
 	  u32 next0, next1;
 	  u32 adj_index0, adj_index1;
-	  ip6_header_t * ip0, *ip1;
-	  ip_adjacency_t * adj0, *adj1;
+	  ip6_header_t *ip0, *ip1;
+	  ip_adjacency_t *adj0, *adj1;
 	  ip6_hop_by_hop_header_t *hbh0, *hbh1;
 	  u64 *copy_dst0, *copy_src0, *copy_dst1, *copy_src1;
 	  u16 new_l0, new_l1;
 
 	  /* Prefetch next iteration. */
 	  {
-	    vlib_buffer_t * p2, * p3;
+	    vlib_buffer_t *p2, *p3;
 
 	    p2 = vlib_get_buffer (vm, from[2]);
 	    p3 = vlib_get_buffer (vm, from[3]);
@@ -641,7 +506,7 @@ ip6_pop_hop_by_hop_node_fn (vlib_main_t * vm,
 	    CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, STORE);
 	  }
 
-          /* speculatively enqueue b0 and b1 to the current next frame */
+	  /* speculatively enqueue b0 and b1 to the current next frame */
 	  to_next[0] = bi0 = from[0];
 	  to_next[1] = bi1 = from[1];
 	  from += 2;
@@ -652,12 +517,12 @@ ip6_pop_hop_by_hop_node_fn (vlib_main_t * vm,
 	  b0 = vlib_get_buffer (vm, bi0);
 	  b1 = vlib_get_buffer (vm, bi1);
 
-          /* $$$$$ Dual loop: process 2 x packets here $$$$$ */
-          ASSERT (b0->current_data == 0);
-          ASSERT (b1->current_data == 0);
+	  /* $$$$$ Dual loop: process 2 x packets here $$$$$ */
+	  ASSERT (b0->current_data == 0);
+	  ASSERT (b1->current_data == 0);
 
-          ip0 = vlib_buffer_get_current (b0);
-          ip1 = vlib_buffer_get_current (b1);
+	  ip0 = vlib_buffer_get_current (b0);
+	  ip1 = vlib_buffer_get_current (b1);
 	  adj_index0 = vnet_buffer (b0)->ip.adj_index[VLIB_TX];
 	  adj_index1 = vnet_buffer (b1)->ip.adj_index[VLIB_TX];
 	  adj0 = ip_get_adjacency (lm, adj_index0);
@@ -666,19 +531,19 @@ ip6_pop_hop_by_hop_node_fn (vlib_main_t * vm,
 	  next0 = adj0->lookup_next_index;
 	  next1 = adj1->lookup_next_index;
 
-	  hbh0 = (ip6_hop_by_hop_header_t *)(ip0+1);
-	  hbh1 = (ip6_hop_by_hop_header_t *)(ip1+1);
+	  hbh0 = (ip6_hop_by_hop_header_t *) (ip0 + 1);
+	  hbh1 = (ip6_hop_by_hop_header_t *) (ip1 + 1);
 
-	  ioam_pop_hop_by_hop_processing(vm, ip0, hbh0);
-	  ioam_pop_hop_by_hop_processing(vm, ip1, hbh1);
+	  ioam_pop_hop_by_hop_processing (vm, ip0, hbh0);
+	  ioam_pop_hop_by_hop_processing (vm, ip1, hbh1);
 
-	  vlib_buffer_advance (b0, (hbh0->length+1)<<3);
-	  vlib_buffer_advance (b1, (hbh1->length+1)<<3);
+	  vlib_buffer_advance (b0, (hbh0->length + 1) << 3);
+	  vlib_buffer_advance (b1, (hbh1->length + 1) << 3);
 
 	  new_l0 = clib_net_to_host_u16 (ip0->payload_length) -
-	    ((hbh0->length+1)<<3);
+	    ((hbh0->length + 1) << 3);
 	  new_l1 = clib_net_to_host_u16 (ip1->payload_length) -
-	    ((hbh1->length+1)<<3);
+	    ((hbh1->length + 1) << 3);
 
 	  ip0->payload_length = clib_host_to_net_u16 (new_l0);
 	  ip1->payload_length = clib_host_to_net_u16 (new_l1);
@@ -686,58 +551,58 @@ ip6_pop_hop_by_hop_node_fn (vlib_main_t * vm,
 	  ip0->protocol = hbh0->protocol;
 	  ip1->protocol = hbh1->protocol;
 
-	  copy_src0 = (u64 *)ip0;
-	  copy_src1 = (u64 *)ip1;
-	  copy_dst0 = copy_src0 + (hbh0->length+1);
-	  copy_dst0 [4] = copy_src0[4];
-	  copy_dst0 [3] = copy_src0[3];
-	  copy_dst0 [2] = copy_src0[2];
-	  copy_dst0 [1] = copy_src0[1];
-	  copy_dst0 [0] = copy_src0[0];
-	  copy_dst1 = copy_src1 + (hbh1->length+1);
-	  copy_dst1 [4] = copy_src1[4];
-	  copy_dst1 [3] = copy_src1[3];
-	  copy_dst1 [2] = copy_src1[2];
-	  copy_dst1 [1] = copy_src1[1];
-	  copy_dst1 [0] = copy_src1[0];
-	  processed+=2;
-          /* $$$$$ End of processing 2 x packets $$$$$ */
-
-          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE)))
-            {
-              if (b0->flags & VLIB_BUFFER_IS_TRACED)
-                {
-                    ip6_pop_hop_by_hop_trace_t *t =
-                      vlib_add_trace (vm, node, b0, sizeof (*t));
-                    t->next_index = next0;
-                  }
-                if (b1->flags & VLIB_BUFFER_IS_TRACED)
-                  {
-                    ip6_pop_hop_by_hop_trace_t *t =
-                      vlib_add_trace (vm, node, b1, sizeof (*t));
-                    t->next_index = next1;
-                  }
-              }
-
-            /* verify speculative enqueues, maybe switch current next frame */
-            vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-                                             to_next, n_left_to_next,
-                                             bi0, bi1, next0, next1);
-        }
+	  copy_src0 = (u64 *) ip0;
+	  copy_src1 = (u64 *) ip1;
+	  copy_dst0 = copy_src0 + (hbh0->length + 1);
+	  copy_dst0[4] = copy_src0[4];
+	  copy_dst0[3] = copy_src0[3];
+	  copy_dst0[2] = copy_src0[2];
+	  copy_dst0[1] = copy_src0[1];
+	  copy_dst0[0] = copy_src0[0];
+	  copy_dst1 = copy_src1 + (hbh1->length + 1);
+	  copy_dst1[4] = copy_src1[4];
+	  copy_dst1[3] = copy_src1[3];
+	  copy_dst1[2] = copy_src1[2];
+	  copy_dst1[1] = copy_src1[1];
+	  copy_dst1[0] = copy_src1[0];
+	  processed += 2;
+	  /* $$$$$ End of processing 2 x packets $$$$$ */
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)))
+	    {
+	      if (b0->flags & VLIB_BUFFER_IS_TRACED)
+		{
+		  ip6_pop_hop_by_hop_trace_t *t =
+		    vlib_add_trace (vm, node, b0, sizeof (*t));
+		  t->next_index = next0;
+		}
+	      if (b1->flags & VLIB_BUFFER_IS_TRACED)
+		{
+		  ip6_pop_hop_by_hop_trace_t *t =
+		    vlib_add_trace (vm, node, b1, sizeof (*t));
+		  t->next_index = next1;
+		}
+	    }
+
+	  /* verify speculative enqueues, maybe switch current next frame */
+	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
+					   to_next, n_left_to_next,
+					   bi0, bi1, next0, next1);
+	}
 
       while (n_left_from > 0 && n_left_to_next > 0)
 	{
-          u32 bi0;
-	  vlib_buffer_t * b0;
-          u32 next0;
-          u32 adj_index0;
-          ip6_header_t * ip0;
-          ip_adjacency_t * adj0;
-          ip6_hop_by_hop_header_t *hbh0;
-          u64 * copy_dst0, * copy_src0;
-          u16 new_l0;
-          
-          /* speculatively enqueue b0 to the current next frame */
+	  u32 bi0;
+	  vlib_buffer_t *b0;
+	  u32 next0;
+	  u32 adj_index0;
+	  ip6_header_t *ip0;
+	  ip_adjacency_t *adj0;
+	  ip6_hop_by_hop_header_t *hbh0;
+	  u64 *copy_dst0, *copy_src0;
+	  u16 new_l0;
+
+	  /* speculatively enqueue b0 to the current next frame */
 	  bi0 = from[0];
 	  to_next[0] = bi0;
 	  from += 1;
@@ -747,42 +612,42 @@ ip6_pop_hop_by_hop_node_fn (vlib_main_t * vm,
 
 	  b0 = vlib_get_buffer (vm, bi0);
 
-          ip0 = vlib_buffer_get_current (b0);
-          adj_index0 = vnet_buffer (b0)->ip.adj_index[VLIB_TX];
-          adj0 = ip_get_adjacency (lm, adj_index0);
+	  ip0 = vlib_buffer_get_current (b0);
+	  adj_index0 = vnet_buffer (b0)->ip.adj_index[VLIB_TX];
+	  adj0 = ip_get_adjacency (lm, adj_index0);
 
 	  /* Default use the next_index from the adjacency. */
 	  next0 = adj0->lookup_next_index;
 
-          /* Perfectly normal to end up here w/ out h-b-h header */
-	  hbh0 = (ip6_hop_by_hop_header_t *)(ip0+1);
-          
+	  /* Perfectly normal to end up here w/ out h-b-h header */
+	  hbh0 = (ip6_hop_by_hop_header_t *) (ip0 + 1);
+
 	  /* TODO:Temporarily doing it here.. do this validation in end_of_path_cb */
-	  ioam_pop_hop_by_hop_processing(vm, ip0, hbh0);
+	  ioam_pop_hop_by_hop_processing (vm, ip0, hbh0);
 	  /* Pop the trace data */
-	  vlib_buffer_advance (b0, (hbh0->length+1)<<3);
+	  vlib_buffer_advance (b0, (hbh0->length + 1) << 3);
 	  new_l0 = clib_net_to_host_u16 (ip0->payload_length) -
-	    ((hbh0->length+1)<<3);
+	    ((hbh0->length + 1) << 3);
 	  ip0->payload_length = clib_host_to_net_u16 (new_l0);
 	  ip0->protocol = hbh0->protocol;
-	  copy_src0 = (u64 *)ip0;
-	  copy_dst0 = copy_src0 + (hbh0->length+1);
-	  copy_dst0 [4] = copy_src0[4];
-	  copy_dst0 [3] = copy_src0[3];
-	  copy_dst0 [2] = copy_src0[2];
-	  copy_dst0 [1] = copy_src0[1];
-	  copy_dst0 [0] = copy_src0[0];
+	  copy_src0 = (u64 *) ip0;
+	  copy_dst0 = copy_src0 + (hbh0->length + 1);
+	  copy_dst0[4] = copy_src0[4];
+	  copy_dst0[3] = copy_src0[3];
+	  copy_dst0[2] = copy_src0[2];
+	  copy_dst0[1] = copy_src0[1];
+	  copy_dst0[0] = copy_src0[0];
 	  processed++;
-              
-          if (PREDICT_FALSE((node->flags & VLIB_NODE_FLAG_TRACE) 
-                            && (b0->flags & VLIB_BUFFER_IS_TRACED))) 
-            {
-              ip6_pop_hop_by_hop_trace_t *t = 
-                 vlib_add_trace (vm, node, b0, sizeof (*t));
-              t->next_index = next0;
-            }
-
-          /* verify speculative enqueue, maybe switch current next frame */
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
+			     && (b0->flags & VLIB_BUFFER_IS_TRACED)))
+	    {
+	      ip6_pop_hop_by_hop_trace_t *t =
+		vlib_add_trace (vm, node, b0, sizeof (*t));
+	      t->next_index = next0;
+	    }
+
+	  /* verify speculative enqueue, maybe switch current next frame */
 	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
 					   to_next, n_left_to_next,
 					   bi0, next0);
@@ -791,91 +656,76 @@ ip6_pop_hop_by_hop_node_fn (vlib_main_t * vm,
       vlib_put_next_frame (vm, node, next_index, n_left_to_next);
     }
 
-  vlib_node_increment_counter (vm, ip6_pop_hop_by_hop_node.index, 
-                               IP6_POP_HOP_BY_HOP_ERROR_PROCESSED, processed);
-  vlib_node_increment_counter (vm, ip6_pop_hop_by_hop_node.index, 
-                               IP6_POP_HOP_BY_HOP_ERROR_NO_HOHO, no_header);
+  vlib_node_increment_counter (vm, ip6_pop_hop_by_hop_node.index,
+			       IP6_POP_HOP_BY_HOP_ERROR_PROCESSED, processed);
+  vlib_node_increment_counter (vm, ip6_pop_hop_by_hop_node.index,
+			       IP6_POP_HOP_BY_HOP_ERROR_NO_HOHO, no_header);
   return frame->n_vectors;
 }
 
-VLIB_REGISTER_NODE (ip6_pop_hop_by_hop_node) = {
-  .function = ip6_pop_hop_by_hop_node_fn,
-  .name = "ip6-pop-hop-by-hop",
-  .vector_size = sizeof (u32),
-  .format_trace = format_ip6_pop_hop_by_hop_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-  .sibling_of = "ip6-lookup",
-  .n_errors = ARRAY_LEN(ip6_pop_hop_by_hop_error_strings),
-  .error_strings = ip6_pop_hop_by_hop_error_strings,
-
-  /* See ip/lookup.h */
-  .n_next_nodes = 0,
-};
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ip6_pop_hop_by_hop_node) =
+{
+  .function = ip6_pop_hop_by_hop_node_fn,.name =
+    "ip6-pop-hop-by-hop",.vector_size = sizeof (u32),.format_trace =
+    format_ip6_pop_hop_by_hop_trace,.type =
+    VLIB_NODE_TYPE_INTERNAL,.sibling_of = "ip6-lookup",.n_errors =
+    ARRAY_LEN (ip6_pop_hop_by_hop_error_strings),.error_strings =
+    ip6_pop_hop_by_hop_error_strings,
+    /* See ip/lookup.h */
+.n_next_nodes = 0,};
+
+/* *INDENT-ON* */
 
 VLIB_NODE_FUNCTION_MULTIARCH (ip6_pop_hop_by_hop_node,
 			      ip6_pop_hop_by_hop_node_fn)
-
-static clib_error_t *
-ip6_hop_by_hop_ioam_init (vlib_main_t * vm)
+     static clib_error_t *ip6_hop_by_hop_ioam_init (vlib_main_t * vm)
 {
-  ip6_hop_by_hop_ioam_main_t * hm = &ip6_hop_by_hop_ioam_main;
+  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
 
   hm->vlib_main = vm;
-  hm->vnet_main = vnet_get_main();
-  hm->unix_time_0 = (u32) time (0); /* Store starting time */
+  hm->vnet_main = vnet_get_main ();
+  hm->unix_time_0 = (u32) time (0);	/* Store starting time */
   hm->vlib_time_0 = vlib_time_now (vm);
   hm->ioam_flag = IOAM_HBYH_MOD;
-  hm->trace_tsp = TSP_MICROSECONDS; /* Micro seconds */
-  memset(hm->add_options, 0, sizeof(hm->add_options));
-  memset(hm->pop_options, 0, sizeof(hm->pop_options));
-  memset(hm->options_size, 0, sizeof(hm->options_size));
-
-  /*
-   * Register the handlers
-   * XXX: This should be done dynamically based on OAM feature being enabled or not.
-   */
-  if (ip6_hbh_register_option(HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST, ip6_hbh_ioam_trace_data_list_handler,
-			      ip6_hbh_ioam_trace_data_list_trace_handler) < 0)
-    return (clib_error_create("registration of HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST failed"));
+  memset (hm->add_options, 0, sizeof (hm->add_options));
+  memset (hm->pop_options, 0, sizeof (hm->pop_options));
+  memset (hm->options_size, 0, sizeof (hm->options_size));
 
   return (0);
 }
 
 VLIB_INIT_FUNCTION (ip6_hop_by_hop_ioam_init);
 
-int ip6_ioam_set_rewrite (u8 **rwp, u32 trace_type, u32 trace_option_elts, 
-                          int has_pot_option, int has_ppc_option)
+int
+ip6_ioam_set_rewrite (u8 ** rwp, int has_trace_option,
+		      int has_pot_option, int has_ppc_option)
 {
-  ip6_hop_by_hop_ioam_main_t * hm = &ip6_hop_by_hop_ioam_main;  
+  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
   u8 *rewrite = 0;
   u32 size, rnd_size;
   ip6_hop_by_hop_header_t *hbh;
-  ioam_trace_option_t * trace_option;
   u8 *current;
-  u8 trace_data_size = 0;  
+  u8 trace_data_size = 0;
+  u8 pot_data_size = 0;
 
   vec_free (*rwp);
 
-  if (trace_option_elts == 0 && has_pot_option == 0)
+  if (has_trace_option == 0 && has_pot_option == 0)
     return -1;
 
   /* Work out how much space we need */
   size = sizeof (ip6_hop_by_hop_header_t);
 
-  if (trace_option_elts)
+  //if (has_trace_option && hm->get_sizeof_options[HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST] != 0)
+  if (has_trace_option
+      && hm->options_size[HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST] != 0)
     {
       size += sizeof (ip6_hop_by_hop_option_t);
-
-      trace_data_size = fetch_trace_data_size(trace_type);
-      if (trace_data_size == 0)
-          return VNET_API_ERROR_INVALID_VALUE;
-
-      if (trace_option_elts * trace_data_size > 254)
-          return VNET_API_ERROR_INVALID_VALUE;
-  
-      size += trace_option_elts * trace_data_size;
+      size += hm->options_size[HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST];
     }
-  if (has_pot_option && hm->add_options[HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT] != 0)
+  if (has_pot_option
+      && hm->add_options[HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT] != 0)
     {
       size += sizeof (ip6_hop_by_hop_option_t);
       size += hm->options_size[HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT];
@@ -885,92 +735,89 @@ int ip6_ioam_set_rewrite (u8 **rwp, u32 trace_type, u32 trace_option_elts,
   rnd_size = (size + 7) & ~7;
 
   /* allocate it, zero-fill / pad by construction */
-  vec_validate (rewrite, rnd_size-1);
+  vec_validate (rewrite, rnd_size - 1);
 
   hbh = (ip6_hop_by_hop_header_t *) rewrite;
   /* Length of header in 8 octet units, not incl first 8 octets */
-  hbh->length = (rnd_size>>3) - 1;
-  current = (u8 *)(hbh+1);
-  
-  if (trace_option_elts)
+  hbh->length = (rnd_size >> 3) - 1;
+  current = (u8 *) (hbh + 1);
+
+  if (has_trace_option
+      && hm->add_options[HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST] != 0)
     {
-      trace_option = (ioam_trace_option_t *)current;
-      trace_option->hdr.type = HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST
-        | HBH_OPTION_TYPE_DATA_CHANGE_ENROUTE;
-      trace_option->hdr.length = 
-               2 /*ioam_trace_type,data_list_elts_left */ + 
-              trace_option_elts * trace_data_size;
-      trace_option->ioam_trace_type = trace_type & TRACE_TYPE_MASK;
-      trace_option->data_list_elts_left = trace_option_elts;
-      current += sizeof (ioam_trace_option_t) + 
-        trace_option_elts * trace_data_size;
+      if (0 != (hm->options_size[HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST]))
+	{
+	  trace_data_size =
+	    hm->options_size[HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST];
+	  if (0 ==
+	      hm->add_options[HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST] (current,
+								     &trace_data_size))
+	    current += hm->options_size[HBH_OPTION_TYPE_IOAM_TRACE_DATA_LIST];
+	}
     }
-  if (has_pot_option && hm->add_options[HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT] != 0)
+  if (has_pot_option
+      && hm->add_options[HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT] != 0)
     {
-      if (0 == hm->add_options[HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT](current,
-					hm->options_size[HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT]))
-	  current += sizeof (hm->options_size[HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT]);
+      pot_data_size = hm->options_size[HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT];
+      if (0 ==
+	  hm->add_options[HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT] (current,
+								  &pot_data_size))
+	current +=
+	  sizeof (hm->options_size[HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT]);
     }
-  
+
   *rwp = rewrite;
   return 0;
 }
 
 clib_error_t *
-clear_ioam_rewrite_fn(void)
+clear_ioam_rewrite_fn (void)
 {
   ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
 
-  vec_free(hm->rewrite);
+  vec_free (hm->rewrite);
   hm->rewrite = 0;
-  hm->node_id = 0;
-  hm->app_data = 0;
-  hm->trace_type = 0;
-  hm->trace_option_elts = 0;
+  hm->has_trace_option = 0;
   hm->has_pot_option = 0;
   hm->has_ppc_option = 0;
-  hm->trace_tsp = TSP_MICROSECONDS; 
 
   return 0;
 }
 
-clib_error_t * clear_ioam_rewrite_command_fn (vlib_main_t * vm,
-                                 unformat_input_t * input,
-                                 vlib_cli_command_t * cmd)
+clib_error_t *
+clear_ioam_rewrite_command_fn (vlib_main_t * vm,
+			       unformat_input_t * input,
+			       vlib_cli_command_t * cmd)
 {
-  return(clear_ioam_rewrite_fn());
+  return (clear_ioam_rewrite_fn ());
 }
-  
-VLIB_CLI_COMMAND (ip6_clear_ioam_trace_cmd, static) = {
-  .path = "clear ioam rewrite",
-  .short_help = "clear ioam rewrite",
-  .function = clear_ioam_rewrite_command_fn,
-};
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (ip6_clear_ioam_rewrite_cmd, static) =
+{
+.path = "clear ioam rewrite",.short_help = "clear ioam rewrite",.function =
+    clear_ioam_rewrite_command_fn,};
+/* *INDENT-ON* */
 
 clib_error_t *
-ip6_ioam_trace_profile_set(u32 trace_option_elts, u32 trace_type, u32 node_id,
-                           u32 app_data, int has_pot_option, u32 trace_tsp, 
-                           int has_ppc_option)
+ip6_ioam_enable (int has_trace_option, int has_pot_option, int has_ppc_option)
 {
   int rv;
   ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
-  rv = ip6_ioam_set_rewrite (&hm->rewrite, trace_type, trace_option_elts,
-                             has_pot_option, has_ppc_option);
+  rv = ip6_ioam_set_rewrite (&hm->rewrite, has_trace_option,
+			     has_pot_option, has_ppc_option);
 
   switch (rv)
     {
     case 0:
-      hm->node_id = node_id;
-      hm->app_data = app_data;
-      hm->trace_type = trace_type;
-      hm->trace_option_elts = trace_option_elts;
+      hm->has_trace_option = has_trace_option;
       hm->has_pot_option = has_pot_option;
       hm->has_ppc_option = has_ppc_option;
-      hm->trace_tsp = trace_tsp;
       break;
 
     default:
-      return clib_error_return_code(0, rv, 0, "ip6_ioam_set_rewrite returned %d", rv);
+      return clib_error_return_code (0, rv, 0,
+				     "ip6_ioam_set_rewrite returned %d", rv);
     }
 
   return 0;
@@ -979,126 +826,119 @@ ip6_ioam_trace_profile_set(u32 trace_option_elts, u32 trace_type, u32 node_id,
 
 static clib_error_t *
 ip6_set_ioam_rewrite_command_fn (vlib_main_t * vm,
-                                 unformat_input_t * input,
-                                 vlib_cli_command_t * cmd)
+				 unformat_input_t * input,
+				 vlib_cli_command_t * cmd)
 {
-  u32 trace_option_elts = 0;
-  u32 trace_type = 0, node_id = 0; 
-  u32 app_data = 0, trace_tsp = TSP_MICROSECONDS;
+  int has_trace_option = 0;
   int has_pot_option = 0;
   int has_ppc_option = 0;
-  clib_error_t * rv = 0;
-  
+  clib_error_t *rv = 0;
+
   while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
     {
-      if (unformat (input, "trace-type 0x%x trace-elts %d "
-                           "trace-tsp %d node-id 0x%x app-data 0x%x", 
-                      &trace_type, &trace_option_elts, &trace_tsp,
-                      &node_id, &app_data))
-            ;
+      if (unformat (input, "trace"))
+	has_trace_option = 1;
       else if (unformat (input, "pot"))
-        has_pot_option = 1;
+	has_pot_option = 1;
       else if (unformat (input, "ppc encap"))
-        has_ppc_option = PPC_ENCAP;
+	has_ppc_option = PPC_ENCAP;
       else if (unformat (input, "ppc decap"))
-        has_ppc_option = PPC_DECAP;
+	has_ppc_option = PPC_DECAP;
       else if (unformat (input, "ppc none"))
-        has_ppc_option = PPC_NONE;
+	has_ppc_option = PPC_NONE;
       else
-        break;
+	break;
     }
-  
-    
-    rv = ip6_ioam_trace_profile_set(trace_option_elts, trace_type, node_id,
-                           app_data, has_pot_option, trace_tsp, has_ppc_option);
 
-    return rv;
+
+  rv = ip6_ioam_enable (has_trace_option, has_pot_option, has_ppc_option);
+
+  return rv;
 }
 
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (ip6_set_ioam_rewrite_cmd, static) =
+{
+.path = "set ioam rewrite",.short_help =
+    "set ioam [trace] [pot] [ppc <encap|decap>]",.function =
+    ip6_set_ioam_rewrite_command_fn,};
+/* *INDENT-ON* */
 
-VLIB_CLI_COMMAND (ip6_set_ioam_rewrite_cmd, static) = {
-  .path = "set ioam rewrite",
-  .short_help = "set ioam rewrite trace-type <0x1f|0x3|0x9|0x11|0x19> trace-elts <nn> trace-tsp <0|1|2|3> node-id <node id in hex> app-data <app_data in hex> [pot] [ppc <encap|decap>]",
-  .function = ip6_set_ioam_rewrite_command_fn,
-};
-  
 static clib_error_t *
 ip6_show_ioam_summary_cmd_fn (vlib_main_t * vm,
-                      unformat_input_t * input,
-                      vlib_cli_command_t * cmd)
+			      unformat_input_t * input,
+			      vlib_cli_command_t * cmd)
 {
   ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
   u8 *s = 0;
 
 
-  if (!is_zero_ip6_address(&hm->adj))
-  {
-  s = format(s, "              REWRITE FLOW CONFIGS - \n");
-  s = format(s, "               Destination Address : %U\n",
-            format_ip6_address, &hm->adj, sizeof(ip6_address_t));
-  s = format(s, "                    Flow operation : %d (%s)\n", hm->ioam_flag,
-           (hm->ioam_flag == IOAM_HBYH_ADD) ? "Add" : 
-          ((hm->ioam_flag == IOAM_HBYH_MOD) ? "Mod" : "Pop"));
-  } 
-  else 
-  {
-  s = format(s, "              REWRITE FLOW CONFIGS - Not configured\n");
-  }
-
-  if (hm->trace_option_elts)
-  {
-  s = format(s, " HOP BY HOP OPTIONS - TRACE CONFIG - \n");
-  s = format(s, "                        Trace Type : 0x%x (%d)\n", 
-          hm->trace_type, hm->trace_type);
-  s = format(s, "         Trace timestamp precision : %d (%s)\n", hm->trace_tsp,
-       (hm->trace_tsp == TSP_SECONDS) ? "Seconds" : 
-      ((hm->trace_tsp == TSP_MILLISECONDS) ? "Milliseconds" : 
-     (((hm->trace_tsp == TSP_MICROSECONDS) ? "Microseconds" : "Nanoseconds"))));
-  s = format(s, "                Num of trace nodes : %d\n", 
-          hm->trace_option_elts);
-  s = format(s, "                           Node-id : 0x%x (%d)\n", 
-          hm->node_id, hm->node_id);
-  s = format(s, "                          App Data : 0x%x (%d)\n", 
-          hm->app_data, hm->app_data);
-  }
+  if (!is_zero_ip6_address (&hm->adj))
+    {
+      s = format (s, "              REWRITE FLOW CONFIGS - \n");
+      s = format (s, "               Destination Address : %U\n",
+		  format_ip6_address, &hm->adj, sizeof (ip6_address_t));
+      s =
+	format (s, "                    Flow operation : %d (%s)\n",
+		hm->ioam_flag,
+		(hm->ioam_flag ==
+		 IOAM_HBYH_ADD) ? "Add" : ((hm->ioam_flag ==
+					    IOAM_HBYH_MOD) ? "Mod" : "Pop"));
+    }
   else
-  {
-  s = format(s, " HOP BY HOP OPTIONS - TRACE CONFIG - Not configured\n");
-  }
+    {
+      s = format (s, "              REWRITE FLOW CONFIGS - Not configured\n");
+    }
+
 
-  s = format(s, "                        POT OPTION - %d (%s)\n", 
-          hm->has_pot_option, (hm->has_pot_option?"Enabled":"Disabled"));
+  s = format (s, "                        TRACE OPTION - %d (%s)\n",
+	      hm->has_trace_option,
+	      (hm->has_trace_option ? "Enabled" : "Disabled"));
+  if (hm->has_trace_option)
+    s =
+      format (s,
+	      "Try 'show ioam trace and show ioam-trace profile' for more information\n");
+
+
+  s = format (s, "                        POT OPTION - %d (%s)\n",
+	      hm->has_pot_option,
+	      (hm->has_pot_option ? "Enabled" : "Disabled"));
   if (hm->has_pot_option)
-    s = format(s, "Try 'show ioam pot and show pot profile' for more information\n");
+    s =
+      format (s,
+	      "Try 'show ioam pot and show pot profile' for more information\n");
 
-  s = format(s, "         EDGE TO EDGE - PPC OPTION - %d (%s)\n", 
-         hm->has_ppc_option, ppc_state[hm->has_ppc_option]);
+  s = format (s, "         EDGE TO EDGE - PPC OPTION - %d (%s)\n",
+	      hm->has_ppc_option, ppc_state[hm->has_ppc_option]);
   if (hm->has_ppc_option)
-    s = format(s, "Try 'show ioam ppc' for more information\n");
+    s = format (s, "Try 'show ioam ppc' for more information\n");
 
-  vlib_cli_output(vm, "%v", s);
-  vec_free(s);
+  vlib_cli_output (vm, "%v", s);
+  vec_free (s);
   return 0;
 }
 
-VLIB_CLI_COMMAND (ip6_show_ioam_run_cmd, static) = {
-  .path = "show ioam summary",
-  .short_help = "Summary of IOAM configuration",
-  .function = ip6_show_ioam_summary_cmd_fn,
-};
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (ip6_show_ioam_run_cmd, static) =
+{
+.path = "show ioam summary",.short_help =
+    "Summary of IOAM configuration",.function =
+    ip6_show_ioam_summary_cmd_fn,};
+/* *INDENT-ON* */
 
-int ip6_ioam_set_destination (ip6_address_t *addr, u32 mask_width, u32 vrf_id,
-                              int is_add, int is_pop, int is_none)
+int
+ip6_ioam_set_destination (ip6_address_t * addr, u32 mask_width, u32 vrf_id,
+			  int is_add, int is_pop, int is_none)
 {
-  ip6_main_t * im = &ip6_main;
-  ip6_hop_by_hop_ioam_main_t * hm = &ip6_hop_by_hop_ioam_main;
-  ip_lookup_main_t * lm = &im->lookup_main;
-  ip_adjacency_t * adj;
+  ip6_main_t *im = &ip6_main;
+  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
+  ip_lookup_main_t *lm = &im->lookup_main;
+  ip_adjacency_t *adj;
   u32 fib_index;
   u32 len, adj_index;
   int i, rv;
-  uword * p;
-  BVT(clib_bihash_kv) kv, value;
+  uword *p;
+  BVT (clib_bihash_kv) kv, value;
 
   if ((is_add + is_pop + is_none) != 1)
     return VNET_API_ERROR_INVALID_VALUE_2;
@@ -1112,27 +952,28 @@ int ip6_ioam_set_destination (ip6_address_t *addr, u32 mask_width, u32 vrf_id,
   fib_index = p[0];
 
   len = vec_len (im->prefix_lengths_in_search_order);
-  
+
   for (i = 0; i < len; i++)
     {
       int dst_address_length = im->prefix_lengths_in_search_order[i];
-      ip6_address_t * mask = &im->fib_masks[dst_address_length];
-      
+      ip6_address_t *mask = &im->fib_masks[dst_address_length];
+
       if (dst_address_length != mask_width)
-        continue;
+	continue;
 
       kv.key[0] = addr->as_u64[0] & mask->as_u64[0];
       kv.key[1] = addr->as_u64[1] & mask->as_u64[1];
-      kv.key[2] = ((u64)((fib_index))<<32) | dst_address_length;
-      
-      rv = BV(clib_bihash_search_inline_2)(&im->ip6_lookup_table, &kv, &value);
+      kv.key[2] = ((u64) ((fib_index)) << 32) | dst_address_length;
+
+      rv =
+	BV (clib_bihash_search_inline_2) (&im->ip6_lookup_table, &kv, &value);
       if (rv == 0)
-        goto found;
+	goto found;
 
     }
   return VNET_API_ERROR_NO_SUCH_ENTRY;
-  
- found:
+
+found:
 
   /* Got it, modify as directed... */
   adj_index = value.value;
@@ -1150,21 +991,23 @@ int ip6_ioam_set_destination (ip6_address_t *addr, u32 mask_width, u32 vrf_id,
     adj->saved_lookup_next_index = adj->lookup_next_index;
 
   if (is_add)
-    adj->lookup_next_index = (ip_lookup_next_t) IP6_LOOKUP_NEXT_ADD_HOP_BY_HOP;
+    adj->lookup_next_index =
+      (ip_lookup_next_t) IP6_LOOKUP_NEXT_ADD_HOP_BY_HOP;
 
   if (is_pop)
-    adj->lookup_next_index = (ip_lookup_next_t) IP6_LOOKUP_NEXT_POP_HOP_BY_HOP;
+    adj->lookup_next_index =
+      (ip_lookup_next_t) IP6_LOOKUP_NEXT_POP_HOP_BY_HOP;
 
   hm->adj = *addr;
   hm->ioam_flag = (is_add ? IOAM_HBYH_ADD :
-                  (is_pop ? IOAM_HBYH_POP : IOAM_HBYH_MOD));
+		   (is_pop ? IOAM_HBYH_POP : IOAM_HBYH_MOD));
   return 0;
 }
-                              
+
 static clib_error_t *
 ip6_set_ioam_destination_command_fn (vlib_main_t * vm,
-                                     unformat_input_t * input,
-                                     vlib_cli_command_t * cmd)
+				     unformat_input_t * input,
+				     vlib_cli_command_t * cmd)
 {
   ip6_address_t addr;
   u32 mask_width = ~0;
@@ -1176,19 +1019,18 @@ ip6_set_ioam_destination_command_fn (vlib_main_t * vm,
 
   while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
     {
-      if (unformat (input, "%U/%d", 
-                    unformat_ip6_address, &addr, &mask_width))
-        ;
+      if (unformat (input, "%U/%d", unformat_ip6_address, &addr, &mask_width))
+	;
       else if (unformat (input, "vrf-id %d", &vrf_id))
-        ;
+	;
       else if (unformat (input, "add"))
-        is_add = 1;
+	is_add = 1;
       else if (unformat (input, "pop"))
-        is_pop = 1;
+	is_pop = 1;
       else if (unformat (input, "none"))
-        is_none = 1;
+	is_none = 1;
       else
-        break;
+	break;
     }
 
   if ((is_add + is_pop + is_none) != 1)
@@ -1196,30 +1038,42 @@ ip6_set_ioam_destination_command_fn (vlib_main_t * vm,
   if (mask_width == ~0)
     return clib_error_return (0, "<address>/<mask-width> required");
 
-  rv = ip6_ioam_set_destination (&addr, mask_width, vrf_id, 
-                                 is_add, is_pop, is_none);
+  rv = ip6_ioam_set_destination (&addr, mask_width, vrf_id,
+				 is_add, is_pop, is_none);
 
   switch (rv)
     {
     case 0:
       break;
     default:
-      return clib_error_return (0, "ip6_ioam_set_destination returned %d", rv);
+      return clib_error_return (0, "ip6_ioam_set_destination returned %d",
+				rv);
     }
-  
+
   return 0;
 }
 
-VLIB_CLI_COMMAND (ip6_set_ioam_destination_cmd, static) = {
-  .path = "set ioam destination",
-  .short_help = "set ioam destination <ip6-address>/<width> add | pop | none",
-  .function = ip6_set_ioam_destination_command_fn,
-};
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (ip6_set_ioam_destination_cmd, static) =
+{
+.path = "set ioam destination",.short_help =
+    "set ioam destination <ip6-address>/<width> add | pop | none",.function
+    = ip6_set_ioam_destination_command_fn,};
+/* *INDENT-ON* */
 
 
-void vnet_register_ioam_end_of_path_callback (void *cb)
+void
+vnet_register_ioam_end_of_path_callback (void *cb)
 {
-  ip6_hop_by_hop_ioam_main_t * hm = &ip6_hop_by_hop_ioam_main;
+  ip6_hop_by_hop_ioam_main_t *hm = &ip6_hop_by_hop_ioam_main;
 
   hm->ioam_end_of_path_cb = cb;
 }
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/vnet/vnet/ip/ip6_hop_by_hop.h b/vnet/vnet/ip/ip6_hop_by_hop.h
index 0ee24b306a1..dae58619e24 100644
--- a/vnet/vnet/ip/ip6_hop_by_hop.h
+++ b/vnet/vnet/ip/ip6_hop_by_hop.h
@@ -38,12 +38,7 @@ typedef struct {
 
 
   /* Trace option */
-  u8 trace_type;
-  u8 trace_option_elts;
-
-  /* Configured node-id */
-  u32 node_id;
-  u32 app_data;
+  u8 has_trace_option;
 
   /* Pot option */
   u8 has_pot_option;
@@ -57,13 +52,12 @@ typedef struct {
 #define TSP_MILLISECONDS         1
 #define TSP_MICROSECONDS         2
 #define TSP_NANOSECONDS          3
-  /* Time stamp precision. This is enumerated to above four options */
-  u32 trace_tsp;
   
   /* Array of function pointers to ADD and POP HBH option handling routines */
   u8 options_size[256];
-  int (*add_options[256])(u8 *rewrite_string, u8 rewrite_size);
+  int (*add_options[256])(u8 *rewrite_string, u8 *rewrite_size);
   int (*pop_options[256])(ip6_header_t *ip, ip6_hop_by_hop_option_t *opt);
+  int (*get_sizeof_options[256])(u32 *rewrite_size);
   
   /* convenience */
   vlib_main_t * vlib_main;
@@ -74,8 +68,7 @@ extern ip6_hop_by_hop_ioam_main_t ip6_hop_by_hop_ioam_main;
 
 extern u8 * format_path_map(u8 * s, va_list * args);
 extern clib_error_t *
-ip6_ioam_trace_profile_set(u32 trace_option_elts, u32 trace_type, u32 node_id,
-                           u32 app_data, int has_pot_option, u32 trace_tsp,
+ip6_ioam_enable(int has_trace_option, int has_pot_option,
                            int has_e2e_option);
 extern int ip6_ioam_set_destination (ip6_address_t *addr, u32 mask_width,
                   u32 vrf_id, int is_add, int is_pop, int is_none);
@@ -110,12 +103,18 @@ static inline u8 is_zero_ip6_address (ip6_address_t *a)
 
 int ip6_hbh_add_register_option (u8 option,
 				 u8 size,
-				 int rewrite_options(u8 *rewrite_string, u8 size));
+				 int rewrite_options(u8 *rewrite_string, u8 *size));
 int ip6_hbh_add_unregister_option (u8 option);
 
 int ip6_hbh_pop_register_option (u8 option,
 				 int options(ip6_header_t *ip, ip6_hop_by_hop_option_t *opt));
 int ip6_hbh_pop_unregister_option (u8 option);
 
+int
+ip6_hbh_get_sizeof_register_option (u8 option,
+                            int get_sizeof_hdr_options(u32 *rewrite_size));
 
+int
+ip6_ioam_set_rewrite (u8 ** rwp, int has_trace_option,
+		      int has_pot_option, int has_ppc_option);
 #endif /* __included_ip6_hop_by_hop_ioam_h__ */
diff --git a/vnet/vnet/ip/ip6_hop_by_hop_packet.h b/vnet/vnet/ip/ip6_hop_by_hop_packet.h
index 0a2c3d02ac1..8c358334c56 100644
--- a/vnet/vnet/ip/ip6_hop_by_hop_packet.h
+++ b/vnet/vnet/ip/ip6_hop_by_hop_packet.h
@@ -43,134 +43,6 @@ typedef struct {
 #define HBH_OPTION_TYPE_IOAM_PROOF_OF_TRANSIT 60   /* Third highest bit set (change en-route) */
 #define HBH_OPTION_TYPE_IOAM_EDGE_TO_EDGE 29
 
-/*
-typedef struct {
-  u32 ttl_node_id;
-  u16 ingress_if;
-  u16 egress_if;
-  u32 timestamp;
-  u32 app_data;
-} ioam_trace_data_list_element_t;
-*/
-
-#define    BIT_TTL_NODEID       (1<<0)
-#define    BIT_ING_INTERFACE    (1<<1) 
-#define    BIT_EGR_INTERFACE    (1<<2) 
-#define    BIT_TIMESTAMP        (1<<3) 
-#define    BIT_APPDATA          (1<<4) 
-#define    TRACE_TYPE_MASK      0x1F /* Mask of all above bits */
-
-/*
-     0x00011111  iOAM-trace-type is 0x00011111 then the format of node
-        data is:
-  
-          0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-         |   Hop_Lim     |              node_id                          |
-         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-         |     ingress_if_id             |         egress_if_id          |
-         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-         +                           timestamp                           +
-         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-         |                            app_data                           |
-         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-  
-*/
-#define   TRACE_TYPE_IF_TS_APP   0x1f
-typedef struct {
-  u32 ttl_node_id;
-  u16 ingress_if;
-  u16 egress_if;
-  u32 timestamp;
-  u32 app_data;
-} ioam_trace_if_ts_app_t;
-
-/*
-     0x00000111  iOAM-trace-type is 0x00000111 then the format is:
-  
-          0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-         |   Hop_Lim     |              node_id                          |
-         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-         |     ingress_if_id             |         egress_if_id          |
-         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-  
-*/
-
-#define   TRACE_TYPE_IF   0x03
-typedef struct {
-  u32 ttl_node_id;
-  u16 ingress_if;
-  u16 egress_if;
-} ioam_trace_if_t;
-
-/*
-     0x00001001  iOAM-trace-type is 0x00001001 then the format is:
-  
-          0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-         |   Hop_Lim     |              node_id                          |
-         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-         +                           timestamp                           +
-         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-  
-*/
-
-#define   TRACE_TYPE_TS   0x09
-typedef struct {
-  u32 ttl_node_id;
-  u32 timestamp;
-} ioam_trace_ts_t;
-
-/*
-     0x00010001  iOAM-trace-type is 0x00010001 then the format is:
-  
-  
-          0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-         |   Hop_Lim     |              node_id                          |
-         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-         |                            app_data                           |
-         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-  
-*/
-
-
-#define   TRACE_TYPE_APP   0x11
-typedef struct {
-  u32 ttl_node_id;
-  u32 app_data;
-} ioam_trace_app_t;
-
-/*
-  
-     0x00011001  iOAM-trace-type is 0x00011001 then the format is:
-  
-          0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-         |   Hop_Lim     |              node_id                          |
-         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-         +                           timestamp                           +
-         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-         |                            app_data                           |
-         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-*/
-
-#define   TRACE_TYPE_TS_APP   0x19
-typedef struct {
-  u32 ttl_node_id;
-  u32 timestamp;
-  u32 app_data;
-} ioam_trace_ts_app_t;
-
-
-typedef CLIB_PACKED(struct {
-  ip6_hop_by_hop_option_t hdr;
-  u8 ioam_trace_type;
-  u8 data_list_elts_left;
-  u32 elts[0]; /* Variable type. So keep it generic */
-}) ioam_trace_option_t;
-
 
 typedef CLIB_PACKED(struct {
   ip6_hop_by_hop_option_t hdr;