1
0
mirror of https://github.com/nmap/nmap.git synced 2025-12-15 12:19:02 +00:00
Commit Graph

26 Commits

Author SHA1 Message Date
henri
b1086ac340 Added a --nsock-engine option to nmap, nping and ncat to enforce use of a
given nsock IO engine. [Henri]
2012-03-01 09:05:02 +00:00
fyodor
e96a7b7b24 Update the headers for each code file. This updates code copyright dates to 2012, notes the awesome NSE in the list of technology, and slightly rewords the derivative works clarification 2012-03-01 06:32:23 +00:00
henri
dbda99204b Extreme nitpicking: added missing closing parentheses in comments. 2012-02-23 18:22:37 +00:00
henri
889a4711ba Changed variable name from camel case to all lowercase for consistency with the naming convention. 2012-02-19 15:29:23 +00:00
henri
5f49844390 Simple comment fixes. 2012-02-02 09:52:19 +00:00
henri
2ff581affa Fixed event set masking, only ev_inc was modified. Error introduced in r27949.
This was noticed and fixed by Brian Gottreu.
2012-01-30 21:53:34 +00:00
henri
e1c71046fe Changed update_events() to make it directly filter out events that belong to
both event sets (events to add and events to remove).

This removes the need callers had to do that filtering, it is safer and makes code
easier to read and maintain.

This section of code is described in a nmap-dev thread, that led to the
development of this patch: http://seclists.org/nmap-dev/2012/q1/243
2012-01-29 15:30:59 +00:00
henri
9cf2fa8854 Apply the correct event type against evclr in X_EV. 2012-01-27 20:44:28 +00:00
henri
255c2a0a9b Fixed an assertion failure which could occur when connecting to an SSL server:
nsock_core.c:186: update_events: Assertion `(ev_inc & ev_dec) == 0' failed.

Thanks to Ron for reporting the bug and testing.
See: http://seclists.org/nmap-dev/2012/q1/235
2012-01-27 15:46:32 +00:00
henri
63f3fc4954 Fixed comments that referred to an incorrect location. 2012-01-26 09:25:05 +00:00
henri
10d1f17509 Fixed two minor typos that escaped previous checks. 2012-01-26 09:16:58 +00:00
henri
444667943f Fixed SVN properties for consistency, so that src files now have the following
ones:

  svn:keywords: Author Date Id Revision
  svn:eol-style: native
2012-01-26 09:10:18 +00:00
henri
9c7f72108b More code cleaning: whitespace and indentation fixes. 2012-01-20 08:26:14 +00:00
david
8dd5bc49ca Fold EACCES and WSAEACCES cases together.
Otherwise this causes a duplicate case error on Windows.
2012-01-20 02:28:44 +00:00
david
df3b01e5d8 Use the right errno in handle_connect_result catch-all assert.
We call getsockopt(SO_ERROR) to get the socket error, but then we were
calling perror, which uses the global errno instead.
2012-01-19 00:03:40 +00:00
david
47ee706a4a Handle EACCES in handle_connect_result.
This specific connect error is already handled by ultra_scan. A comment
there says it can result from ICMPv6 destination-unreachable
admin-prohibited messages.
2012-01-19 00:03:39 +00:00
henri
2cdd7e63f0 Minor wrapping and whitespace fixes. 2012-01-13 12:59:18 +00:00
henri
520ff94839 Fixed HAVE_PCAP=0 case. 2012-01-13 12:56:20 +00:00
henri
48fea78cb4 Fill epoll_event structures with zeros before use. 2012-01-11 11:17:58 +00:00
henri
d0a17f430f Fixed more typos. 2012-01-09 13:47:58 +00:00
henri
fe566432c7 Minor rewordings, fixed typos. 2012-01-09 13:33:38 +00:00
henri
42c7c15c3f Fixed typos. 2012-01-09 13:20:13 +00:00
henri
659ed2ac89 Check for the presence of EPOLLRDHUP in the nsock epoll(7)-based engine as this
flag isn't available on every epoll-compatible systems.
2012-01-08 20:17:38 +00:00
henri
856cd00a17 Merged nsock-engines from nmap-exp. This rewrite of the nsock library adds
support for system-specific scalable IO notification facilities without breaking
portability. This initial version comes with an epoll(7)-based engine for Linux
and a select(2)-based fallback engine for all other operating systems.

This required an important refactoring of the library but the external API was
preserved.

The rewrite also tries to bring the coding standards of nmap to nsock.

See http://labs.unix-junkies.org/nsock_engines.html for the details.
2012-01-05 01:08:16 +00:00
henri
15f74d395f Fix pcap_gc() crash after failed attempts to open pcap readers from NSE. Patch
by Djalal.

See http://seclists.org/nmap-dev/2012/q1/43
2012-01-05 00:44:48 +00:00
david
ed2ba4e168 Copy nping, nsock, nbase, zenmap, ncat from their homes in /.
If you have trouble updating after this revision you need to follow
these instructions. You have probably just seen an error like this:

svn: URL 'svn://svn.insecure.org/nping' of existing directory 'nping'
does not match expected URL 'svn://svn.insecure.org/nmap/nping'

This is caused by the replacement of SVN externals.

Here's what you need to do. First, save any local changes you might have
in the nping, nsock, nbase, ncat, and zenmap directories. (For example
by running "cd nping; svn diff > ../nping.diff".) If you don't have any
local changes you can skip this step.

Then run these commands:

rm -rf nping/ nsock/ nbase/ ncat/ zenmap/
svn update
svn cleanup

If all else fails, you can just delete your whole working directory and
check out anew:

svn co --username guest --password "" svn://svn.insecure.org/nmap

There may be further discussion in the mailing list thread at
http://seclists.org/nmap-dev/2011/q4/303.
2011-11-16 21:49:44 +00:00