PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-06 12:41:29 +00:00
Code Issues Projects Releases Wiki Activity

Make osclasses a substructure of osmatch.

Browse Source
This commit is contained in:
david
2012-05-05 18:02:41 +00:00
parent 56b7063aa9
commit cac71422e8
7 changed files with 68 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zenmap/zenmapCore/NetworkInventory.py
View File

@@ -257,8 +257,7 @@ class NetworkInventory(object):
# OS detection fields
# Replace old_host's OS detection fields with new_host's if old_host has no
# OS detection info or new_host's info is newer.
if len(new_host.osclasses) > 0 and (len(old_host.osclasses) == 0 or old_date < new_date):
old_host.osclasses = new_host.osclasses
if len(new_host.osmatches) > 0 and (len(old_host.osmatches) == 0 or old_date < new_date):
old_host.osmatches = new_host.osmatches
old_host.ports_used = new_host.ports_used
@@ -633,7 +632,6 @@ if __name__ == "__main__":
#for port in host.ports:
# print " %s: %s" % (port["portid"], port["port_state"])
#print " OS matches: %s" % host.osmatches
#print " OS classes: %s" % host.osclasses
#print " Ports used: %s" % host.ports_used
#print " Trace: %s" % host.trace
#if "hops" in host.trace: