Merge pull request robertdavidgraham#280 from robertdavidgraham/libpcap

dynamically load pcap
postmodern · Jun 6, 2017 · 39061a5 · 39061a5
2 parents 6c9abcb + 7872876
commit 39061a5
Show file tree

Hide file tree

Showing 33 changed files with 690 additions and 3,256 deletions.
diff --git a/Makefile b/Makefile
@@ -13,7 +13,7 @@ endif
 # environment where things likely will work -- as well as anything
 # works on the bajillion of different Linux environments
 ifneq (, $(findstring linux, $(SYS)))
-LIBS = -lpcap -lm -lrt -ldl -lpthread
+LIBS = -lm -lrt -ldl -lpthread
 INCLUDES =
 FLAGS2 = 
 endif
@@ -23,7 +23,7 @@ endif
 # my regularly regression-test environment. That means at any point
 # in time, something might be minorly broken in Mac OS X.
 ifneq (, $(findstring darwin, $(SYS)))
-LIBS = -lpcap -lm 
+LIBS = -lm 
 INCLUDES = -I.
 FLAGS2 = 
 INSTALL_DATA = -pm755
@@ -37,7 +37,7 @@ endif
 # intended environment, so it make break in the future.
 ifneq (, $(findstring mingw, $(SYS)))
 INCLUDES = -Ivs10/include
-LIBS = -L vs10/lib -lwpcap -lIPHLPAPI -lWs2_32
+LIBS = -L vs10/lib -lIPHLPAPI -lWs2_32
 FLAGS2 = -march=i686
 endif
 
@@ -47,20 +47,20 @@ endif
 # head with a hammer and want to feel a different sort of pain.
 ifneq (, $(findstring cygwin, $(SYS)))
 INCLUDES = -I.
-LIBS = -lwpcap
+LIBS = 
 FLAGS2 = 
 endif
 
 # OpenBSD
 ifneq (, $(findstring openbsd, $(SYS)))
-LIBS = -lpcap -lm -pthread
+LIBS = -lm -pthread
 INCLUDES = -I.
 FLAGS2 = 
 endif
 
 # FreeBSD
 ifneq (, $(findstring freebsd, $(SYS)))
-LIBS = -lpcap -lm -pthread
+LIBS = -lm -pthread
 INCLUDES = -I.
 FLAGS2 =
 endif

diff --git a/src/in-report.c b/src/in-report.c
@@ -70,6 +70,7 @@ cndb_add(unsigned ip, const unsigned char *name, size_t name_length)
 
 /***************************************************************************
  ***************************************************************************/
+#if 0
 static void
 cndb_add_cn(unsigned ip, const unsigned char *data, size_t length)
 {
@@ -106,9 +107,11 @@ cndb_add_cn(unsigned ip, const unsigned char *data, size_t length)
     /* now insert into database */
     cndb_add(ip, data+name_offset, name_length);
 }
+#endif
 
 /***************************************************************************
  ***************************************************************************/
+#if 0
 static unsigned
 found(const char *str, size_t str_len, const unsigned char *p, size_t length)
 {
@@ -123,6 +126,7 @@ found(const char *str, size_t str_len, const unsigned char *p, size_t length)
     }
     return 0;
 }
+#endif
 
 enum {
     XUnknown,

diff --git a/src/main.c b/src/main.c
@@ -1428,14 +1428,15 @@ main_scan(struct Masscan *masscan)
 
 
 
+void pcap_init(void);
 
 /***************************************************************************
  ***************************************************************************/
 int main(int argc, char *argv[])
 {
     struct Masscan masscan[1];
     unsigned i;
-
+    
     usec_start = pixie_gettime();
 #if defined(WIN32)
     {WSADATA x; WSAStartup(0x101, &x);}
@@ -1506,6 +1507,7 @@ int main(int argc, char *argv[])
 
     /* We need to do a separate "raw socket" initialization step. This is
      * for Windows and PF_RING. */
+    pcap_init();
     rawsock_init();
 
     /* Init some protocol parser data structures */

diff --git a/src/masscan-version.h b/src/masscan-version.h
@@ -1,6 +1,6 @@
 #ifndef MASSCAN_VERSION
 
-#define MASSCAN_VERSION "1.0.3"
+#define MASSCAN_VERSION "1.0.4"
 
 #endif