summaryrefslogtreecommitdiff
path: root/security/nmap/files/patch-traceroute.cc
diff options
context:
space:
mode:
authorOlli Hauer <ohauer@FreeBSD.org>2014-04-18 08:05:14 +0000
committerOlli Hauer <ohauer@FreeBSD.org>2014-04-18 08:05:14 +0000
commitb21a4b65291f575e51ac54e329690fc0319724d6 (patch)
treeac9fc8a976accf2909e46187ad8b4c8d5e3460b7 /security/nmap/files/patch-traceroute.cc
parent- Staging (diff)
Nmap 6.46 [2014-04-18]
o [NSE] Made numerous improvements to ssl-heartbleed to provide more reliable detection of the vulnerability. o [Zenmap] Fixed a bug which caused this crash message: IOError: [Errno socket error] [Errno 10060] A connection attempt failed because the connected party did not properly respond after a period of time, or established connection failed because connected host has failed to respond The bug was caused by us adding a DOCTYPE definition to Nmap's XML output which caused Python's XML parser to try and fetch the DTD every time it parses an XML file. We now override that DTD-fetching behavior. [Daniel Miller] o [NSE] Fix some bugs which could cause snmp-ios-config and snmp-sysdescr scripts to crash (http://seclists.org/nmap-dev/2014/q2/120) [Patrik Karlsson] o [NSE] Improved performance of citrixlua library when handling large XML responses containing application lists. [Tom Sellers]
Diffstat (limited to 'security/nmap/files/patch-traceroute.cc')
-rw-r--r--security/nmap/files/patch-traceroute.cc21
1 files changed, 0 insertions, 21 deletions
diff --git a/security/nmap/files/patch-traceroute.cc b/security/nmap/files/patch-traceroute.cc
deleted file mode 100644
index 45efde4213ba..000000000000
--- a/security/nmap/files/patch-traceroute.cc
+++ /dev/null
@@ -1,21 +0,0 @@
---- ./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;