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

More efficiently check if any non-stdin fds are in the call to select on Windows

Browse Source
This commit is contained in:
dmiller
2022-09-23 21:42:00 +00:00
parent 8dbefeba86
commit ed19887f41
1 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
nbase/nbase_misc.c
View File

@@ -358,28 +358,46 @@ int fselect(int s, fd_set *rmaster, fd_set *wmaster, fd_set *emaster, struct tim
#ifdef WIN32 #ifdef WIN32
static int stdin_thread_started = 0; static int stdin_thread_started = 0;
int fds_ready = 0; int fds_ready = 0;
int iter = -1, i; int iter = -1;
int do_select = 0;
struct timeval stv; struct timeval stv;
fd_set rset, wset, eset; fd_set rset, wset, eset;
int r_stdin = rmaster != NULL && checked_fd_isset(STDIN_FILENO, rmaster); int r_stdin = 0;
int e_stdin = emaster != NULL && checked_fd_isset(STDIN_FILENO, emaster); int e_stdin = 0;
int stdin_ready = 0; int stdin_ready = 0;
/* Figure out whether there are any FDs in the sets, as @$@!$# Windows /* Figure out whether there are any FDs in the sets, as @$@!$# Windows
returns WSAINVAL (10022) if you call a select() with no FDs, even though returns WSAINVAL (10022) if you call a select() with no FDs, even though
the Linux man page says that doing so is a good, reasonably portable way the Linux man page says that doing so is a good, reasonably portable way
to sleep with subsecond precision. Sigh. */ to sleep with subsecond precision. Sigh. */
for(i = s; i > STDIN_FILENO; i--) { if (rmaster != NULL) {
if ((rmaster != NULL && checked_fd_isset(i, rmaster)) /* If stdin is requested, clear it and remember it. */
|| (wmaster != NULL && checked_fd_isset(i, wmaster)) if (checked_fd_isset(STDIN_FILENO, rmaster)) {
|| (emaster != NULL && checked_fd_isset(i, emaster))) r_stdin = 1;
break; checked_fd_clr(STDIN_FILENO, rmaster);
s--; }
/* If any are left, we'll do a select. Otherwise, it's a sleep. */
do_select = do_select || rmaster->fd_count;
}
/* Same thing with exceptions */
if (emaster != NULL) {
if (checked_fd_isset(STDIN_FILENO, emaster)) {
e_stdin = 1;
checked_fd_clr(STDIN_FILENO, emaster);
}
do_select = do_select || emaster->fd_count;
}
/* stdin can't be written to, so ignore it. */
if (wmaster != NULL) {
assert(!checked_fd_isset(STDIN_FILENO, wmaster));
do_select = do_select || wmaster->fd_count;
} }
/* Handle the case where stdin is not in scope. */ /* Handle the case where stdin is not in scope. */
if (!(r_stdin || e_stdin)) { if (!(r_stdin || e_stdin)) {
if (s > 0) { if (do_select) {
/* Do a normal select. */ /* Do a normal select. */
return select(s, rmaster, wmaster, emaster, tv); return select(s, rmaster, wmaster, emaster, tv);
} else { } else {
@@ -412,11 +430,6 @@ int fselect(int s, fd_set *rmaster, fd_set *wmaster, fd_set *emaster, struct tim
stdin_thread_started = 1; stdin_thread_started = 1;
} }
if (r_stdin)
checked_fd_clr(STDIN_FILENO, rmaster);
if (e_stdin)
checked_fd_clr(STDIN_FILENO, emaster);
if (tv) { if (tv) {
int usecs = (tv->tv_sec * 1000000) + tv->tv_usec; int usecs = (tv->tv_sec * 1000000) + tv->tv_usec;
@@ -449,7 +462,7 @@ int fselect(int s, fd_set *rmaster, fd_set *wmaster, fd_set *emaster, struct tim
fds_ready = 0; fds_ready = 0;
/* selecting on anything other than stdin? */ /* selecting on anything other than stdin? */
if (s > 1) if (do_select)
fds_ready = select(s, &rset, &wset, &eset, &stv); fds_ready = select(s, &rset, &wset, &eset, &stv);
else else
usleep(stv.tv_sec * 1000000UL + stv.tv_usec); usleep(stv.tv_sec * 1000000UL + stv.tv_usec);