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

Use TIMEVAL_BEFORE instead of TIMEVAL_SUBTRACT for clarity and efficiency

Browse Source
This commit is contained in:
dmiller
2024-02-26 18:29:11 +00:00
parent e7f8cd820b
commit 3cf82912ce
3 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scan_engine_raw.cc
View File

@@ -415,7 +415,7 @@ int get_ping_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
&linkhdr, true);
gettimeofday(&USI->now, NULL);
if (!ip_tmp) {
if (TIMEVAL_SUBTRACT(*stime, USI->now) < 0) {
if (TIMEVAL_BEFORE(*stime, USI->now)) {
timedout = true;
break;
} else {
@@ -1433,7 +1433,7 @@ bool get_arp_result(UltraScanInfo *USI, struct timeval *stime) {
if (rc == -1)
fatal("Received -1 response from read_arp_reply_pcap");
if (rc == 0) {
if (TIMEVAL_SUBTRACT(*stime, USI->now) < 0) {
if (TIMEVAL_BEFORE(*stime, USI->now)) {
timedout = true;
break;
} else {
@@ -1512,7 +1512,7 @@ bool get_ns_result(UltraScanInfo *USI, struct timeval *stime) {
if (rc == -1)
fatal("Received -1 response from read_arp_reply_pcap");
if (rc == 0) {
if (TIMEVAL_SUBTRACT(*stime, USI->now) < 0) {
if (TIMEVAL_BEFORE(*stime, USI->now)) {
timedout = true;
break;
} else {
@@ -1610,7 +1610,7 @@ bool get_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
to_usec = 2000;
ip_tmp = (struct ip *) readip_pcap(USI->pd, &bytes, to_usec, &rcvdtime, &linkhdr, true);
gettimeofday(&USI->now, NULL);
if (!ip_tmp && TIMEVAL_SUBTRACT(*stime, USI->now) < 0) {
if (!ip_tmp && TIMEVAL_BEFORE(*stime, USI->now)) {
timedout = true;
break;
} else if (!ip_tmp)