From e307ee691eb495cad28301efb91fb0fab8c41e30 Mon Sep 17 00:00:00 2001 From: jah Date: Thu, 20 May 2010 19:17:43 +0000 Subject: [PATCH] IANA have moved the IPv4 and IPv6 assignments tables and slightly altered their content. --- scripts/whois.nse | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/whois.nse b/scripts/whois.nse index cb6486a2e..9a5d2364c 100644 --- a/scripts/whois.nse +++ b/scripts/whois.nse @@ -1593,24 +1593,24 @@ function script_init( ) nmap.registry.whois.remote_assignments_files = {} nmap.registry.whois.remote_assignments_files.ipv4 = { { - remote_resource = "http://www.iana.org/assignments/ipv4-address-space/", + remote_resource = "http://www.iana.org/assignments/ipv4-address-space/ipv4-address-space.txt", local_resource = "ipv4-address-space", - match_assignment = "^([\.%d]+/%d+)", + match_assignment = "^%s*([\.%d]+/%d+)", match_service = "whois\.(%w+)\.net" } } nmap.registry.whois.remote_assignments_files.ipv6 = { --[[{ - remote_resource = "http://www.iana.org/assignments/ipv6-address-space", + remote_resource = "http://www.iana.org/assignments/ipv6-address-space/ipv6-address-space.txt", local_resource = "ipv6-address-space", match_assignment = "^([:%x]+/%d+)", match_service = "^[:%x]+/%d+%s*(%w+)" },--]] { - remote_resource = "http://www.iana.org/assignments/ipv6-unicast-address-assignments", + remote_resource = "http://www.iana.org/assignments/ipv6-unicast-address-assignments/ipv6-unicast-address-assignments.txt", local_resource = "ipv6-unicast-address-assignments", - match_assignment = "^([:%x]+/%d+)", - match_service = "^[:%x]+/%d+%s*(%w+)" + match_assignment = "^%s*([:%x]+/%d+)", + match_service = "whois\.(%w+)\.net" } }