d045159f47
- Support 802.1 QinQ as a form of VLAN in filters. - Treat "carp" as equivalent to "vrrp" in filters. - Fix code generated for "ip6 protochain". - Add some new link-layer header types. - Support capturing NetFilter log messages on Linux. - Turn off monitor mode on exit for mac80211 interfaces on Linux. - Fix problems turning monitor mode on for non-mac80211 interfaces - on Linux. - Properly fail if /sys/class/net or /proc/net/dev exist but can't - be opened. - Fail if pcap_activate() is called on an already-activated - pcap_t, and add a test program for that. - Fix filtering in pcap-ng files. - Simplify handling of new DLT_/LINKTYPE_ values. - Expand pcap(3PCAP) man page. - drop libpcap-fix-calculation-of-frame-size.patch (upstream) OBS-URL: https://build.opensuse.org/package/show/Base:System/libpcap?expand=0&rev=21
49 lines
1.4 KiB
Diff
49 lines
1.4 KiB
Diff
Index: pcap-bpf.c
|
|
===================================================================
|
|
--- pcap-bpf.c.orig
|
|
+++ pcap-bpf.c
|
|
@@ -483,7 +483,7 @@ bpf_open(pcap_t *p)
|
|
fd = open(device, O_RDWR);
|
|
if (fd == -1 && errno == EACCES)
|
|
fd = open(device, O_RDONLY);
|
|
- } while (fd < 0 && errno == EBUSY);
|
|
+ } while (fd < 0 && errno == EBUSY && n < 1000);
|
|
|
|
/*
|
|
* XXX better message for all minors used
|
|
Index: pcap-linux.c
|
|
===================================================================
|
|
--- pcap-linux.c.orig
|
|
+++ pcap-linux.c
|
|
@@ -2421,8 +2421,30 @@ pcap_setfilter_linux_common(pcap_t *hand
|
|
if (can_filter_in_kernel) {
|
|
if ((err = set_kernel_filter(handle, &fcode)) == 0)
|
|
{
|
|
+ char buf[1024];
|
|
+ int oldflags;
|
|
+ int ret;
|
|
+ unsigned int received = 0, rec_len = 0;
|
|
+ socklen_t optlen = sizeof(rec_len);
|
|
/* Installation succeded - using kernel filter. */
|
|
handle->md.use_bpf = 1;
|
|
+
|
|
+ oldflags = fcntl(handle->fd, F_GETFL, 0);
|
|
+ oldflags |= O_NONBLOCK;
|
|
+ fcntl(handle->fd, F_SETFL, oldflags);
|
|
+ getsockopt(handle->fd, SOL_SOCKET, SO_RCVBUF,
|
|
+ (char *)&rec_len, &optlen);
|
|
+
|
|
+ /* now read all packets received until now */
|
|
+ while((ret = read(handle->fd, buf, 1024)) > 0
|
|
+ && received < rec_len) {
|
|
+ received += ret;
|
|
+ }
|
|
+
|
|
+ if(oldflags > 0) {
|
|
+ oldflags &= ~O_NONBLOCK;
|
|
+ fcntl(handle->fd, F_SETFL, oldflags);
|
|
+ }
|
|
}
|
|
else if (err == -1) /* Non-fatal error */
|
|
{
|