From 2dcb08a590b776ae0c38c804561d3daf829d1259 Mon Sep 17 00:00:00 2001 From: batrick Date: Wed, 6 Jun 2012 21:36:02 +0000 Subject: [PATCH] Fix location of try/catch. The pcap/dnet variables were not in scope. --- scripts/targets-ipv6-multicast-echo.nse | 12 ++++++------ scripts/targets-ipv6-multicast-invalid-dst.nse | 12 ++++++------ scripts/targets-ipv6-multicast-slaac.nse | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/scripts/targets-ipv6-multicast-echo.nse b/scripts/targets-ipv6-multicast-echo.nse index 93c2880a2..35e3c244e 100644 --- a/scripts/targets-ipv6-multicast-echo.nse +++ b/scripts/targets-ipv6-multicast-echo.nse @@ -35,12 +35,6 @@ prerule = function() return nmap.is_privileged() end -catch = function() - dnet:ethernet_close() - pcap:pcap_close() -end -try = nmap.new_try(catch) - local function get_interfaces() local interface_name = stdnse.get_script_args(SCRIPT_NAME .. ".interface") or nmap.get_interface() @@ -92,6 +86,12 @@ local function single_interface_broadcast(if_nfo, results) local dnet = nmap.new_dnet() local pcap = nmap.new_socket() + local function catch () + dnet:ethernet_close() + pcap:pcap_close() + end + local try = nmap.new_try(catch) + try(dnet:ethernet_open(if_nfo.device)) pcap:pcap_open(if_nfo.device, 128, false, "icmp6 and ip6[6:1] = 58 and ip6[40:1] = 129") diff --git a/scripts/targets-ipv6-multicast-invalid-dst.nse b/scripts/targets-ipv6-multicast-invalid-dst.nse index e240db06d..d59de7e49 100644 --- a/scripts/targets-ipv6-multicast-invalid-dst.nse +++ b/scripts/targets-ipv6-multicast-invalid-dst.nse @@ -37,12 +37,6 @@ prerule = function() return nmap.is_privileged() end -catch = function() - dnet:ethernet_close() - pcap:pcap_close() -end -try = nmap.new_try(catch) - --- Build an IPv6 invalid extension header. -- @param nxt_hdr integer that stands for next header's type local function build_invalid_extension_header(nxt_hdr) @@ -110,6 +104,12 @@ local function single_interface_broadcast(if_nfo, results) local dnet = nmap.new_dnet() local pcap = nmap.new_socket() + local function catch () + dnet:ethernet_close() + pcap:pcap_close() + end + local try = nmap.new_try(catch) + try(dnet:ethernet_open(if_nfo.device)) pcap:pcap_open(if_nfo.device, 128, false, "icmp6 and ip6[6:1] = 58 and ip6[40:1] = 4") diff --git a/scripts/targets-ipv6-multicast-slaac.nse b/scripts/targets-ipv6-multicast-slaac.nse index b71260b57..0b0a660ed 100644 --- a/scripts/targets-ipv6-multicast-slaac.nse +++ b/scripts/targets-ipv6-multicast-slaac.nse @@ -51,12 +51,6 @@ prerule = function() return nmap.is_privileged() end -catch = function() - dnet:ethernet_close() - pcap:pcap_close() -end -try = nmap.new_try(catch) - local function get_identifier(ip6_addr) return string.sub(ip6_addr, 9, 16) end @@ -152,6 +146,12 @@ local function single_interface_broadcast(if_nfo, results) local dnet = nmap.new_dnet() local pcap = nmap.new_socket() + local function catch () + dnet:ethernet_close() + pcap:pcap_close() + end + local try = nmap.new_try(catch) + try(dnet:ethernet_open(if_nfo.device)) pcap:pcap_open(if_nfo.device, 128, true, "src ::0/128 and dst net ff02::1:0:0/96 and icmp6 and ip6[6:1] = 58 and ip6[40:1] = 135")