From 3741b5a4fa5c1a92ed5959a57d815acc55ab06d7 Mon Sep 17 00:00:00 2001 From: david Date: Sat, 31 Mar 2012 03:21:27 +0000 Subject: [PATCH] Show the "service" XML element whenever a tunnel is detected. Previously this would be omitted if the service was not otherwise discovered, and the port it was on was not in nmap-services. (There was not problem if the port was present in nmap-services with a name of "unknown".) --- CHANGELOG | 4 ++++ output.cc | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 3c7fc510c..edd92e722 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,9 @@ # Nmap Changelog ($Id$); -*-text-*- +o Changed XML output to show the "service" element whenever a tunnel + is discovered for a port, even if the service behind it was unknown. + [Matt Foster] + o [Zenmap] Fixed a crash that would happen in the profile editor when the script.db file doesn't exist. The bug was reported by Daniel Miller. diff --git a/output.cc b/output.cc index a31000776..91ec98435 100644 --- a/output.cc +++ b/output.cc @@ -778,7 +778,7 @@ void printportoutput(Target *currenths, PortList *plist) { xml_attribute("reason_ip", "%s", inet_ntop_ez(¤t->reason.ip_addr, sizeof(current->reason.ip_addr))); xml_close_empty_tag(); - if (sd.name || sd.service_fp) + if (sd.name || sd.service_fp || sd.service_tunnel != SERVICE_TUNNEL_NONE) print_xml_service(&sd); rowno++;