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

Avoid multiple expansions of TIMEVAL_MSEC_SUBTRACT macro within MAX macro

Browse Source
This commit is contained in:
dmiller
2024-06-27 19:36:04 +00:00
parent f0fab247db
commit dcb4ba569e
6 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nsock/src/engine_epoll.c
View File

@@ -264,8 +264,10 @@ int epoll_loop(struct npool *nsp, int msec_timeout) {
nse = next_expirable_event(nsp); nse = next_expirable_event(nsp);
if (!nse) if (!nse)
event_msecs = -1; /* None of the events specified a timeout */ event_msecs = -1; /* None of the events specified a timeout */
else else {
event_msecs = MAX(0, TIMEVAL_MSEC_SUBTRACT(nse->timeout, nsock_tod)); event_msecs = TIMEVAL_MSEC_SUBTRACT(nse->timeout, nsock_tod);
event_msecs = MAX(0, event_msecs);
}
#if HAVE_PCAP #if HAVE_PCAP
#ifndef PCAP_CAN_DO_SELECT #ifndef PCAP_CAN_DO_SELECT

6
nsock/src/engine_iocp.c
View File

@@ -300,8 +300,10 @@ int iocp_loop(struct npool *nsp, int msec_timeout) {
nse = next_expirable_event(nsp); nse = next_expirable_event(nsp);
if (!nse) if (!nse)
event_msecs = -1; /* None of the events specified a timeout */ event_msecs = -1; /* None of the events specified a timeout */
else else {
event_msecs = MAX(0, TIMEVAL_MSEC_SUBTRACT(nse->timeout, nsock_tod)); event_msecs = TIMEVAL_MSEC_SUBTRACT(nse->timeout, nsock_tod);
event_msecs = MAX(0, event_msecs);
}
#if HAVE_PCAP #if HAVE_PCAP
#ifndef PCAP_CAN_DO_SELECT #ifndef PCAP_CAN_DO_SELECT

6
nsock/src/engine_kqueue.c
View File

@@ -242,8 +242,10 @@ int kqueue_loop(struct npool *nsp, int msec_timeout) {
nse = next_expirable_event(nsp); nse = next_expirable_event(nsp);
if (!nse) if (!nse)
event_msecs = -1; /* None of the events specified a timeout */ event_msecs = -1; /* None of the events specified a timeout */
else else {
event_msecs = MAX(0, TIMEVAL_MSEC_SUBTRACT(nse->timeout, nsock_tod)); event_msecs = TIMEVAL_MSEC_SUBTRACT(nse->timeout, nsock_tod);
event_msecs = MAX(0, event_msecs);
}
#if HAVE_PCAP #if HAVE_PCAP
#ifndef PCAP_CAN_DO_SELECT #ifndef PCAP_CAN_DO_SELECT

6
nsock/src/engine_poll.c
View File

@@ -314,8 +314,10 @@ int poll_loop(struct npool *nsp, int msec_timeout) {
nse = next_expirable_event(nsp); nse = next_expirable_event(nsp);
if (!nse) if (!nse)
event_msecs = -1; /* None of the events specified a timeout */ event_msecs = -1; /* None of the events specified a timeout */
else else {
event_msecs = MAX(0, TIMEVAL_MSEC_SUBTRACT(nse->timeout, nsock_tod)); event_msecs = TIMEVAL_MSEC_SUBTRACT(nse->timeout, nsock_tod);
event_msecs = MAX(0, event_msecs);
}
#if HAVE_PCAP #if HAVE_PCAP
#ifndef PCAP_CAN_DO_SELECT #ifndef PCAP_CAN_DO_SELECT

7
nsock/src/engine_select.c
View File

@@ -261,8 +261,11 @@ int select_loop(struct npool *nsp, int msec_timeout) {
nse = next_expirable_event(nsp); nse = next_expirable_event(nsp);
if (!nse) if (!nse)
event_msecs = -1; /* None of the events specified a timeout */ event_msecs = -1; /* None of the events specified a timeout */
else else {
event_msecs = MAX(0, TIMEVAL_MSEC_SUBTRACT(nse->timeout, nsock_tod)); event_msecs = TIMEVAL_MSEC_SUBTRACT(nse->timeout, nsock_tod);
event_msecs = MAX(0, event_msecs);
}
#if HAVE_PCAP #if HAVE_PCAP
#ifndef PCAP_CAN_DO_SELECT #ifndef PCAP_CAN_DO_SELECT

3
nsock/src/nsock_core.c
View File

@@ -927,7 +927,8 @@ enum nsock_loopstatus nsock_loop(nsock_pool nsp, int msec_timeout) {
} }
if (msec_timeout >= 0) { if (msec_timeout >= 0) {
msecs_left = MAX(0, TIMEVAL_MSEC_SUBTRACT(loop_timeout, nsock_tod)); msecs_left = TIMEVAL_MSEC_SUBTRACT(loop_timeout, nsock_tod);
msecs_left = MAX(0, msecs_left);
if (msecs_left == 0 && loopnum > 0) { if (msecs_left == 0 && loopnum > 0) {
quitstatus = NSOCK_LOOP_TIMEOUT; quitstatus = NSOCK_LOOP_TIMEOUT;
break; break;