Lines 1-20
Link Here
|
1 |
--- tcpip.cc.orig Fri Dec 8 04:01:19 2006 |
1 |
--- tcpip.cc.orig Fri Dec 8 04:01:19 2006 |
2 |
+++ tcpip.cc Mon Dec 18 15:48:46 2006 |
2 |
+++ tcpip.cc Wed Jan 3 17:15:05 2007 |
3 |
@@ -1959,7 +1959,7 @@ |
3 |
@@ -133,6 +133,8 @@ |
|
|
4 |
#endif /* NETINET_IF_ETHER_H */ |
5 |
#endif /* HAVE_NETINET_IF_ETHER_H */ |
6 |
|
7 |
+#include <sys/param.h> |
8 |
+ |
9 |
extern NmapOps o; |
10 |
|
11 |
#ifdef WIN32 |
12 |
@@ -1959,7 +1961,7 @@ |
4 |
|
13 |
|
5 |
// Returns whether the system supports pcap_get_selectable_fd() properly |
14 |
// Returns whether the system supports pcap_get_selectable_fd() properly |
6 |
bool pcap_selectable_fd_valid() { |
15 |
bool pcap_selectable_fd_valid() { |
7 |
-#if defined(WIN32) || defined(MACOSX) |
16 |
-#if defined(WIN32) || defined(MACOSX) |
8 |
+#if defined(WIN32) || defined(MACOSX) || (defined(FREEBSD) && (OSVERSION < 500000)) |
17 |
+#if defined(WIN32) || defined(MACOSX) || (defined(FREEBSD) && (__FreeBSD_version < 500000)) |
9 |
return false; |
18 |
return false; |
10 |
#endif |
19 |
#endif |
11 |
return true; |
20 |
return true; |
12 |
@@ -1972,7 +1972,7 @@ |
21 |
@@ -1972,7 +1974,7 @@ |
13 |
results. If you just want to test whether the function is supported, |
22 |
results. If you just want to test whether the function is supported, |
14 |
use pcap_selectable_fd_valid() instead. */ |
23 |
use pcap_selectable_fd_valid() instead. */ |
15 |
int my_pcap_get_selectable_fd(pcap_t *p) { |
24 |
int my_pcap_get_selectable_fd(pcap_t *p) { |
16 |
-#if defined(WIN32) || defined(MACOSX) |
25 |
-#if defined(WIN32) || defined(MACOSX) |
17 |
+#if defined(WIN32) || defined(MACOSX) || (defined(FREEBSD) && (OSVERSION < 500000)) |
26 |
+#if defined(WIN32) || defined(MACOSX) || (defined(FREEBSD) && (__FreeBSD_version < 500000)) |
18 |
return -1; |
27 |
return -1; |
19 |
#else |
28 |
#else |
20 |
assert(pcap_selectable_fd_valid()); |
29 |
assert(pcap_selectable_fd_valid()); |