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

Minor rewordings, fixed typos.

Browse Source
This commit is contained in:
henri
2012-01-09 13:33:38 +00:00
parent 42c7c15c3f
commit fe566432c7
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nsock/src/engine_epoll.c
View File

@@ -291,7 +291,7 @@ int epoll_loop(mspool *nsp, int msec_timeout) {
} }
gettimeofday(&nsock_tod, NULL); /* Due to usleep or epoll delay */ gettimeofday(&nsock_tod, NULL); /* Due to usleep or epoll delay */
} while (results_left == -1 && sock_err == EINTR); /* repeat only if signal occured */ } while (results_left == -1 && sock_err == EINTR); /* repeat only if signal occurred */
if (results_left == -1 && sock_err != EINTR) { if (results_left == -1 && sock_err != EINTR) {
nsock_trace(nsp, "nsock_loop error %d: %s", sock_err, socket_strerror(sock_err)); nsock_trace(nsp, "nsock_loop error %d: %s", sock_err, socket_strerror(sock_err));

8
nsock/src/engine_select.c
View File

@@ -140,13 +140,13 @@ extern struct timeval nsock_tod;
* Engine specific data structure * Engine specific data structure
*/ */
struct select_engine_info { struct select_engine_info {
/* Descriptors from which have pending READ events */ /* Descriptors which have pending READ events */
fd_set fds_master_r; fd_set fds_master_r;
/* Descriptors which we are tryint to WRITE to */ /* Descriptors we are trying to WRITE to */
fd_set fds_master_w; fd_set fds_master_w;
/* looking for exceptional events -- used with connect */ /* Looking for exceptional events -- used with connect */
fd_set fds_master_x; fd_set fds_master_x;
/* For keeping track of the select results */ /* For keeping track of the select results */
@@ -333,7 +333,7 @@ int select_loop(mspool *nsp, int msec_timeout) {
} }
gettimeofday(&nsock_tod, NULL); /* Due to usleep or select delay */ gettimeofday(&nsock_tod, NULL); /* Due to usleep or select delay */
} while (results_left == -1 && sock_err == EINTR); /* repeat only if signal occured */ } while (results_left == -1 && sock_err == EINTR); /* repeat only if signal occurred */
if (results_left == -1 && sock_err != EINTR) { if (results_left == -1 && sock_err != EINTR) {
nsock_trace(nsp, "nsock_loop error %d: %s", sock_err, socket_strerror(sock_err)); nsock_trace(nsp, "nsock_loop error %d: %s", sock_err, socket_strerror(sock_err));

4
nsock/src/nsock_core.c
View File

@@ -852,7 +852,7 @@ int pcap_read_on_nonselect(mspool *nsp) {
/* Here is the all important looping function that tells the event engine to /* Here is the all important looping function that tells the event engine to
* start up and begin processing events. It will continue until all events have * start up and begin processing events. It will continue until all events have
* been delivered (including new ones started from event handlers), or the * been delivered (including new ones started from event handlers), or the
* msec_timeout is reached, or a major error has occured. Use -1 if you don't * msec_timeout is reached, or a major error has occurred. Use -1 if you don't
* want to set a maximum time for it to run. A timeout of 0 will return after 1 * want to set a maximum time for it to run. A timeout of 0 will return after 1
* non-blocking loop. The nsock loop can be restarted again after it returns. * non-blocking loop. The nsock loop can be restarted again after it returns.
* For example you could do a series of 15 second runs, allowing you to do other * For example you could do a series of 15 second runs, allowing you to do other
@@ -998,7 +998,7 @@ void process_event(mspool *nsp, gh_list *evlist, msevent *nse, int ev) {
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
/* If event occured, and we're in BSD_HACK mode, then this event was added /* If event occurred, and we're in BSD_HACK mode, then this event was added
* to two queues. read_event and pcap_read_event * to two queues. read_event and pcap_read_event
* Of course we should destroy it only once. * Of course we should destroy it only once.
* I assume we're now in read_event, so just unlink this event from * I assume we're now in read_event, so just unlink this event from

2
nsock/src/nsock_event.c
View File

@@ -305,7 +305,7 @@ int msevent_cancel(mspool *nsp, msevent *nse, gh_list *event_list, gh_list_elem
nse->id, &nsp->pcap_read_events, &nsp->read_events, nse->id, &nsp->pcap_read_events, &nsp->read_events,
event_list,((mspcap *)nse->iod->pcap)->pcap_desc); event_list,((mspcap *)nse->iod->pcap)->pcap_desc);
/* If event occured, and we're in BSD_HACK mode, than this event was added to /* If event occurred, and we're in BSD_HACK mode, then this event was added to
* two queues. read_event and pcap_read_event Of course we should * two queues. read_event and pcap_read_event Of course we should
* destroy it only once. I assume we're now in read_event, so just unlink * destroy it only once. I assume we're now in read_event, so just unlink
* this event from pcap_read_event */ * this event from pcap_read_event */