freebsd-ports/security/nmap/files/patch-traceroute.cc
Olli Hauer dfddabb5cd - 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)
2013-01-06 18:42:38 +00:00

21 lines
905 B
C++

--- ./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;