Ticket #11104: p0f.c.patch

p0f.c

@@ -1813 +1813 @@
 
   if (use_cache) {
 
+    char errbuf[PCAP_ERRBUF_SIZE];
+    if(pcap_setnonblock(pt, 1, errbuf) == -1) {
+      debug("[!] Failed to set non blocking mode on device: %s", errbuf);
+    }
+
     _s32 mfd,max;
 
     mfd = pcap_fileno(pt);
 
     max = 1 + (mfd > lsock ? mfd : lsock);
 
+    struct timeval timeout;
+
     while (1) {
       fd_set f,e;
 
@@ -1835 +1842 @@
          raw socket, even with no SA_RESTART, it's a mess... select()
          is rather neutral. */
 
-      select(max,&f,0,&e,0);
+      timeout.tv_sec = 1;
+      timeout.tv_usec = 0;
+      select(max,&f,0,&e,&timeout);
 
-      if (FD_ISSET(mfd, &f) || FD_ISSET(mfd,&e))
+      //      if (FD_ISSET(mfd, &f) || FD_ISSET(mfd,&e))
         if (pcap_dispatch(pt,-1,(pcap_handler)&parse,0) < 0) break;
 
       if (FD_ISSET(lsock,&f)) {

test/p0fq.c

@@ -52 +52 @@
   d  = inet_addr(argv[4]);
   dp = atoi(argv[5]);
 
-  if (!sp || !dp || s == INADDR_NONE || d == INADDR_NONE)
+  if (!dp || s == INADDR_NONE || d == INADDR_NONE)
     fatal("Bad IP/port values.\n");
 
   sock = socket(PF_UNIX,SOCK_STREAM,0);