X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Finterface_output.c;h=f289fcc489e6e4fe8242643f628043e70b065f01;hb=59f71132e;hp=5e702e3b96c367bbdfed02b223102813f5ebb6e3;hpb=29467b5347dca90f4ef068ef8d34ffb97c2435f0;p=vpp.git

diff --git a/src/vnet/interface_output.c b/src/vnet/interface_output.c
index 5e702e3b96c..f289fcc489e 100644
--- a/src/vnet/interface_output.c
+++ b/src/vnet/interface_output.c
@@ -44,6 +44,7 @@
 #include <vnet/udp/udp_packet.h>
 #include <vnet/feature/feature.h>
 #include <vnet/classify/trace_classify.h>
+#include <vnet/interface_output.h>
 
 typedef struct
 {
@@ -158,59 +159,6 @@ vnet_interface_output_trace (vlib_main_t * vm,
     }
 }
 
-static_always_inline void
-calc_checksums (vlib_main_t * vm, vlib_buffer_t * b)
-{
-  tcp_header_t *th;
-  udp_header_t *uh;
-
-  int is_ip4 = (b->flags & VNET_BUFFER_F_IS_IP4) != 0;
-  int is_ip6 = (b->flags & VNET_BUFFER_F_IS_IP6) != 0;
-
-  ASSERT (!(is_ip4 && is_ip6));
-
-  th = (tcp_header_t *) (b->data + vnet_buffer (b)->l4_hdr_offset);
-  uh = (udp_header_t *) (b->data + vnet_buffer (b)->l4_hdr_offset);
-
-  if (is_ip4)
-    {
-      ip4_header_t *ip4;
-
-      ip4 = (ip4_header_t *) (b->data + vnet_buffer (b)->l3_hdr_offset);
-      if (b->flags & VNET_BUFFER_F_OFFLOAD_IP_CKSUM)
-	ip4->checksum = ip4_header_checksum (ip4);
-      if (b->flags & VNET_BUFFER_F_OFFLOAD_TCP_CKSUM)
-	{
-	  th->checksum = 0;
-	  th->checksum = ip4_tcp_udp_compute_checksum (vm, b, ip4);
-	}
-      else if (b->flags & VNET_BUFFER_F_OFFLOAD_UDP_CKSUM)
-	uh->checksum = ip4_tcp_udp_compute_checksum (vm, b, ip4);
-    }
-  else if (is_ip6)
-    {
-      int bogus;
-      ip6_header_t *ip6;
-
-      ip6 = (ip6_header_t *) (b->data + vnet_buffer (b)->l3_hdr_offset);
-      if (b->flags & VNET_BUFFER_F_OFFLOAD_TCP_CKSUM)
-	{
-	  th->checksum = 0;
-	  th->checksum =
-	    ip6_tcp_udp_icmp_compute_checksum (vm, b, ip6, &bogus);
-	}
-      else if (b->flags & VNET_BUFFER_F_OFFLOAD_UDP_CKSUM)
-	{
-	  uh->checksum = 0;
-	  uh->checksum =
-	    ip6_tcp_udp_icmp_compute_checksum (vm, b, ip6, &bogus);
-	}
-    }
-  b->flags &= ~VNET_BUFFER_F_OFFLOAD_TCP_CKSUM;
-  b->flags &= ~VNET_BUFFER_F_OFFLOAD_UDP_CKSUM;
-  b->flags &= ~VNET_BUFFER_F_OFFLOAD_IP_CKSUM;
-}
-
 static_always_inline uword
 vnet_interface_output_node_inline (vlib_main_t * vm,
 				   vlib_node_runtime_t * node,
@@ -391,10 +339,22 @@ vnet_interface_output_node_inline (vlib_main_t * vm,
 		   VNET_BUFFER_F_OFFLOAD_UDP_CKSUM |
 		   VNET_BUFFER_F_OFFLOAD_IP_CKSUM))
 		{
-		  calc_checksums (vm, b[0]);
-		  calc_checksums (vm, b[1]);
-		  calc_checksums (vm, b[2]);
-		  calc_checksums (vm, b[3]);
+		  vnet_calc_checksums_inline
+		    (vm, b[0],
+		     b[0]->flags & VNET_BUFFER_F_IS_IP4,
+		     b[0]->flags & VNET_BUFFER_F_IS_IP6, 1 /* with gso */ );
+		  vnet_calc_checksums_inline
+		    (vm, b[1],
+		     b[1]->flags & VNET_BUFFER_F_IS_IP4,
+		     b[1]->flags & VNET_BUFFER_F_IS_IP6, 1 /* with gso */ );
+		  vnet_calc_checksums_inline
+		    (vm, b[2],
+		     b[2]->flags & VNET_BUFFER_F_IS_IP4,
+		     b[2]->flags & VNET_BUFFER_F_IS_IP6, 1 /* with gso */ );
+		  vnet_calc_checksums_inline
+		    (vm, b[3],
+		     b[3]->flags & VNET_BUFFER_F_IS_IP4,
+		     b[3]->flags & VNET_BUFFER_F_IS_IP6, 1 /* with gso */ );
 		}
 	    }
 	  b += 4;
@@ -442,7 +402,10 @@ vnet_interface_output_node_inline (vlib_main_t * vm,
 		  (VNET_BUFFER_F_OFFLOAD_TCP_CKSUM |
 		   VNET_BUFFER_F_OFFLOAD_UDP_CKSUM |
 		   VNET_BUFFER_F_OFFLOAD_IP_CKSUM))
-		calc_checksums (vm, b[0]);
+		vnet_calc_checksums_inline
+		  (vm, b[0],
+		   b[0]->flags & VNET_BUFFER_F_IS_IP4,
+		   b[0]->flags & VNET_BUFFER_F_IS_IP6, 1 /* with gso */ );
 	    }
 	  b += 1;
 	}
@@ -503,7 +466,16 @@ static_always_inline void vnet_interface_pcap_tx_trace
 	sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_TX];
 
       if (pp->pcap_sw_if_index == 0 || pp->pcap_sw_if_index == sw_if_index)
-	pcap_add_buffer (&pp->pcap_main, vm, bi0, pp->max_bytes_per_pkt);
+	{
+	  vnet_main_t *vnm = vnet_get_main ();
+	  vnet_hw_interface_t *hi =
+	    vnet_get_sup_hw_interface (vnm, sw_if_index);
+	  /* Capture pkt if not filtered, or if filter hits */
+	  if (hi->trace_classify_table_index == ~0 ||
+	      vnet_is_packet_traced_inline
+	      (b0, hi->trace_classify_table_index, 0 /* full classify */ ))
+	    pcap_add_buffer (&pp->pcap_main, vm, bi0, pp->max_bytes_per_pkt);
+	}
     }
 }