diff --git a/CHANGELOG b/CHANGELOG index d0cd9a173..d558c8284 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,5 @@ # Nmap Changelog ($Id$); -*-text-*- +o Applied some small internal cleanup patches by Kris Katterjohn. 4.20ALPHA6 diff --git a/HACKING b/HACKING index fa5759d71..7ff61ce60 100644 --- a/HACKING +++ b/HACKING @@ -32,7 +32,7 @@ to track down and patch a problem, bug reports are always welcome. Hackers interested in something more major, such as a new feature, are encouraged to send a mail describing their plans to nmap-dev@insecure.org . This is a good way to solicit feedback on -your proposals. List members or often very willing to help. You +your proposals. List members are often very willing to help. You might want to subscribe to that mailing list as well -- send a blank email to nmap-dev-subscribe@insecure.org . While you are at it, you might also want to subscribe to nmap-hackers via the same mechanism. diff --git a/docs/nmap.1 b/docs/nmap.1 index 2211a9ef7..8e265b5a7 100644 --- a/docs/nmap.1 +++ b/docs/nmap.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "NMAP" "1" "08/31/2006" "" "Nmap Reference Guide" +.TH "NMAP" "1" "09/02/2006" "" "Nmap Reference Guide" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) diff --git a/docs/nmap.usage.txt b/docs/nmap.usage.txt index 6bcd59b72..1a3e68ad9 100644 --- a/docs/nmap.usage.txt +++ b/docs/nmap.usage.txt @@ -1,4 +1,4 @@ -Nmap 4.20ALPHA5 ( http://insecure.org/nmap/ ) +Nmap 4.20ALPHA6 ( http://Insecure.Org ) Usage: nmap [Scan Type(s)] [Options] {target specification} TARGET SPECIFICATION: Can pass hostnames, IP addresses, networks, etc. diff --git a/idle_scan.cc b/idle_scan.cc index 0b880d9db..a2590ec41 100644 --- a/idle_scan.cc +++ b/idle_scan.cc @@ -5,7 +5,7 @@ * completely blind scanning (eg no packets sent to the target from your * * own IP address) and can also be used to penetrate firewalls and scope * * out router ACLs. This is one of the "advanced" scans meant for * - * epxerienced Nmap users. * + * experienced Nmap users. * * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * diff --git a/idle_scan.h b/idle_scan.h index 8a94baab2..9820fe317 100644 --- a/idle_scan.h +++ b/idle_scan.h @@ -5,7 +5,7 @@ * completely blind scanning (eg no packets sent to the target from your * * own IP address) and can also be used to penetrate firewalls and scope * * out router ACLs. This is one of the "advanced" scans meant for * - * epxerienced Nmap users. * + * experienced Nmap users. * * * ***********************IMPORTANT NMAP LICENSE TERMS************************ * * diff --git a/osscan.cc b/osscan.cc index bb9d2503e..5e4022895 100644 --- a/osscan.cc +++ b/osscan.cc @@ -959,13 +959,7 @@ static FingerPrint *get_fingerprint(Target *target, struct seq_info *si) { /* printf("The sequence sum is %e\n", seq_inc_sum);*/ seq_inc_sum /= (si->responses - 1); - /* Some versions of Linux libc seem to have broken pow ... so we - avoid it */ -#ifdef LINUX si->index = (unsigned int) (0.5 + sqrt(seq_inc_sum)); -#else - si->index = (unsigned int) (0.5 + pow(seq_inc_sum, 0.5)); -#endif /* printf("The sequence index is %d\n", si->index);*/ if (si->index < 75) { diff --git a/osscan2.cc b/osscan2.cc index e26669f15..6ef464d90 100644 --- a/osscan2.cc +++ b/osscan2.cc @@ -1735,11 +1735,7 @@ void HostOsScan::makeTSeqFP(HostOsScanStats *hss) { seq_stddev /= hss->si.responses - 2; /* Next we need to take the square root of this value */ -#ifdef LINUX seq_stddev = (unsigned int) (0.5 + sqrt(seq_stddev)); -#else - seq_stddev = (unsigned int) (0.5 + pow(seq_stddev, 0.5)); -#endif /* Finally we take a binary logarithm, multiply by 8, and round to get the final result */ diff --git a/protocols.cc b/protocols.cc index 4859dc91b..c78e2454d 100644 --- a/protocols.cc +++ b/protocols.cc @@ -195,7 +195,7 @@ struct protoent *nmap_getprotbynum(int num) { } -/* Be default we do all prots 0-255. */ +/* By default we do all prots 0-255. */ struct scan_lists *getdefaultprots(void) { int protindex = 0; struct scan_lists *scanlist; diff --git a/service_scan.cc b/service_scan.cc index 112f3f6bc..48b4a61f5 100644 --- a/service_scan.cc +++ b/service_scan.cc @@ -983,7 +983,7 @@ void ServiceProbe::setPortVector(vector *portv, const char *portstr, // SERVICE_TUNNEL_SSL. Otherwise use SERVICE_TUNNEL_NONE. The line // number is requested because this function will bail with an error // (giving the line number) if it fails to parse the string. Ports - // are a comma seperated list of ports and ranges + // are a comma separated list of ports and ranges // (e.g. 53,80,6000-6010). void ServiceProbe::setProbablePorts(enum service_tunnel_type tunnel, const char *portstr, int lineno) { @@ -1053,7 +1053,7 @@ void ServiceProbe::addMatch(const char *match, int lineno) { } // Parses the given nmap-service-probes file into the AP class -/* Must NOT be static because I have externam maintenance tools (servicematch) +/* Must NOT be static because I have external maintenance tools (servicematch) which use this */ void parse_nmap_service_probe_file(AllProbes *AP, char *filename) { ServiceProbe *newProbe; diff --git a/service_scan.h b/service_scan.h index de85c7e79..08949d558 100644 --- a/service_scan.h +++ b/service_scan.h @@ -253,7 +253,7 @@ class ServiceProbe { // SERVICE_TUNNEL_SSL. Otherwise use SERVICE_TUNNEL_NONE. The line // number is requested because this function will bail with an error // (giving the line number) if it fails to parse the string. Ports - // are a comma seperated list of ports and ranges + // are a comma separated list of ports and ranges // (e.g. 53,80,6000-6010). void setProbablePorts(enum service_tunnel_type tunnel, const char *portstr, int lineno); diff --git a/tcpip.h b/tcpip.h index 95c1b5ae2..a83070d32 100644 --- a/tcpip.h +++ b/tcpip.h @@ -505,7 +505,7 @@ bool route_dst(const struct sockaddr_storage *const dst, struct route_nfo *rnfo) be set to 1 if dst is directly connected on the ifentry network and 0 if it requires routing. If nexthop_ip is not NULL, and routing is required, the next hop is filled into nexthop_ip. This function - returns false if no apporpiate interface or route was found and + returns false if no appropiate interface or route was found and true if it succeeds. */ bool routethrough(const struct sockaddr_storage * const dest, struct intf_entry *ifentry, diff --git a/utils.cc b/utils.cc index da3a98855..369a670e2 100644 --- a/utils.cc +++ b/utils.cc @@ -195,7 +195,7 @@ char *strerror(int errnum) { } #endif -/* Like the perl equivialent -- It removes the terminating newline from string +/* Like the perl equivalent -- It removes the terminating newline from string IF one exists. It then returns the POSSIBLY MODIFIED string */ char *chomp(char *string) { int len = strlen(string); @@ -388,7 +388,7 @@ unsigned int gcd_n_uint(int nvals, unsigned int *val) } /* This function takes a command and the address of an uninitialized - char ** . It parses the command (by seperating out whitespace) + char ** . It parses the command (by separating out whitespace) into an argv[] style char **, which it sets the argv parameter to. The function returns the number of items filled up in the array (argc), or -1 in the case of an error. This function allocates