1
0
mirror of https://github.com/nmap/nmap.git synced 2026-02-14 17:36:33 +00:00
Commit Graph

87 Commits

Author SHA1 Message Date
david
e1d4f58a29 Move declaration of NpingOps::getTotalProbes. 2013-05-03 21:30:46 +00:00
david
e5e8b91bbd Kill extra whitespace in NpingOps.h. 2013-05-03 21:30:44 +00:00
david
b65987df12 Add NpingOps::echo_payload_set. 2013-05-03 21:30:42 +00:00
david
265b73b6ae Remove unused tcpmss, tcpws, and tcpts from NpingOps. 2013-05-03 21:30:39 +00:00
david
08efb5ce1a Revert r30833, removal of obtainRawSocket.
This was prematurely merged from nmap-npingchanges. obtainRawSocket is
still used here.
2013-05-03 19:31:09 +00:00
david
5f557a3766 Use a constant definition to say 'No Payload' 2013-05-03 17:55:07 +00:00
david
74de527b75 Use false, not zero 2013-05-03 17:55:06 +00:00
david
4fb5f91f9c Use false instead of zero to initialize a bool 2013-05-03 17:55:04 +00:00
david
6fb635b86a Use NULL instead of 0 to initialize a pointer 2013-05-03 17:55:02 +00:00
david
4bdd43f466 Remove some useless code. 2013-05-03 17:55:00 +00:00
david
40a73d19c1 Remove unimplemented feature payload-file 2013-05-03 17:54:58 +00:00
david
d90f9549a4 Remove unused/unimplemented host_timeout feature 2013-05-03 17:54:57 +00:00
david
a4240eaab5 Minor style fix 2013-05-03 17:54:55 +00:00
david
3c8eb9781a Remove unused method from NpingOps 2013-05-03 06:25:24 +00:00
david
67db6f0829 Fix another outError → nping_warning.
Apparently missed in r30691. Reported by Gisle Vanem.
http://seclists.org/nmap-dev/2013/q2/32

Recommitted after recovery from backup.
2013-04-12 17:29:28 +00:00
luis
b70a358447 Merge r30025 from nmap-npingchanges: Add two helper functions to handle sockaddr_storage structures. 2013-03-29 17:53:02 +00:00
luis
a55a038bc6 Merge r28024 from nmap-npingchanges: Make the test script executable 2013-03-29 16:52:12 +00:00
luis
a3f84c2c87 Merge r27963 from nmap-npingchanges: Remove some unimplemented command-line flags 2013-03-29 16:39:36 +00:00
luis
ac64c953ab Merge r27177-180 from nmap-npingchanges: Minor typo and style fixes in -h output 2013-03-29 13:14:18 +00:00
luis
686322d1bd Merged r27162 from nmap-npingchanges: Remove some unused code 2013-03-29 13:01:29 +00:00
luis
84c31d5237 Merge r27120,27121,27123,27124,27125 from nmap-npingchanges. Minor style and typo fixes. 2013-03-29 12:51:50 +00:00
luis
f64b3fafe8 Merge r27122 from nmap-npingchanges: Changed names for output funtions. outPrint() -> nping_print(); outFatal() -> nping_fatal() ; outError() -> nping_warning(). This change is completely irrelevant but I personally hate the names I chose the first time and I thought I'd change them to something better. 2013-03-29 12:44:51 +00:00
david
ce51d8c4da Use the default value of MultiThreadedDLL where possible. 2013-02-09 20:30:01 +00:00
david
6b095f42d2 Use MultiThreadedDebugDLL (/MDd) in place of MultiThreadedDebug (/MTd).
This is to match r8507, which did the analogous thing for the Release
configuration.
http://seclists.org/nmap-dev/2013/q1/120
2013-02-09 20:29:55 +00:00
david
ecb16767e8 Skip privileged pings against localhost on Windows.
Compare to this similar test in Nmap's scan_engine.cc:
  if (scantype != CONNECT_SCAN && Targets[0]->ifType() == devt_loopback) {
    log_write(LOG_STDOUT, "Skipping %s against %s because Windows does not support scanning your own machine (localhost) this way.\n", scantype2str(scantype), Targets[0]->NameIP());
    return;
  }

rndbit made a report--unfortunately we con't fix it, but we can make the
error message clearer.
http://seclists.org/nmap-dev/2013/q1/187
2013-02-09 19:08:05 +00:00
david
9e74850e6e Remove unnecessary or nonexistent files from Nping Windows build.
These were causing Nping to always appear to be out of date when
debugging. Cf. r26250 and r25068.
2013-02-09 18:55:22 +00:00
david
dbdee4792e Keep min/max/avg rtt outputs down to -q. 2013-01-28 22:55:31 +00:00
david
93a245d6e7 Require -v for 'Tx time' and friends in Nping. 2013-01-28 22:55:29 +00:00
david
e1fba2d663 Merge r30416:30527 from /nmap-exp/david/ipv6-ranges.
This is a refactoring of target parsing that stores different types of
target specifications as different classes. The eventual intention is to
allow easy iteration over each specification for the purpose of IPv6
multicast host discovery.
2013-01-22 00:01:08 +00:00
henri
809f1eda68 Merged nsock-logging from nmap-exp/henri/nsock-logging/
Reworked the logging infrastructure to make it more flexible
and consistent.

Updated nmap, nping and ncat accordingly.  Nsock log level can
now be adjusted at runtime by pressing d/D in nmap.
2012-12-15 10:59:30 +00:00
fyodor
a90d961f51 auto-generated files (nroff versions of man pages) 2012-12-10 01:17:51 +00:00
fyodor
d5ae047309 Update my email address in Nping man page too 2012-12-10 01:16:03 +00:00
david
7ebbac2746 Update some mailing list references. 2012-12-06 02:34:28 +00:00
david
ec53dc049a Update with new mailing list addresses. 2012-12-06 02:23:34 +00:00
fyodor
6a42ef47c0 Update the Nmap and Nsock source code headers to note new Nmap dev mailing list email address and a better URL for Nmap license. 2012-12-06 01:21:42 +00:00
david
3dcda9d536 Update Mailman URLs.
http://seclists.org/nmap-dev/2012/q4/389

git ls-files | xargs perl -p -i maillist.pl

maillist.pl:
%MAP = ("nmap-dev" => "dev", "nmap-hackers" => "announce", "nmap-svn" => "svn");
s%http://.*/(mailman/.*)/(nmap-dev|nmap-hackers|nmap-svn)%http://nmap.org/$1/$MAP{$2}%g;
2012-12-05 23:55:29 +00:00
fyodor
e09125e010 Update CHANGELOG to note 6.25 release and also bumped up Nmap SVN version number to avoid confusion and rebuilt files accordingly 2012-11-29 23:40:26 +00:00
fyodor
89d84932de Regenerated the man pages with today's date 2012-11-16 19:09:59 +00:00
fyodor
ea05ae2586 Latest auto-generated files in prep for upcoming 6.20BETA1 release 2012-11-16 00:54:16 +00:00
henri
58418396a8 Make nping and ncat fail (the way nmap does) when invalid nsock engines are supplied. 2012-10-29 10:22:32 +00:00
henri
1e3115dbcb Renamed nmap_fileexistsandisreadable() by file_is_readable(). Former was
hardly readable and is not even a good candidate for longest method
name (http://msdn.microsoft.com/en-us/library/system.windows.media.textformatting.textsource.gettexteffectcharacterindexfromtextsourcecharacterindex.aspx#Y0)
2012-10-20 15:00:10 +00:00
david
422b43be22 Call nsp_setdevice after nsp_new in our Nsock pools.
The exceptions are the calls in ncat/ncat_connect.c and
nping/EchoServer.cc. Ncat doesn't have an option for the interface, and
I think Nping's -e option is only meant to apply to probes, not to the
echo server listener.
2012-10-03 15:43:18 +00:00
david
2f2e826487 Remove OpenSSL directory, moved to /nmap-mswin32-aux. 2012-10-02 00:53:12 +00:00
david
a8c51eeda0 Remove vestiges of WinIP library.
This was an old library removed in r2811 and r2812, of which a few
traces remained.

I don't know the purpose of this in nbase_misc.c:
  if(sd != 501) // Hack related to WinIP Raw Socket support
    ioctlsocket (sd, FIONBIO, &one);
2012-10-01 19:54:17 +00:00
david
a0601febeb Store port numbers in host byte order in number-to-service mapping.
I don't know why these were in network byte order. Every single
interaction had a htons on entrance and ntohs on exit.
2012-09-25 05:24:16 +00:00
david
b2a1ff8e54 Fix broken protocol lookup.
For some reason (probably by imitation of nmap_getservbyport), protocol
numbers, which are byte values 0–255, had htons called on them after
being read from nmap-protocols. On little-endian platforms, this turned
them into integers 0x0100, 0x0200, 0x0300, etc.

protocol_table is supposed to be an array of 256 linked lists, linking
all the protocol names of the same number. Because of the above htons
conversion, all protocols mapped to bucket 0 on lookup instead. Perhaps
in an attempt to work around this broken lookup, all protocols were
inserted into bucket 0 on init; all other buckets were empty. This
worked on little-endian platforms, but on big-endian platforms where
htons is a no-op, all protocol numbers but 0 mapped to an empty linked
list.

Remove all the htons stuff and just look things up by integers. Use the
same mapping on initial insertion and on lookup, so that the buckets are
acutally populated.

This was noticed by hejianet.
http://seclists.org/nmap-dev/2012/q3/1005
2012-09-25 05:08:09 +00:00
luis
f712477644 Fix a bug in the argparser. When users pass 'random' as an IPv6 address, the randomly generated address never gets stored. This was reported and fixed by Mark Atkinson. More info: http://seclists.org/nmap-dev/2012/q3/950 2012-09-20 20:40:38 +00:00
david
7e5c9a8914 Regen with Autoconf 2.68 and aclocal 1.11.6.
for DIR in . nbase ncat nsock/src nping;
	do (echo $DIR; cd $DIR && aclocal --force && autoconf --force);
done
2012-09-19 16:41:35 +00:00
david
380bb92867 Remove broken incldue of nbase/configlocal.m4. 2012-09-19 16:41:30 +00:00
david
ad61d6de85 Remove unused aclocal.m4 files.
These aren't getting regenerated even with "aclocal --force"; I think
it's because there is nothing to put in them. Running "aclocal
--verbose" shows that all the required macros are in acinclude.m4 files:

aclocal: saw macro PCAP_IS_SUITABLE
aclocal: saw macro RECVFROM_ARG6_TYPE
aclocal: saw macro PCAP_IS_SUITABLE
aclocal: saw macro CHECK_IPV6_IPPROTO_RAW
aclocal: saw macro APR_FIND_APR
aclocal: ../acinclude.m4 is already included by configure.ac
2012-09-19 16:41:28 +00:00