fix packet-length reporting in psample and pcap; handle startup race-…

…condition in psample
sflow · Nov 22, 2019 · 53b02da · 53b02da
1 parent 7c2b913
commit 53b02da
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/Linux/mod_pcap.c b/src/Linux/mod_pcap.c
@@ -119,7 +119,7 @@ extern "C" {
 		 14 /* mac len */,
 		 buf + 14 /* payload */,
 		 hdr->caplen - 14, /* length of captured payload */
-		 hdr->len, /* length of packet (pdu) */
+		 hdr->len - 14, /* length of packet (pdu) */
 		 bpfs->drops, /* droppedSamples */
 		 bpfs->samplingRate);
     }

diff --git a/src/Linux/mod_psample.c b/src/Linux/mod_psample.c
@@ -252,6 +252,11 @@ extern "C" {
       // so we can know for sure if this was ingress or egress sampled.
       // Assume ingress-sampling for now.
       SFLAdaptor *samplerDev = inDev;
+      if(!samplerDev) {
+        // handle startup race-condition where interface has not been discovered yet
+        myDebug(2, "psample: unknown ifindex %u (startup race-condition?)", ifin);
+        return;
+      }
 
       // See if the sample_n matches what we think was configured
       HSPAdaptorNIO *nio = ADAPTOR_NIO(samplerDev);
@@ -287,7 +292,7 @@ extern "C" {
 		   14, // mac hdr len
 		   pkt + 14, // payload
 		   pkt_len - 14, // captured payload len
-		   pkt_len, // whole pdu len
+		   pkt_len - 14, // whole pdu len
 		   drops,
 		   this_sample_n);
     }