Fixes issue #30 now parses mac address

Author: nmmapper

nmap3/nmap3.py

@@ -511,6 +511,6 @@ class NmapScripts(Nmap):
     parser.add_argument('-d', '--d', help='Help', required=True)
     args = parser.parse_args()
 
-    nmap = Nmap()
-    result = nmap.nmap_version_detection(args.d)
+    nmap = NmapHostDiscovery()
+    result = nmap.nmap_no_portscan(args.d)
     print(json.dumps(result, indent=4, sort_keys=True))

nmap3/nmapparser.py

@@ -238,15 +238,27 @@ def parse_noportscan(self, xmlroot):
         # Find all hosts 
         all_hosts = xmlroot.findall("host")
         for host in all_hosts:
-            
             host_record = {}
+            address = []
+            hostnames = []
+            
             if host.find("status") is not None:
                 for key in host.find("status").attrib:
                     host_record[key]=host.find("status").attrib.get(key)
 
                 for key in host.find("address").attrib:
                     host_record[key]=host.find("address").attrib.get(key)
-                    
+                
+                for key in host.findall("address"):
+                    address.append(key.attrib)
+                host_record["addresses"]=address
+                
+                for hostname in host.find("hostnames"):
+                    for hosts in hostname.findall("hostname"):
+                        hostnames.append(hosts.attrib)
+                        
+                host_record["hostnames"]=hostnames
+                
             hosts_list.append(host_record)
 
         runstats = xmlroot.find("runstats")