Merge pull request #25 from ng-labo/TSfromPcap

Use pcapTimestamp if set, or readTimestamp when output is in tcpdump format.
sflow · Mar 5, 2019 · dac67e6 · dac67e6
2 parents a8bd313 + ae764d9
commit dac67e6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/sflowtool.c b/src/sflowtool.c
@@ -1800,7 +1800,7 @@ static void writePcapPacket(SFSample *sample) {
   char buf[SA_MAX_PCAP_PKT];
   int bytes = 0;
   struct pcap_pkthdr hdr;
-  hdr.ts_sec = (uint32_t)time(NULL);
+  hdr.ts_sec = sample->pcapTimestamp ?: sample->readTimestamp;
   hdr.ts_usec = 0;
   hdr.len = sample->s.sampledPacketSize;
   hdr.caplen = sample->s.headerLen;