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

Fix failure to build on Windows: need different approach if any

Browse Source
This commit is contained in:
dmiller
2015-11-12 20:01:53 +00:00
parent 47ac4e421e
commit ae17eba3c3
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ncat/ncat_listen.c
View File

@@ -260,22 +260,21 @@ static int ncat_listen_stream(int proto)
setup_ssl_listen(); setup_ssl_listen();
#endif #endif
/* Not sure if this problem exists on Windows, but fcntl and /dev/null don't */
#ifndef WIN32
/* Check whether stdin is closed. Because we treat this fd specially, we /* Check whether stdin is closed. Because we treat this fd specially, we
* can't risk it being reopened for an incoming connection, so we'll hold * can't risk it being reopened for an incoming connection, so we'll hold
* it open instead. */ * it open instead. */
if (fcntl(STDIN_FILENO, F_GETFD) == -1 && errno == EBADF) { if (fcntl(STDIN_FILENO, F_GETFD) == -1 && errno == EBADF) {
logdebug("stdin is closed, attempting to reserve STDIN_FILENO\n"); logdebug("stdin is closed, attempting to reserve STDIN_FILENO\n");
#ifdef WIN32
rc = open("NUL", O_RDONLY);
#else
rc = open("/dev/null", O_RDONLY); rc = open("/dev/null", O_RDONLY);
#endif
if (rc >= 0 && rc != STDIN_FILENO) { if (rc >= 0 && rc != STDIN_FILENO) {
/* Oh well, we tried */ /* Oh well, we tried */
logdebug("Couldn't reserve STDIN_FILENO\n"); logdebug("Couldn't reserve STDIN_FILENO\n");
close(rc); close(rc);
} }
} }
#endif
/* We need a list of fds to keep current fdmax. The second parameter is a /* We need a list of fds to keep current fdmax. The second parameter is a
number added to the supplied connection limit, that will compensate number added to the supplied connection limit, that will compensate
@@ -690,22 +689,21 @@ static int ncat_listen_dgram(int proto)
Signal(SIGPIPE, SIG_IGN); Signal(SIGPIPE, SIG_IGN);
#endif #endif
/* Not sure if this problem exists on Windows, but fcntl and /dev/null don't */
#ifndef WIN32
/* Check whether stdin is closed. Because we treat this fd specially, we /* Check whether stdin is closed. Because we treat this fd specially, we
* can't risk it being reopened for an incoming connection, so we'll hold * can't risk it being reopened for an incoming connection, so we'll hold
* it open instead. */ * it open instead. */
if (fcntl(STDIN_FILENO, F_GETFD) == -1 && errno == EBADF) { if (fcntl(STDIN_FILENO, F_GETFD) == -1 && errno == EBADF) {
logdebug("stdin is closed, attempting to reserve STDIN_FILENO\n"); logdebug("stdin is closed, attempting to reserve STDIN_FILENO\n");
#ifdef WIN32
i = open("NUL", O_RDONLY);
#else
i = open("/dev/null", O_RDONLY); i = open("/dev/null", O_RDONLY);
#endif
if (i >= 0 && i != STDIN_FILENO) { if (i >= 0 && i != STDIN_FILENO) {
/* Oh well, we tried */ /* Oh well, we tried */
logdebug("Couldn't reserve STDIN_FILENO\n"); logdebug("Couldn't reserve STDIN_FILENO\n");
close(i); close(i);
} }
} }
#endif
/* set for selecting udp listening sockets */ /* set for selecting udp listening sockets */
fd_set listen_fds; fd_set listen_fds;