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

299 Commits

Author SHA1 Message Date
dmiller
a668a21b7a Make Nsock handle all connect errors without fatal 2017-03-20 17:12:40 +00:00
dmiller
b7e213b5cb Fix compatibility with LibreSSL; new checks skipped initialization code 2017-02-07 20:10:02 +00:00
dmiller
9b86dadb58 Remove deprecated calls from OpenSSL 1.1 API. Closes #630 2017-01-11 15:38:08 +00:00
dmiller
d9cbd7acc4 Use the correct license template for Nsock 2016-12-29 17:28:24 +00:00
dmiller
cb8904ebae Update license headers 2016-12-29 17:18:02 +00:00
dmiller
f6db6731d2 Fix kqueue engine, not compliant with new Nsock API after IOCP integration 2016-08-25 21:02:19 +00:00
tudor
e5a495c1a0 Fixed some compiler warnings 2016-08-23 04:27:07 +00:00
tudor
1e1f744186 Added IOCP integration for Nsock, engine IOCP is the default engine on Windows 2016-08-22 19:15:13 +00:00
dmiller
ed59a3d370 Avoid macro redefinition and WinPcap incompatibility now that Npcap defines PCAP_NETMASK_UNKNOWN 2016-08-18 23:53:46 +00:00
vincent
b5606dde91 Hide first makefile attempt to include makefile.dep
This is to avoid having a warning saying that there is no makefile.dep
file, which will be generated right after the warning and then
included in the Makefile.
2016-08-16 09:31:59 +00:00
tudor
63b31682f4 Reverted the IOCP integration 2016-08-11 18:58:03 +00:00
tudor
1aa7958e23 Added IOCP integration for Nsock 2016-08-09 12:44:55 +00:00
dmiller
d30b3c36a8 Silence ASan warning due to definition of container_of in tests. Same as r32536 2016-08-03 18:29:56 +00:00
dmiller
28bd96b82e Reorder checks and libs to fix building when OpenSSL requires -ldl 2016-07-31 13:57:01 +00:00
dmiller
74cade6f39 Avoid some theoretical null pointer derefs 2016-07-30 03:54:00 +00:00
dmiller
7f6595112d Better use of configured flags when building Nsock tests 2016-07-30 03:53:59 +00:00
abhishek
57c3760a7c Updates the Nsock examples, closes #395 2016-06-07 15:58:09 +00:00
dmiller
f90587f131 Bump earliest supported Windows version to Vista, enabling poll nsock engine. 2016-06-04 02:46:13 +00:00
dmiller
dc71d91cea Avoid crashes in Windows using poll nsock engine
WSAPoll returns WSAEINVAL when there are no valid sockets in the fdarray
parameter. Individual WSAPOLLFDs can be ignored by setting them to a
negative value (just as with POSIX poll(2)), but there must be at least
one valid (not-ignored) socket to check.

Handled this by either returning error if the error was not EINVAL, or
by checking each WSAPOLLFD in the fdarray; at the first valid one,
return the error, since this was not the reason for the error. If none
are valid, continue, ignoring the error.
2016-06-04 02:46:13 +00:00
dmiller
50054e6ed7 Update platform toolset to remove XP compatibility 2016-06-04 02:46:11 +00:00
dmiller
a752c2265a Adjust indents to avoid confusion. Fixes #396. whitespace only. 2016-06-01 16:51:50 +00:00
dmiller
f38b959593 Avoid clobbering nsiod.peer with junk data if recvfrom doesn't set src_addr 2016-05-13 02:13:25 +00:00
dmiller
6e33d6ac3c Bump date in copyright headers 2016-04-04 15:38:44 +00:00
dmiller
616cf9730e clear session data before attempting a reconnect without SSLv2-compatibility. Fixes #318. Fixes #308 2016-03-12 23:26:26 +00:00
dmiller
d2136e5ad0 Force-clear SSL_OP_NO_SSLv2 flag (required for 1.0.2g and later to allow SSLv2) 2016-03-12 23:26:25 +00:00
dmiller
ee048d5349 Avoid printf on NULL pointer if no string is registered for the error code. 2016-01-04 16:48:09 +00:00
dmiller
37d517b32e Use XP compatibility SDK, because users are complaining 2015-11-10 16:47:35 +00:00
dmiller
f4619edece Update http urls for nmap.org to https 2015-11-05 20:41:05 +00:00
dmiller
83c2bc1d18 Remove some more generated files when doing a distclean. Fixes #218 2015-10-07 16:34:12 +00:00
andrew
90f534d8c1 Removed an unnecessary check that a string is non-NULL before free()ing memory in proxy_*_node_delete. 2015-08-21 14:39:31 +00:00
dmiller
f66eadbcd2 Fix typo of nsock_loglevel_t enum value (broke build on VS2013) 2015-06-30 19:49:07 +00:00
henri
ea495ddecd Cosmetic fixes
Removed unneeded NULL-checks before free()
Flattened code structures
2015-06-27 08:21:56 +00:00
henri
b55ff2d68f Don't associate nsock logging info to a nspool.
Make current loglevel and current log callback global
to the library. Attaching them to the nsock pool doesn't
bring any benefit and prevents from logging activity in
code sections that don't have access to a pool (such as
proxy chain specification parsing).

Updated external calls and nsock tests accordingly.
2015-06-27 08:21:53 +00:00
henri
b75233ce98 Consistently renamed nsi_XXX calls into nsock_iod_XXX
This is part of the effort to make nsock expose only
nsock_ prefixed symbols and simplify the API.
2015-06-27 08:21:33 +00:00
henri
fd40b8df08 Simplify Nsock SSL init API
Replaced nsock_pool_ssl_init_max_speed() by a NSOCK_SSL_MAX_SPEED
flag to be passed to nsock_pool_ssl_init(). Default (flag=0) means
secure.
2015-06-27 08:21:22 +00:00
henri
0348359f60 Enforce nsock naming scheme.
convert nsp_* calls into nsock_pool_*. Separate words with underscores
where appropriate.
2015-06-27 08:21:16 +00:00
henri
ab161bbb0b Remove nsock_pool unique identifiers.
This isn't used anywhere and I cannot think of any use case.
The NSP is supposed to be unique and global as it controls the
event loop.
2015-06-27 08:21:05 +00:00
dmiller
68409b2226 Update copyright date to 2015 2015-06-03 13:01:29 +00:00
henri
d7a3d43eb6 Reduce CPU consumption with nsock engine poll
Entering nsock_loop() with the poll engine activated and no registered FD
(timers only, for instance) should not directly return, but sleep until next
timeout.
2015-02-21 21:15:21 +00:00
henri
7b02dea019 Remove dead code: einfo->evlen cannot be zero. 2015-02-21 21:15:15 +00:00
dmiller
7e30cb9c4a Only run SSL nsock tests if configured with OpenSSL 2015-02-11 04:55:36 +00:00
dmiller
2bf814b499 Add autoconf placeholder for HAVE_OPENSSL in nsock_config.h.in 2015-02-11 04:55:35 +00:00
dmiller
0952bed032 Merge final changes to support VS2013 build
Changes:

* Fix a collision of the name PS_NONE with a different constant in shlobj.h
* Update solution and project files for VS2013
* Update the NSIS installer to reference the VC 2013 redistributable
2015-01-17 04:35:01 +00:00
dmiller
fc99bed706 Don't use unnecessary parens with __declspec
Reported by nnposter, this broke on VS2010. Pretty sure this was just a
simple mistake in the first place. Fixes #33
2015-01-01 13:39:47 +00:00
dmiller
04ac366666 Fix nsock tests using wrong type (clang complains) 2014-12-31 04:30:58 +00:00
dmiller
59de1a50de Fix Nsock's make check: wrong value tested 2014-11-17 13:32:41 +00:00
dmiller
f6d70cd3e6 Revert r33815 (unrelated changes) 2014-11-17 13:31:56 +00:00
dmiller
2b9fade75b Fix Nsock's make check: wrong value tested 2014-11-17 13:25:35 +00:00
dmiller
85bb2d388d Define a NORETURN macro 2014-11-17 13:25:32 +00:00
dmiller
a067bc25bc Let MSVC know about noreturn attribute to help with code analysis 2014-11-12 13:29:40 +00:00