2012-07-16 03:39:31 -04:00
|
|
|
$OpenBSD: patch-nsock_src_nsock_pcap_c,v 1.5 2012/07/16 07:39:31 giovanni Exp $
|
|
|
|
|
--- nsock/src/nsock_pcap.c.orig Thu Mar 1 07:32:23 2012
|
|
|
|
|
+++ nsock/src/nsock_pcap.c Fri May 25 09:38:27 2012
|
|
|
|
|
@@ -76,7 +76,7 @@
|
|
|
|
|
|
|
|
|
|
#include "nsock_pcap.h"
|
|
|
|
|
|
|
|
|
|
-extern struct timeval nsock_tod;
|
|
|
|
|
+extern struct bpf_timeval nsock_tod;
|
|
|
|
|
|
|
|
|
|
#if HAVE_PCAP
|
|
|
|
|
static int nsock_pcap_get_l3_offset(pcap_t *pt, int *dl);
|
|
|
|
|
@@ -375,7 +375,7 @@ int do_actual_pcap_read(msevent *nse) {
|
|
|
|
|
npp.ts = pkt_header->ts;
|
|
|
|
|
#else
|
|
|
|
|
/* on these platforms time received from pcap is invalid. It's better to set current time */
|
|
|
|
|
- memcpy(&npp.ts, nsock_gettimeofday(), sizeof(struct timeval));
|
|
|
|
|
+ memcpy(&npp.ts, nsock_gettimeofday(), sizeof(struct bpf_timeval));
|
|
|
|
|
#endif
|
|
|
|
|
npp.len = pkt_header->len;
|
|
|
|
|
npp.caplen = pkt_header->caplen;
|
|
|
|
|
@@ -406,7 +406,7 @@ int do_actual_pcap_read(msevent *nse) {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void nse_readpcap(nsock_event nsee, const unsigned char **l2_data, size_t *l2_len,
|
|
|
|
|
- const unsigned char **l3_data, size_t *l3_len, size_t *packet_len, struct timeval *ts) {
|
|
|
|
|
+ const unsigned char **l3_data, size_t *l3_len, size_t *packet_len, struct bpf_timeval *ts) {
|
|
|
|
|
msevent *nse = (msevent *)nsee;
|
|
|
|
|
msiod *iod = nse->iod;
|
|
|
|
|
mspcap *mp = (mspcap *)iod->pcap;
|
