Permalink
Browse files

Merge branch 'speedcopy' of github.com:gconnell/gopcap into speedcopy

Conflicts:
	pcap.go
  • Loading branch information...
2 parents 9e88f61 + 32cee02 commit ed68d5233722224b80dcfa45c0b1b87621afd6c7 @gconnell gconnell committed Dec 11, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 pcap.go
View
@@ -100,10 +100,10 @@ func (p *Pcap) NextEx() (pkt *Packet, result int32) {
result = int32(C.hack_pcap_next_ex(p.cptr, &pkthdr, &buf_ptr))
buf = unsafe.Pointer(buf_ptr)
-
if nil == buf {
return
}
+
pkt = new(Packet)
pkt.Time = time.Unix(int64(pkthdr.ts.tv_sec), int64(pkthdr.ts.tv_usec))
pkt.Caplen = uint32(pkthdr.caplen)

0 comments on commit ed68d52

Please sign in to comment.