david
95fa8efd19
Don't include sys/sockio.h from tcpip.cc; it's already in tcpip.h.
2007-11-15 17:29:22 +00:00
david
21ee718329
Check for sys/sockio.h in configure and include sys/sockio.h in tcpip.cc. This is where SIOCGIFCONF is on Solaris 9.
2007-11-11 19:34:19 +00:00
kris
4cd9fa160d
just fixing some spelling errors in comments
2007-11-03 03:54:11 +00:00
kris
1b1fcc753b
Adding a new ping type: IPProto Ping. It's used with '-PO'. I've changed references to -P0 (zero) to -PN throughout the source code and refguide.xml
2007-10-28 00:05:03 +00:00
kris
3195434fed
a minor change to that last rev: the setsockopt() calls in Nmap cast the option values to (const char *)
2007-10-14 15:12:49 +00:00
kris
dfc9eba4db
enable --ttl support for connect() scans
2007-10-14 14:37:56 +00:00
david
eddc2b0839
Merge r5733:5850 from /nmap-exp/david/nmap-massping-migration.
...
Remove special-purpose log functions for graphing congestion control and other t
hings. There's enough information provided by -d3.
Update the congestion control graph program and add a program for graphing probe
s and drops.
Increase the initial ccthresh from 50 to 75.
Change how much the congestion threshold drops on packet drops.
Print group timing stats with -d2 and individual host timing stats with -d3.
Bump up the cc-graph.sh y axis limit to 80.
Put graphs in the same directory as their log file.
Go ahead and adjust timing for ICMP destination unreachables. I'm going to commi
t and experimental change to the congestion control that doesn't rely on this an
y more.
Scale group congestion control increments by the inverse of the packet
receipt ratio. This gives great performance without ignoring ICMP
destintation unreachable drops. This may be the breakthrough we've been
looking for.
I'll probably send a message about this later today. For information and
graphs right now, see
http://www.bamsoftware.com/wiki/Nmap/ResponseRateScaledCongestionControl .
Sorry it's only in my nmap-massping-migration branch for now, but please
give it a try.
Only -d2 is now needed for cc-graph.sh.
Put a cap of 50 on the cwnd scaling factor.
Fix up the order of things in the packet_ratio debugging output.
Move the packet_ratio debugging output to printAnyStats and rearrange the order
in which things are printed.
Put a header with the scan args at the top of the probes-graph.sh data files.
Add a function pcap_print_stats that shows the number of received and dropped pa
ckets for a descriptor.
Call pcap_print_stats after a run of ultra_scan.
Increase the congestion window less aggressively than before with -T4 and -T5 (s
till more aggressivly than with lesser timing values).
2007-09-18 06:34:33 +00:00
fyodor
4dc8618965
capitalization changes
2007-09-03 02:55:01 +00:00
fyodor
fc265b6d11
hopefully fix problem with vmware fusion - see http://seclists.org/nmap-dev/2007/q3/0254.html
2007-08-29 08:05:30 +00:00
david
302547375b
Look out, world, here comes the Nmap massping migration!
...
This is the merging of the code that was previously in
/nmap-exp/david/nmap-massping-migration. These are all the big changes
that get rid of massping in favor of doing host discovery using
ultra_scan.
For now, there is a toggle that turns these new changes off. Undefine
NEW_MASSPING in targets.cc to go back to the old code. All of that will
be deleted eventually.
There are likely a few more changes that will be made to this system in
the near future. Those will be made in
/nmap-exp/david/nmap-massping-migration and merged back.
Don't release this just yet, because I'm going to make a few more
commits real quick to remove some debugging stuff.
(Note to self: this merge back was from r5693 in
/nmap-exp/david/nmap-massping-migration.)
2007-08-27 23:58:23 +00:00
kris
d073a19105
Change reason.cc/h to portreasons.cc/h. This is because of a reason.h on Windows which causes compilation problems. A workaround was employed, but this is incase it pops up again. I also changed the recent CHANGELOG entry mentioning reason.h so there's no confusion
2007-08-15 19:26:26 +00:00
kris
0b50c16b38
Adding Snprintf() and Vsnprintf() to nbase/nbase_str.c. This is because of Windows' stupid implementation where it doesn't write a NULL byte at the end of the buffer if the result is truncated. I would've just #defined snprintf and vsnprintf to some wrapper function for Windows, but this doesn't work as libdnet and libpcap (and libpcap includes under mswin32) define snprintf to _snprintf and vsnprintf to _vsnprintf like we do, and through the many defines they end up being available in the Nmap sources. Vsnprintf() uses vsnprintf() (and writes a NULL byte at the end if truncated), and Snprintf uses Vsnprintf().
2007-08-14 06:46:54 +00:00
fyodor
03b4dc0ec5
merge soc07 r5233 - Changed perror()s with hardcoded function names to Nmap's gh_perror() and __func__, changed perror()s followed by exit()s to Nmap's pfatal(), and removed newlines from perror()s because it breaks the line after that and before the colon and error string, which doesn't make sense
2007-08-11 05:57:54 +00:00
fyodor
6c06f51bd7
merge soc07 r5100 - Changing fprintf(stderr, )'s to error()'s (or fatal() if followed by and exit()). Besides providing consistency, this also allows more errors to actually be logged with --log-errors.
2007-08-11 05:16:56 +00:00
fyodor
8dc9673928
merge soc07 r5085 - Changing bare printf()s to log_write(LOG_PLAIN,)s because these were always printed even when things like XML and greppable output were sent to stdout (e.g. -oX -). This also adds o.scriptTrace() to make --script-trace behave more like --packet-trace and --version-trace. Nsock tracing was done unconditionally in NSE, and that has been changed to only be done when o.scriptTrace() is true.
2007-08-11 05:13:16 +00:00
fyodor
0c123a1056
merge soc07 r4918 - changing a couple more hardcoded function names
2007-08-11 04:21:22 +00:00
fyodor
8d74bbcd8a
merge soc07 r4871:4884 and r4888 - renaming __FUNCTION__ to __func__ and changing hardcoded func names to __func__
2007-08-11 04:06:09 +00:00
fyodor
e81becd90f
merge soc07 r4868 - Just fixing a typo. wsacle -> wscale in tcppacketoptinfo()
2007-08-11 04:01:31 +00:00
fyodor
8b9a340fc4
merge soc07 r4829 - Added winpcap device names to the --iflist table
2007-08-11 03:44:40 +00:00
fyodor
58522c59f6
merge soc07 r4822 - Reduce the number of build dependencies.
2007-08-11 03:35:46 +00:00
fyodor
58f46706e5
merge soc07 r4751 - UDP traceroute hop distance and port state reason feature
2007-08-11 03:15:24 +00:00
doug
510eba5dd2
Reverting this fix on Fyodor's request
2007-07-24 23:07:20 +00:00
doug
bd7c94c7e6
Hopefully fixes the interrupted system call fatal
...
behaviour unearthed by the mass_ping -> ultra_scan
migration.
2007-07-24 22:21:44 +00:00
kris
aff1d727ef
Merging in r4769:4773 from /nmap-exp/soc07/nmap
2007-05-23 22:51:25 +00:00
fyodor
e882edf484
added Eddie Bell's traceroute patch, with only minor changes
2007-03-13 08:02:19 +00:00
kris
40143f4d37
Missed another assert() we can remove because of r4515
2007-02-28 14:12:50 +00:00
kris
f221d54908
Change a little over 10 malloc()s and realloc()s to their safe_* equivalents (which let's us get rid a two checks on the returned mem elsewhere in the code).
2007-02-25 15:43:56 +00:00
kris
692f904579
Print IP addresses in ippackethdrinfo() in tcpip.cc when there's an unknown protocol (like with -sO)
2007-02-04 02:12:59 +00:00
kris
176046784b
Use ipid parameter for build_icmp_raw() and build_igmp_raw() instead of get_random_u16() when calling build_ip_raw().
2007-01-30 00:35:44 +00:00
kris
69754e8311
Use dnet headers for TCP and UDP. This allows us to remove netinet tcp.h and udp.h references, the udphdr_bsd stuff, and the TH_ECE/TH_CWR #defines in tcpip.h. That was easy, but we (Fyodor and I) came to the conclusion that IP and ICMP aren't worth the hassle to switch (I was testing TCP, UDP and IP in my branch). The struct icmp_hdr in dnet isn't setup anything like what we're using now. Then, struct ip_hdr uses ip_addr_t (typedef'd to uint32_t in that ip.h) instead of struct in_addr for the IP addresses, and that would require some dnet modifying to work right. We might be able to come up with some elegant solution for IP, but probably not for ICMP. For now, they're still left up to netinet (or tcpip.h).
2007-01-23 05:29:59 +00:00
doug
a869a1df8f
UDP --badsum fix
2007-01-23 03:17:32 +00:00
kris
928750ce05
Fix some typos, one in output. IPPROTO_TCP -> IPPROTO_IP (2), extre -> extra, /etc/protocol -> /etc/protocols
2007-01-19 01:39:03 +00:00
kris
9ff574d50e
Merging my IGMP -sO patch. This adds build_igmp_raw() to easily build IGMP packets and uses it for -sO. Systems respond more when these packets are sent with an actual IGMP header. The RFC says they MUST verify the checksum, so that's most likely why I always got open|filtered instead of open. Since the different IGMP types all seem to have the checksum in the same place in the packet, it should at least tell us if it's supported or not even if the rest of the header is bogus (because the rest of the header has changed a little bit between the versions).
2007-01-17 17:40:16 +00:00
fyodor
70bdc77289
some bugfixes from Eddie Bell related to build_icmp_raw ttl argument and nmap_getprotobyname calling nmap_protocols_init
2006-12-31 08:52:07 +00:00
fyodor
13d439efe2
Applied pcap-select cleanup patch from Kris
2006-12-21 08:39:03 +00:00
fyodor
8e2de50dd3
Kris Katterjohn patches for code clean up, iana ip assignment update, fixe fileexistsandisreadable
2006-12-12 09:56:15 +00:00
fyodor
1308928e29
Nmap 4.20, woohoo
2006-12-08 03:01:08 +00:00
fyodor
9c686d4a12
about to do more os fingerprint integration
2006-12-03 00:34:19 +00:00
fyodor
49a4a74d70
I hope these changes fix windows compilation
2006-11-20 07:56:38 +00:00
fyodor
508e674ce4
fix Mac OS X pcap problem, I hope
2006-11-19 09:35:26 +00:00
fyodor
9a1fece75d
fix a couple bugs found by Jochen (voss at seehuhn.de
2006-11-06 02:14:35 +00:00
fyodor
979e57ed9d
Preparing to release ALPHA10
2006-10-24 02:14:20 +00:00
fyodor
c608b64dfd
Integrate the latest fingerprint submissions
2006-10-14 06:02:43 +00:00
fyodor
4d44853d78
a bunch of small patches by Kris Katterjohn
2006-09-16 02:25:20 +00:00
fyodor
9cbae88f44
Add -ip-options support
2006-08-29 03:26:00 +00:00
fyodor
b28d51167c
Minor source code header improvements
2006-08-25 01:47:49 +00:00
fyodor
a403864351
Replace file headers, mostly to update copyright to 2006
2006-08-24 04:43:50 +00:00
fyodor
a15e1e0f05
OS detection changes to improve timing/reliability, print fprint in more cases, etc. Also some tiny changes from Kris Katterjohn
2006-08-24 04:06:08 +00:00
fyodor
29b1d58389
Some minor misc. fixes from Marek Majkowski and Kris Katterjohn
2006-08-22 21:31:37 +00:00
fyodor
1da53c8366
Added Zhao changes which cause packet-trace to print tcp ops, slight changes to new os detection, and update fingerfix.pl for recent os detection changes
2006-08-20 18:17:03 +00:00
