Preston_PLB/sngrep
1
0
Fork 0
forked from Mirrors/sngrep
Code Pull Requests Activity

remove OpenBSD workaround that doesn't work

Browse Source 
This isn't really "old libpcap", it's a local OpenBSD change to make pcap files MI. Upstream libpcap does this differently by passing timevals around directly, and just converting in the file load/save routines instead. It's incorrect because the struct members are different sizes (64-bit for timeval.tv_sec, 32 for bpf_timeval.tv_sec).
This commit is contained in:
Stuart Henderson 2021-03-16 22:02:46 +00:00 committed by Kaian
parent 03065e129e
commit d69e7b2f49
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/capture.h
View File

@ -48,15 +48,6 @@
#define _BSD_SOURCE 1 #define _BSD_SOURCE 1
#endif #endif
/* Old versions of libpcap in OpenBSD use <net/bpf.h>
* which actually defines timestamps as bpf_timeval instead
* of simple timeval. This no longer happens in newest libpcap
* versions, where header packets have timestamps in timeval
* structs */
#if defined (__OpenBSD__) && defined(_NET_BPF_H_)
#define timeval bpf_timeval
#endif
#if defined(BSD) || defined (__OpenBSD__) || defined(__FreeBSD__) #if defined(BSD) || defined (__OpenBSD__) || defined(__FreeBSD__)
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>