Convert PCap/PFRing timestamps correctly.

We were incorrectly converting pcap and pfring timestamps into Go time.Time objects... they returned micros, but we treated them as nanos. Thanks to Peter Membrey for pointing this out.
packetb-old · Jan 21, 2014 · ee6c29c · ee6c29c
1 parent 2633065
commit ee6c29c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/pcap/pcap.go b/pcap/pcap.go
@@ -173,7 +173,8 @@ func (p *Handle) getNextBufPtrLocked(ci *gopacket.CaptureInfo) error {
 			return result
 		}
 	}
-	ci.Timestamp = time.Unix(int64(p.pkthdr.ts.tv_sec), int64(p.pkthdr.ts.tv_usec))
+	ci.Timestamp = time.Unix(int64(p.pkthdr.ts.tv_sec),
+		int64(p.pkthdr.ts.tv_usec)*1000) // convert micros to nanos
 	ci.CaptureLength = int(p.pkthdr.caplen)
 	ci.Length = int(p.pkthdr.len)
 	return nil

diff --git a/pfring/pfring.go b/pfring/pfring.go
@@ -115,7 +115,8 @@ func (r *Ring) ReadPacketDataTo(data []byte) (ci gopacket.CaptureInfo, err error
 		r.mu.Unlock()
 		return
 	}
-	ci.Timestamp = time.Unix(int64(r.pkthdr.ts.tv_sec), int64(r.pkthdr.ts.tv_usec))
+	ci.Timestamp = time.Unix(int64(r.pkthdr.ts.tv_sec),
+		int64(r.pkthdr.ts.tv_usec)*1000) // convert micros to nanos
 	ci.CaptureLength = int(r.pkthdr.caplen)
 	ci.Length = int(r.pkthdr.len)
 	r.mu.Unlock()