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

New function msevent_timedout().

Browse Source
This commit is contained in:
henri
2013-05-12 13:39:45 +00:00
parent 8475cef210
commit 81fda37f89
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
nsock/src/nsock_core.c
View File

@@ -939,7 +939,7 @@ void process_event(mspool *nsp, gh_list *evlist, msevent *nse, int ev) {
case NSE_TYPE_CONNECT_SSL: case NSE_TYPE_CONNECT_SSL:
if (ev != EV_NONE) if (ev != EV_NONE)
handle_connect_result(nsp, nse, NSE_STATUS_SUCCESS); handle_connect_result(nsp, nse, NSE_STATUS_SUCCESS);
if (!nse->event_done && nse->timeout.tv_sec && !TIMEVAL_AFTER(nse->timeout, nsock_tod)) if (msevent_timedout(nse))
handle_connect_result(nsp, nse, NSE_STATUS_TIMEOUT); handle_connect_result(nsp, nse, NSE_STATUS_TIMEOUT);
break; break;
@@ -956,7 +956,7 @@ void process_event(mspool *nsp, gh_list *evlist, msevent *nse, int ev) {
if (!nse->iod->ssl && match_r) if (!nse->iod->ssl && match_r)
handle_read_result(nsp, nse, NSE_STATUS_SUCCESS); handle_read_result(nsp, nse, NSE_STATUS_SUCCESS);
if (!nse->event_done && nse->timeout.tv_sec && !TIMEVAL_AFTER(nse->timeout, nsock_tod)) if (msevent_timedout(nse))
handle_read_result(nsp, nse, NSE_STATUS_TIMEOUT); handle_read_result(nsp, nse, NSE_STATUS_TIMEOUT);
break; break;
@@ -973,12 +973,12 @@ void process_event(mspool *nsp, gh_list *evlist, msevent *nse, int ev) {
if (!nse->iod->ssl && match_w) if (!nse->iod->ssl && match_w)
handle_write_result(nsp, nse, NSE_STATUS_SUCCESS); handle_write_result(nsp, nse, NSE_STATUS_SUCCESS);
if (!nse->event_done && nse->timeout.tv_sec && !TIMEVAL_AFTER(nse->timeout, nsock_tod)) if (msevent_timedout(nse))
handle_write_result(nsp, nse, NSE_STATUS_TIMEOUT); handle_write_result(nsp, nse, NSE_STATUS_TIMEOUT);
break; break;
case NSE_TYPE_TIMER: case NSE_TYPE_TIMER:
if (nse->timeout.tv_sec && !TIMEVAL_AFTER(nse->timeout, nsock_tod)) if (msevent_timedout(nse))
handle_timer_result(nsp, nse, NSE_STATUS_SUCCESS); handle_timer_result(nsp, nse, NSE_STATUS_SUCCESS);
break; break;
@@ -996,7 +996,7 @@ void process_event(mspool *nsp, gh_list *evlist, msevent *nse, int ev) {
if (fs_length(&(nse->iobuf)) > 0) if (fs_length(&(nse->iobuf)) > 0)
handle_pcap_read_result(nsp, nse, NSE_STATUS_SUCCESS); handle_pcap_read_result(nsp, nse, NSE_STATUS_SUCCESS);
if (!nse->event_done && nse->timeout.tv_sec && !TIMEVAL_AFTER(nse->timeout, nsock_tod)) if (msevent_timedout(nse))
handle_pcap_read_result(nsp, nse, NSE_STATUS_TIMEOUT); handle_pcap_read_result(nsp, nse, NSE_STATUS_TIMEOUT);
#if PCAP_BSD_SELECT_HACK #if PCAP_BSD_SELECT_HACK

6
nsock/src/nsock_event.c
View File

@@ -506,3 +506,9 @@ const char *nse_status2str(enum nse_status status) {
} }
} }
int msevent_timedout(msevent *nse) {
if (nse->event_done)
return 0;
return (nse->timeout.tv_sec && !TIMEVAL_AFTER(nse->timeout, nsock_tod));
}

2
nsock/src/nsock_internal.h
View File

@@ -419,6 +419,8 @@ static inline int nsock_engine_loop(mspool *nsp, int msec_timeout) {
/* ------------------- PROTOTYPES ------------------- */ /* ------------------- PROTOTYPES ------------------- */
int msevent_timedout(msevent *nse);
/* Get a new nsock_event_id, given a type */ /* Get a new nsock_event_id, given a type */
nsock_event_id get_new_event_id(mspool *nsp, enum nse_type type); nsock_event_id get_new_event_id(mspool *nsp, enum nse_type type);