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

diff --git a/src/vnet/interface_output.c b/src/vnet/interface_output.c
index 5e702e3b96c..eadee692919 100644
--- a/src/vnet/interface_output.c
+++ b/src/vnet/interface_output.c
@@ -38,6 +38,7 @@
  */
 
 #include <vnet/vnet.h>
+#include <vnet/gso/gso.h>
 #include <vnet/ip/icmp46_packet.h>
 #include <vnet/ip/ip4.h>
 #include <vnet/ip/ip6.h>
@@ -163,20 +164,23 @@ calc_checksums (vlib_main_t * vm, vlib_buffer_t * b)
 {
   tcp_header_t *th;
   udp_header_t *uh;
+  gso_header_offset_t gho = { 0 };
 
   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);
+  gho = vnet_gso_header_offset_parser (b, is_ip6);
+  th = (tcp_header_t *) (vlib_buffer_get_current (b) + gho.l4_hdr_offset);
+  uh = (udp_header_t *) (vlib_buffer_get_current (b) + gho.l4_hdr_offset);
 
   if (is_ip4)
     {
       ip4_header_t *ip4;
 
-      ip4 = (ip4_header_t *) (b->data + vnet_buffer (b)->l3_hdr_offset);
+      ip4 =
+	(ip4_header_t *) (vlib_buffer_get_current (b) + gho.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)
@@ -185,14 +189,18 @@ calc_checksums (vlib_main_t * vm, vlib_buffer_t * b)
 	  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);
+	{
+	  uh->checksum = 0;
+	  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);
+      ip6 =
+	(ip6_header_t *) (vlib_buffer_get_current (b) + gho.l3_hdr_offset);
       if (b->flags & VNET_BUFFER_F_OFFLOAD_TCP_CKSUM)
 	{
 	  th->checksum = 0;
@@ -503,7 +511,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);
+	}
     }
 }