diff options
| author | Olli Hauer <ohauer@FreeBSD.org> | 2013-01-06 18:42:38 +0000 |
|---|---|---|
| committer | Olli Hauer <ohauer@FreeBSD.org> | 2013-01-06 18:42:38 +0000 |
| commit | dfddabb5cdd6a0e2edb137b35c609011dc384b55 (patch) | |
| tree | b3544f3ae2c10f532f054641c53a200dc0321f75 /security/nmap/files/patch-traceroute.cc | |
| parent | - Update to 1.496 (diff) | |
- update nmap to version 6.25
- fix build with clang and stdlib=libc++ [1]
Nmap 6.25 [2012-11-29]
o [NSE] Added CPE to smb-os-discovery output.
o [Ncat] Fixed the printing of warning messages for large arguments to
the -i and -w options. [Michal Hlavinka]
o [Ncat] Shut down the write part of connected sockets in listen mode
when stdin hits EOF, just as was already done in connect mode.
[Michal Hlavinka]
o [NSE] Added new fingerprints for http-enum: Sitecore, Moodle, typo3,
SquirrelMail, RoundCube. [Jesper Kückelhahn]
o Added some new checks for failed library calls. [Bill Parker]
PR: 172358
174817
Submitted by: arrowdodger <6yearold@gmail.com> [1]
Anders N. <wicked@baot.se> (general update request)
Diffstat (limited to 'security/nmap/files/patch-traceroute.cc')
| -rw-r--r-- | security/nmap/files/patch-traceroute.cc | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/security/nmap/files/patch-traceroute.cc b/security/nmap/files/patch-traceroute.cc new file mode 100644 index 000000000000..45efde4213ba --- /dev/null +++ b/security/nmap/files/patch-traceroute.cc @@ -0,0 +1,21 @@ +--- ./traceroute.cc.orig 2013-01-06 16:38:44.000000000 +0100 ++++ ./traceroute.cc 2013-01-06 16:38:44.000000000 +0100 +@@ -190,8 +190,6 @@ + /* A global random token used to distinguish this traceroute's probes from + those of other traceroutes possibly running on the same machine. */ + static u16 global_id; +-/* A global cache of known hops, indexed by TTL and address. */ +-static std::map<struct HopIdent, Hop *> hop_cache; + /* A list of timedout hops, which are not kept in hop_cache, so we can delete + all hops on occasion. */ + static std::list<Hop *> timedout_hops; +@@ -204,6 +202,9 @@ + static struct timeval get_now(struct timeval *now = NULL); + static const char *ss_to_string(const struct sockaddr_storage *ss); + ++/* A global cache of known hops, indexed by TTL and address. */ ++static std::map<struct HopIdent, Hop *> hop_cache; ++ + struct Hop { + Hop *parent; + struct sockaddr_storage tag; |