PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-11 18:29:03 +00:00
Code Issues Projects Releases Wiki Activity

Revert r26741.

Browse Source 
This makes Nmap assume that pcap sockets are selectable on Solaris again. I had
originally tested this on Solaris x86, and couldn't get a scan to complete witho
ut this change. But it was reported that it fails on Solaris SPARC (scans take a
 long time, indicating that pcap calls are blocking longer than their timeout).
I just tested it again on Solaris x86, and now I can't get a scan to complete wi
th r26741. So reverting.
This commit is contained in:
david
2011-10-22 01:09:30 +00:00
parent e543894b99
commit c21d62d4e6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libnetutil/netutil.cc
View File

@@ -849,7 +849,7 @@ void set_ttl(int sd, int ttl) {
/* Returns whether the system supports pcap_get_selectable_fd() properly */ /* Returns whether the system supports pcap_get_selectable_fd() properly */
int pcap_selectable_fd_valid() { int pcap_selectable_fd_valid() {
#if defined(WIN32) || defined(MACOSX) || defined(SOLARIS) || (defined(FREEBSD) && (__FreeBSD_version < 500000)) #if defined(WIN32) || defined(MACOSX) || (defined(FREEBSD) && (__FreeBSD_version < 500000))
return 0; return 0;
#else #else
return 1; return 1;
@@ -863,7 +863,7 @@ int pcap_selectable_fd_valid() {
results. If you just want to test whether the function is supported, results. If you just want to test whether the function is supported,
use pcap_selectable_fd_valid() instead. */ use pcap_selectable_fd_valid() instead. */
int my_pcap_get_selectable_fd(pcap_t *p) { int my_pcap_get_selectable_fd(pcap_t *p) {
#if defined(WIN32) || defined(MACOSX) || defined(SOLARIS) || (defined(FREEBSD) && (__FreeBSD_version < 500000)) #if defined(WIN32) || defined(MACOSX) || (defined(FREEBSD) && (__FreeBSD_version < 500000))
return -1; return -1;
#else #else
assert(pcap_selectable_fd_valid()); assert(pcap_selectable_fd_valid());