File libpcap-1.5.2-filter-fix.patch of Package libpcap

Overview Repositories Revisions Requests Users Attributes Meta

File libpcap-1.5.2-filter-fix.patch of Package libpcap (Revision f402aec87c35d08046c898c7bda94acd)

Currently displaying revision f402aec87c35d08046c898c7bda94acd , Show latest

---
 pcap-bpf.c   |    2 +-
 pcap-linux.c |   22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

Index: libpcap-1.5.3/pcap-bpf.c
===================================================================
--- libpcap-1.5.3.orig/pcap-bpf.c	2014-02-13 17:22:30.794295046 +0100
+++ libpcap-1.5.3/pcap-bpf.c	2014-02-13 17:22:31.667305231 +0100
@@ -494,7 +494,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: libpcap-1.5.3/pcap-linux.c
===================================================================
--- libpcap-1.5.3.orig/pcap-linux.c	2014-02-13 17:22:31.668305243 +0100
+++ libpcap-1.5.3/pcap-linux.c	2014-02-13 17:24:01.924357989 +0100
@@ -2476,11 +2476,33 @@ 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,
 			 * so userland filtering not needed.
 			 */
 			handlep->filter_in_userland = 0;
+
+			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 */
 		{

Places

File libpcap-1.5.2-filter-fix.patch of Package libpcap (Revision f402aec87c35d08046c898c7bda94acd)

Places