API: Cleanup APIs interface.api

[vpp.git] / src / vnet / mpls / mpls_output.c

diff --git a/src/vnet/mpls/mpls_output.c b/src/vnet/mpls/mpls_output.c
index 241a783..1d6546a 100644 (file)
--- a/src/vnet/mpls/mpls_output.c
+++ b/src/vnet/mpls/mpls_output.c
@@ -24,9 +24,6 @@ typedef struct {
   /* Adjacency taken. */
   u32 adj_index;
   u32 flow_hash;
-
-  /* Packet data, possibly *after* rewrite. */
-  u8 packet_data[64 - 1*sizeof(u32)];
 } mpls_output_trace_t;
 
 #define foreach_mpls_output_next               \
@@ -45,16 +42,11 @@ format_mpls_output_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 *);
   mpls_output_trace_t * t = va_arg (*args, mpls_output_trace_t *);
-  uword indent = format_get_indent (s);
 
   s = format (s, "adj-idx %d : %U flow hash: 0x%08x",
               t->adj_index,
               format_ip_adjacency, t->adj_index, FORMAT_IP_ADJACENCY_NONE,
              t->flow_hash);
-  s = format (s, "\n%U%U",
-              format_white_space, indent,
-              format_ip_adjacency_packet_data,
-              t->adj_index, t->packet_data, sizeof (t->packet_data));
   return s;
 }
 
@@ -133,6 +125,8 @@ mpls_output_inline (vlib_main_t * vm,
           /* Update packet buffer attributes/set output interface. */
           rw_len0 = adj0[0].rewrite_header.data_bytes;
           rw_len1 = adj1[0].rewrite_header.data_bytes;
+         vnet_buffer (p0)->mpls.save_rewrite_length = rw_len0;
+         vnet_buffer (p1)->mpls.save_rewrite_length = rw_len1;
 
           /* Bump the adj counters for packet and bytes */
           vlib_increment_combined_counter
@@ -193,8 +187,12 @@ mpls_output_inline (vlib_main_t * vm,
             }
           if (is_midchain)
           {
-              adj0->sub_type.midchain.fixup_func(vm, adj0, p0);
-              adj1->sub_type.midchain.fixup_func(vm, adj1, p1);
+             adj0->sub_type.midchain.fixup_func
+                (vm, adj0, p0,
+                 adj0->sub_type.midchain.fixup_data);
+             adj1->sub_type.midchain.fixup_func
+                (vm, adj1, p1,
+                 adj1->sub_type.midchain.fixup_data);
           }
 
           p0->error = error_node->errors[error0];
@@ -206,9 +204,6 @@ mpls_output_inline (vlib_main_t * vm,
                                                         p0, sizeof (*tr));
               tr->adj_index = vnet_buffer(p0)->ip.adj_index[VLIB_TX];
               tr->flow_hash = vnet_buffer(p0)->ip.flow_hash;
-              clib_memcpy (tr->packet_data,
-                           vlib_buffer_get_current (p0),
-                           sizeof (tr->packet_data));
             }
           if (PREDICT_FALSE(p1->flags & VLIB_BUFFER_IS_TRACED))
             {
@@ -216,9 +211,6 @@ mpls_output_inline (vlib_main_t * vm,
                                                         p1, sizeof (*tr));
               tr->adj_index = vnet_buffer(p1)->ip.adj_index[VLIB_TX];
               tr->flow_hash = vnet_buffer(p1)->ip.flow_hash;
-              clib_memcpy (tr->packet_data,
-                           vlib_buffer_get_current (p1),
-                           sizeof (tr->packet_data));
             }
 
           vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
@@ -248,7 +240,8 @@ mpls_output_inline (vlib_main_t * vm,
           
           /* Update packet buffer attributes/set output interface. */
           rw_len0 = adj0[0].rewrite_header.data_bytes;
-          
+          vnet_buffer (p0)->mpls.save_rewrite_length = rw_len0;
+
           vlib_increment_combined_counter
               (&adjacency_counters,
                thread_index,
@@ -280,7 +273,9 @@ mpls_output_inline (vlib_main_t * vm,
             }
           if (is_midchain)
           {
-              adj0->sub_type.midchain.fixup_func(vm, adj0, p0);
+             adj0->sub_type.midchain.fixup_func
+                (vm, adj0, p0,
+                 adj0->sub_type.midchain.fixup_data);
           }
 
           p0->error = error_node->errors[error0];
@@ -318,8 +313,7 @@ static char * mpls_error_strings[] = {
 #undef mpls_error
 };
 
-static inline uword
-mpls_output (vlib_main_t * vm,
+VLIB_NODE_FN (mpls_output_node) (vlib_main_t * vm,
              vlib_node_runtime_t * node,
              vlib_frame_t * from_frame)
 {
@@ -327,7 +321,6 @@ mpls_output (vlib_main_t * vm,
 }
 
 VLIB_REGISTER_NODE (mpls_output_node) = {
-  .function = mpls_output,
   .name = "mpls-output",
   /* Takes a vector of packets. */
   .vector_size = sizeof (u32),
@@ -344,10 +337,7 @@ VLIB_REGISTER_NODE (mpls_output_node) = {
   .format_trace = format_mpls_output_trace,
 };
 
-VLIB_NODE_FUNCTION_MULTIARCH (mpls_output_node, mpls_output)
-
-static inline uword
-mpls_midchain (vlib_main_t * vm,
+VLIB_NODE_FN (mpls_midchain_node) (vlib_main_t * vm,
                vlib_node_runtime_t * node,
                vlib_frame_t * from_frame)
 {
@@ -355,7 +345,6 @@ mpls_midchain (vlib_main_t * vm,
 }
 
 VLIB_REGISTER_NODE (mpls_midchain_node) = {
-  .function = mpls_midchain,
   .name = "mpls-midchain",
   .vector_size = sizeof (u32),
 
@@ -364,8 +353,6 @@ VLIB_REGISTER_NODE (mpls_midchain_node) = {
   .sibling_of = "mpls-output",
 };
 
-VLIB_NODE_FUNCTION_MULTIARCH (mpls_midchain_node, mpls_midchain)
-
 /**
  * @brief Next index values from the MPLS incomplete adj node
  */
@@ -398,8 +385,7 @@ typedef struct mpls_adj_incomplete_trace_t_
  * We pay a cost for this 'routing' node, but an incomplete adj is the
  * exception case.
  */
-static inline uword
-mpls_adj_incomplete (vlib_main_t * vm,
+VLIB_NODE_FN (mpls_adj_incomplete_node) (vlib_main_t * vm,
                      vlib_node_runtime_t * node,
                      vlib_frame_t * from_frame)
 {
@@ -466,7 +452,7 @@ format_mpls_adj_incomplete_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 *);
     mpls_adj_incomplete_trace_t * t;
-    uword indent;
+    u32 indent;
 
     t = va_arg (*args, mpls_adj_incomplete_trace_t *);
     indent = format_get_indent (s);
@@ -478,7 +464,6 @@ format_mpls_adj_incomplete_trace (u8 * s, va_list * args)
 }
 
 VLIB_REGISTER_NODE (mpls_adj_incomplete_node) = {
-  .function = mpls_adj_incomplete,
   .name = "mpls-adj-incomplete",
   .format_trace = format_mpls_adj_incomplete_trace,
   /* Takes a vector of packets. */
@@ -494,5 +479,3 @@ VLIB_REGISTER_NODE (mpls_adj_incomplete_node) = {
   },
 };
 
-VLIB_NODE_FUNCTION_MULTIARCH (mpls_adj_incomplete_node,
-                              mpls_adj_incomplete)