Land rapid7#5211, parse nmap's tunnel attribute

Author: Brent Cook

lib/msf/core/db_manager/import/nmap.rb

@@ -164,9 +164,7 @@ def import_nmap_xml(args={}, &block)
         data[:host]  = hobj || addr
         data[:info]  = extra if not extra.empty?
         data[:task]  = args[:task]
-        if p["name"] != "unknown"
-          data[:name] = p["name"]
-        end
+        data[:name]  = p['tunnel'] ? "#{p['tunnel']}/#{p['name'] || 'unknown'}" : p['name']
         report_service(data)
       }
       #Parse the scripts output

lib/rex/parser/nmap_nokogiri.rb

@@ -277,6 +277,8 @@ def collect_port_data
           port_hash[:state] = determine_port_state(v)
         when "name"
           port_hash[:name] = v
+        when "tunnel"
+          port_hash[:name] = "#{v}/#{port_hash[:name] || 'unknown'}"
         when "reason"
           port_hash[:reason] = v
         when "product"