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

1172 Commits

Author SHA1 Message Date
kris
16bc72d65f After having read the proper documentation and talking with Fyodor, I realize
I had messed up some SSL services in r7233.  This is reverting the changes
which involved service names in the form of "ssl/*".
2008-04-29 20:56:57 +00:00
fyodor
2e3558fe3f Recognize Helix (aka real media) server on solaris. patch from Matt Selsky 2008-04-29 20:20:22 +00:00
kris
f72667fe44 Syncing the service names between nmap-service-probes and nmap-services
$ svn diff | grep '^+[^+#]' | wc -l
101

nmap-service-probes

backupexecra    => backupexec-remote
bitdefender-ctl => bitdefender-ctrl
bittorent       => bittorrent
chat-ctl        => chat-ctrl
dantzretrospect => retrospect
directconenct   => directconnect
fw1-topo        => fw1-topology
icecreamd       => icecream
issrealsecure   => iss-realsecure
landesk         => landesk-rc
memcached       => memcache
msactivesync    => activesync
oracle-dbsnmp   => dbsnmp
policyd         => policy
pppd            => ppp
rpc             => rpcbind
spamd           => spamassassin
ssl/imap        => imaps
ssl/pop3        => pop3s
ssl/sophos      => sophos/ssl
ssl/vmware-auth => vmware-auth/ssl
telnet-ssl      => telnets
xmailctl        => xmail-ctrl

nmap-services

afpovertcp            => afp
bittorent-tracker     => bittorrent-tracker
boinc-client          => boinc
cfingerd              => finger
dantz                 => retrospect
FW1-mc-fwmodule       => fw1-mc-fwmodule
Fw1-mc-gui            => fw1-mc-gui
FW1-or-bgmp           => fw1-or-bgmp
FW1-secureremote      => fw1-secureremote
gkrellmd              => gkrellm
iss-realsecure-sensor => iss-realsecure
macon-{tcp,udp}       => macon
maybeFW1              => maybe-fw1
maybeveritas          => maybe-veritas
nessusd               => nessus
NetBus                => netbus
opsec_*               => opsec-*
orasrv         [udp]  => oracle
postgres              => postgresql
PowerChute            => powerchute
PowerChutePLUS        => powerchuteplus
tor-controlport       => tor-control
tor-socksport         => tor-socks
tor-transport         => tor-trans
UPnP                  => upnp
VeritasBackupExec     => backupexec
VeritasNetbackup      => netbackup
2008-04-29 17:03:09 +00:00
kris
9a89b403f9 Moving Nmap's config.h[.in] to nmap_config.h[.in] 2008-04-28 17:53:32 +00:00
david
a3860a848a Put universal building flags in macosx/Makefile. This could be made
configurable but right now I'm leaning towards building just universal
binaries.
2008-04-27 04:25:32 +00:00
david
b6f898d573 Put CFLAGS in LUAFLAGS from configure. liblua needs these in order to be built
universal and linked against a universal nmap binary.
2008-04-27 03:53:02 +00:00
david
5f2375d3e7 Don't use CXXFLAGS when building makefile.dep. CXXFLAGS contains "-arch ppc
-arch i386" when building a universal binary on Mac OS X, and you can't
generate dependencies while using those flags. Include directories were
previously moved to CPPFLAGS so the right dependencies are still found.
2008-04-25 23:54:33 +00:00
david
e902f3be2e Accumulate include directories in CPPFLAGS, not CXXFLAGS, in the configure
script. This is to enable us to use just CPPFLAGS where we don't want CXXFLAGS
also. An example of this is when we are generating dependencies with -MM. The
Apple GCC won't let us use this flag when we also give "-arch ppc -arch i386"
in CXXFLAGS, as we would when generating a universal binary.
2008-04-25 23:51:26 +00:00
david
7d2a93ec02 Modify the macosx makefile and add files necessary to build a managed
metapackage (.mpkg) installer. The installer lets you pick if you want to
install Nmap or Zenmap or both. It puts Nmap in /usr/local and the previously
developed Zenmap.app in /Applications.
2008-04-24 22:54:19 +00:00
david
6982bacef5 Change a variable name and space out RateMeter::update to make it easier to understand. 2008-04-24 20:32:47 +00:00
david
5a8e417c0c Rewrite some RateMeter code to avoid an integer overflow reported by Kris. 2008-04-24 18:44:02 +00:00
david
41dc7996b7 Add TIMEVAL_BEFORE and TIMEVAL_AFTER macros to untils.h. 2008-04-24 17:30:46 +00:00
fyodor
06a1d3a8b8 changelog entry for get_random_bytes fix 2008-04-24 03:26:38 +00:00
fyodor
884395da68 potential fix for the Nbase get_random_bytes() bug on Windows 2008-04-24 03:23:01 +00:00
david
f8b3f905c7 Add the printStatusMessage fix to CHANGELOG. 2008-04-23 22:44:39 +00:00
david
1ea0135dc8 Fix printStatusMessage to show the correct elapsed time after 24
minutes. Part of what printStatusMessage does is display the total
elapsed time. The code looked like this:

  log_write(LOG_STDOUT, 
	    "Stats: %d:%02d:%02d elapsed; %d hosts completed (%d up), %d undergoing %s\n", 
	    time/60/24, time/60 % 24, time % 60, o.numhosts_scanned - o.numhosts_scanning, 
	    o.numhosts_up, o.numhosts_scanning, scantype2str(o.current_scantype));

where time is the number of seconds since the program started. However,
this code acts as though each hour has only 24 minutes. That is, after
0:23:59 it would become 1:00:00. This commit changes the 24s to 60s to
make it work right.
2008-04-23 22:42:41 +00:00
david
64b7e255ef Add the segmentation fault fix from zenmap r7176 to the CHANGELOG. 2008-04-22 18:35:12 +00:00
fyodor
a552a52eb1 change all -P0 instances to -PN, rewrite protocol ping (-PO) section a bit 2008-04-19 09:08:59 +00:00
kris
44a4cb90e6 Fixing the assertion failure: "Target.cc:396: void Target::stopTimeOutClock(const timeval*): Assertion 'htn.toclock_running == true' failed." This was caused when a target had scripts in multiple run levels. The problem was the time-out clocks added for --host-timeout support in NSE (r6657--appears to be present since 4.52). Now the time-out clocks are started before each runlevel execution, which (besides not failing assert) makes more sense because the timer would have been counting even when the target had no scripts in the current runlevel. 2008-04-16 17:56:48 +00:00
fyodor
f2938a2d37 o Fixed the NmapArpCache so that it actually works. Previously, Nmap
was always falling back to the system ARP cache. Of course this
  raises the question of whether NmapArpCache is needed in the first
  place. [Daniel Roethlisberger]
2008-04-14 23:55:25 +00:00
kris
10899aba9b Adding a service-probes match for the Motorola WE800G bridge. I used the WR850G line directly below it as a starting point since I have both of these devices on my LAN--they are extraordinarily similar. 2008-04-14 04:25:40 +00:00
david
b1facd9a19 Add the vendor "Apple" to some Mac OS fingerprints. 2008-04-14 02:28:16 +00:00
david
7f910924ec Mention the removal of tcpsequence class in the CHANGELOG, and bump the XML output version to 1.02. 2008-04-11 19:33:49 +00:00
david
c0490af2fd Remove mentions of the TCP sequence class in XML output. 2008-04-11 18:57:32 +00:00
david
c7017806cc Remove some dead gen-1 OS code. 2008-04-11 03:54:44 +00:00
david
071d313e7b Use included versions of ilbdnet, libpcap, libpcre, and liblua when building an RPM. 2008-04-11 03:01:01 +00:00
david
cfb8d87874 Add --with-libdnet=included to the configure --help output and clarify that it
is the default.
2008-04-10 21:00:09 +00:00
david
e025ff4173 Fix the test for liblua (on my computer it requires also linking with libm) and
simplify the Lua check in configure.ac.
2008-04-10 20:44:11 +00:00
kris
841071b121 Simple change: make state_table local in the NSElib shortport.service() 2008-04-10 15:24:49 +00:00
david
7f2e704795 Reduce the maximum number of sockets from max_sd() - 4 to max_sd() - 5. I've
foudn that five files can be open on Mac OS X: stdin, stdout, stderr, /dev/tty,
and /private/var/run/utmpx. This could cause a non-root scan at a high scan
rateto fail with the message "Too many open files". I was able to cause this
with "nmap --min-rate 5000 localhost -p-".

That command still fails with the same error message, but for an entirely
different reason. After a while, one of the connect calls fails with an errno of
22 = EINVAL, Invalid argument. Whatever this means, the socket doesn't get
closed, Nmap just reports a "Strange error from connect". The socket is still
open but Nmap doesn't include it in its count of open sockets, so it's off by
one (or more, conceivably). This allows it to try to open one too many sockets
and bomb with an error message.

Note that running as non-root is important both because it uses a connect scan
and because non-root users have a lower limit on open files.

I've tried just closing the socket when EINVAL is returned, and that fixes the
problem. But that's likely to differ on different systems. Plus I don't know why
EINVAL is returned; maybe it's an OS bug. This only affects localhost scans and
only at high scan rates, so I'm leaving it alone.
2008-04-10 01:51:05 +00:00
david
9c60ac5741 Move the check for a host being timed out or completed to before the check for a minimum rate in HostScanStats::sendOK. We don't want to tell a host that has nothing to send to send something. 2008-04-09 23:09:21 +00:00
david
ed4e96b4f7 Update the --min-rate documentation in the reference guide. 2008-04-09 22:23:57 +00:00
david
5ebce24446 Fix an index term in the reference guide: --g to -g. 2008-04-09 22:11:01 +00:00
fyodor
ee5bd4bb7c reflect some url changes 2008-04-09 09:55:38 +00:00
fyodor
5b113453b3 reflect moved url 2008-04-09 09:55:03 +00:00
kris
a85151470d Whoops, updating docs for r7098 (NSE unfiltered port selection) 2008-04-09 05:20:11 +00:00
fyodor
5551c5a311 o Fixed a bunch of code to avoid compilation warning messages (at
least on some Linux machines) [Andrew J. Bennieston]
2008-04-09 02:11:20 +00:00
kris
fa9bd6be6e Allow unfiltered ports to be selected in NSE 2008-04-09 01:54:14 +00:00
fyodor
f2ebfdecba o Fixed a bug on Win32 problem which caused an infinite loop when Nmap
encountered certain broadcast addresses. [Dudi Itzhakov]
2008-04-09 00:07:20 +00:00
david
6b1465612f Lower-case zenmap for uniformity with RPM packages. 2008-04-08 22:17:12 +00:00
david
4787e2e239 Allow adding an appendage to the image name. 2008-04-08 22:12:39 +00:00
david
3a8f2d00e4 Another known issue: You can't run from a directory with a space in the name. 2008-04-08 21:49:56 +00:00
david
120367b24d Add COPYING to the Zenmap distribution. 2008-04-08 21:12:29 +00:00
david
db7d641f38 Just copy Zenmap.app, don't move it. 2008-04-08 21:10:26 +00:00
david
6da0f26a20 Add a README to the Zenmap distribution. 2008-04-08 21:07:09 +00:00
david
7057e0a03d Fix an error in macosx/Makefile having to do with creating the staging directory. 2008-04-08 20:09:17 +00:00
david
061ded973d Allocate 128 characters for the idle scan ScanProgressMeter title. Previously
it was 32 characters. The "idle scan against " and the \0 terminator take up 19
characters, leaving only 13, which isn't enough to represent all IP addresses,
let alone host names.
2008-04-08 19:59:56 +00:00
david
4d6d9eef1d Add macosx/Makefile, which creates a disk image of the Zenmap bundle. 2008-04-08 19:50:06 +00:00
kris
55eb8199fe fix: nmap.getPortState() -> nmap.get_port_state() in NSE docs 2008-04-08 16:15:10 +00:00
kris
43523f441b Correcting the uptime parsing and reporting in SNMPsysdesr.nse when the uptime is less than about 46 hours. The amount of bytes holding the uptime is variable up to 4, but the script was assuming it always held 4 bytes of uptime. When the real uptime was less than 46 hours, this script was reporting an uptime anywhere from 5 days to 130 days (I think it actually reported 0 days once, but the hours were all messed up). 2008-04-08 14:58:17 +00:00