X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fnsh%2Fnsh_output.c;h=796503eed23d60731a67a6e16c35824bbd970fa8;hb=refs%2Fchanges%2F65%2F28665%2F2;hp=047fe8ae3b2d70dc264b76bd1913588a4208ffea;hpb=4ba19b8a75c40cecd3818af2fd657fe5bf1b2f41;p=vpp.git

diff --git a/src/plugins/nsh/nsh_output.c b/src/plugins/nsh/nsh_output.c
index 047fe8ae3b2..796503eed23 100644
--- a/src/plugins/nsh/nsh_output.c
+++ b/src/plugins/nsh/nsh_output.c
@@ -88,13 +88,15 @@ nsh_output_inline (vlib_main_t * vm,
           nsh_base_header_t *hdr0;
           ethernet_header_t * eth_hdr0;
           vlib_buffer_t * p0;
-          u32 pi0, rw_len0, adj_index0, next0, error0;
+          u32 pi0, adj_index0, next0, error0;
 
           ip_adjacency_t * adj1;
           nsh_base_header_t *hdr1;
           ethernet_header_t * eth_hdr1;
           vlib_buffer_t * p1;
-          u32 pi1, rw_len1, adj_index1, next1, error1;
+          u32 pi1, adj_index1, next1, error1;
+          int pkt_len0, pkt_len1;
+          word rw_len0, rw_len1;
 
           /* Prefetch next iteration. */
           {
@@ -141,27 +143,27 @@ nsh_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;
+          pkt_len0 = vlib_buffer_length_in_chain (vm, p0);
+          pkt_len1 = vlib_buffer_length_in_chain (vm, p1);
 
           /* Bump the adj counters for packet and bytes */
-          vlib_increment_combined_counter
-              (&adjacency_counters,
-               thread_index,
-               adj_index0,
-               1,
-               vlib_buffer_length_in_chain (vm, p0) + rw_len0);
-          vlib_increment_combined_counter
-              (&adjacency_counters,
-               thread_index,
-               adj_index1,
-               1,
-               vlib_buffer_length_in_chain (vm, p1) + rw_len1);
-
+          if (adj_index0 == adj_index1)
+          {
+            vlib_increment_combined_counter (&adjacency_counters, thread_index, adj_index0, 2,
+               pkt_len0 + rw_len0 + pkt_len1 + rw_len1);
+          }
+          else
+          {
+            vlib_increment_combined_counter (&adjacency_counters, thread_index, adj_index0, 1,
+               pkt_len0 + rw_len0);
+            vlib_increment_combined_counter (&adjacency_counters, thread_index, adj_index1, 1,
+               pkt_len1 + rw_len1);
+          }
           /* Check MTU of outgoing interface. */
-          if (PREDICT_TRUE(vlib_buffer_length_in_chain (vm, p0) <=
+          if (PREDICT_TRUE(pkt_len0 <=
                            adj0[0].rewrite_header.max_l3_packet_bytes))
             {
-              p0->current_data -= rw_len0;
-              p0->current_length += rw_len0;
+              vlib_buffer_advance (p0, -rw_len0);
 
               vnet_buffer (p0)->sw_if_index[VLIB_TX] =
                   adj0[0].rewrite_header.sw_if_index;
@@ -178,11 +180,10 @@ nsh_output_inline (vlib_main_t * vm,
               error0 = IP4_ERROR_MTU_EXCEEDED;
               next0 = NSH_OUTPUT_NEXT_DROP;
             }
-          if (PREDICT_TRUE(vlib_buffer_length_in_chain (vm, p1) <=
+          if (PREDICT_TRUE(pkt_len1 <=
                            adj1[0].rewrite_header.max_l3_packet_bytes))
             {
-              p1->current_data -= rw_len1;
-              p1->current_length += rw_len1;
+              vlib_buffer_advance (p1, -rw_len1);
 
               vnet_buffer (p1)->sw_if_index[VLIB_TX] =
                   adj1[0].rewrite_header.sw_if_index;
@@ -236,7 +237,9 @@ nsh_output_inline (vlib_main_t * vm,
           nsh_base_header_t *hdr0;
           ethernet_header_t * eth_hdr0;
           vlib_buffer_t * p0;
-          u32 pi0, rw_len0, adj_index0, next0, error0;
+          u32 pi0, adj_index0, next0, error0;
+          int pkt_len0;
+          word rw_len0;
 
           pi0 = to_next[0] = from[0];
 
@@ -256,20 +259,15 @@ nsh_output_inline (vlib_main_t * vm,
 
           /* Update packet buffer attributes/set output interface. */
           rw_len0 = adj0[0].rewrite_header.data_bytes;
+          pkt_len0 = vlib_buffer_length_in_chain (vm, p0);
 
-          vlib_increment_combined_counter
-              (&adjacency_counters,
-               thread_index,
-               adj_index0,
-               1,
-               vlib_buffer_length_in_chain (vm, p0) + rw_len0);
+          vlib_increment_combined_counter (&adjacency_counters, thread_index, adj_index0, 1,
+               pkt_len0 + rw_len0);
 
           /* Check MTU of outgoing interface. */
-          if (PREDICT_TRUE(vlib_buffer_length_in_chain (vm, p0) <=
-                           adj0[0].rewrite_header.max_l3_packet_bytes))
+          if (PREDICT_TRUE(pkt_len0 <= adj0[0].rewrite_header.max_l3_packet_bytes))
             {
-              p0->current_data -= rw_len0;
-              p0->current_length += rw_len0;
+              vlib_buffer_advance (p0, -rw_len0);
 
               vnet_buffer (p0)->sw_if_index[VLIB_TX] =
                   adj0[0].rewrite_header.sw_if_index;
@@ -323,7 +321,7 @@ typedef enum nsh_midchain_next_t_
     NSH_MIDCHAIN_NEXT_DROP,
 } nsh_midchain_next_t;
 
-VLIB_NODE_FN (nsh_eth_output) (vlib_main_t * vm,
+VLIB_NODE_FN (nsh_eth_output_node) (vlib_main_t * vm,
                 vlib_node_runtime_t * node,
                 vlib_frame_t * from_frame)
 {
@@ -344,7 +342,7 @@ VLIB_REGISTER_NODE (nsh_eth_output_node) = {
   .format_trace = format_nsh_output_trace,
 };
 
-VLIB_NODE_FN (nsh_midchain) (vlib_main_t * vm,
+VLIB_NODE_FN (nsh_midchain_node) (vlib_main_t * vm,
                vlib_node_runtime_t * node,
                vlib_frame_t * from_frame)
 {
@@ -415,7 +413,7 @@ typedef struct nsh_adj_incomplete_trace_t_
  * We pay a cost for this 'routing' node, but an incomplete adj is the
  * exception case.
  */
-VLIB_NODE_FN (nsh_adj_incomplete) (vlib_main_t * vm,
+VLIB_NODE_FN (nsh_adj_incomplete_node) (vlib_main_t * vm,
                      vlib_node_runtime_t * node,
                      vlib_frame_t * from_frame)
 {