diff --git a/nselib/data/packetdecoders.lua b/nselib/data/packetdecoders.lua
index 9f875e845..cf56d76cd 100644
--- a/nselib/data/packetdecoders.lua
+++ b/nselib/data/packetdecoders.lua
@@ -70,7 +70,7 @@ Decoders = {
 			new = function(self)
 				local o = { dups = {} }
 				setmetatable(o, self)
-		        self.__index = self
+				self.__index = self
 				return o
 			end,
 			
@@ -113,7 +113,7 @@ Decoders = {
 			new = function(self)
 				local o = { dups = {} }
 				setmetatable(o, self)
-		        self.__index = self
+				self.__index = self
 				return o
 			end,
 
@@ -193,511 +193,502 @@ Decoders = {
 			new = function(self)
 				local o = { dups = {} }
 				setmetatable(o, self)
-						self.__index = self
+				self.__index = self
 				return o
 			end,
 
 			process = function(self, layer3)
-		  
 				local p = packet.Packet:new( layer3, #layer3 ) 
 				-- EIGRP is IP protocol 88 (0x58), so verify this
 				if ( p.ip_p ~= 88 ) then return end
-				
-				local data = layer3:sub(p.ip_data_offset + 1)
 
+				local data = layer3:sub(p.ip_data_offset + 1)
 				local eigrp = require("eigrp")
 				local route_type, proto_name
 				-- Extract the EIGRP header
 				local response = eigrp.EIGRP.parse(data)
 
 				if response then
-				    -- Iterate over tlv tables
-				    for _, tlv in pairs(response.tlvs) do
-					if eigrp.EIGRP.isRoutingTLV(tlv.type) then
-
-					    if ( not(self.results) ) then
-						self.results = tab.new(7)
-						tab.addrow(self.results, 'Sender IP', 'AS#', 'Route Type', 'Destination', 'Next hop', 'Ext Protocol', 'Orig Router ID')
-					    end
-					    if tlv.type == 0x102 then
-						route_type = "Internal"
-					    elseif tlv.type == 0x103 then
-						route_type = "External"
-						for name, value in pairs(eigrp.EXT_PROTO) do
-						    if value == tlv.eproto then
-							proto_name = name
-							break
-						    end 
+					-- Iterate over tlv tables
+					for _, tlv in pairs(response.tlvs) do
+						if eigrp.EIGRP.isRoutingTLV(tlv.type) then
+							if ( not(self.results) ) then
+								self.results = tab.new(7)
+								tab.addrow(self.results, 'Sender IP', 'AS#', 'Route Type', 'Destination', 'Next hop', 'Ext Protocol', 'Orig Router ID')
+							end
+							if tlv.type == 0x102 then
+								route_type = "Internal"
+							elseif tlv.type == 0x103 then
+								route_type = "External"
+								for name, value in pairs(eigrp.EXT_PROTO) do
+									if value == tlv.eproto then
+										proto_name = name
+										break
+									end 
+								end
+							end 
+							if ( not(self.dups[("%s:%s:s:%s"):format(p.ip_src, response.as, tlv.type, tlv.dst)]) ) then
+								if ( target.ALLOW_NEW_TARGETS ) then target.add(p.ip_src) end
+									self.dups[("%s:%s:%s:%s"):format(p.ip_src, response.as, tlv.type, tlv.dst)] = true
+									tab.addrow( self.results, p.ip_src, response.as, route_type, tlv.dst, tlv.nexth, proto_name or 'X', tlv.orouterid or 'X')
+								end
+							end
 						end
-					    end 
-					    if ( not(self.dups[("%s:%s:s:%s"):format(p.ip_src, response.as, tlv.type, tlv.dst)]) ) then
-						if ( target.ALLOW_NEW_TARGETS ) then target.add(p.ip_src) end
-						self.dups[("%s:%s:%s:%s"):format(p.ip_src, response.as, tlv.type, tlv.dst)] = true
-						tab.addrow( self.results, p.ip_src, response.as, route_type, tlv.dst, tlv.nexth, proto_name or 'X', tlv.orouterid or 'X')
-					    end
 					end
-				    end
-				end
-			    end,
-			    getResults = function(self)	return { name = "EIGRP Update", (self.results and tab.dump(self.results) or "")  } end,
+				end,
+				
+				getResults = function(self)	return { name = "EIGRP Update", (self.results and tab.dump(self.results) or "")  } end,
 			},
 
 			['0205....0000'] = {
 
-			    new = function(self)
-				local o = { dups = {} }
-				setmetatable(o, self)
-				self.__index = self
-				return o
-			    end,
+				new = function(self)
+					local o = { dups = {} }
+					setmetatable(o, self)
+					self.__index = self
+					return o
+				end,
 
-			    process = function(self, layer3)
+				process = function(self, layer3)
 
-				local p = packet.Packet:new( layer3, #layer3 ) 
-				-- EIGRP is IP protocol 88 (0x58), so verify this
-				if ( p.ip_p ~= 88 ) then return end
+					local p = packet.Packet:new( layer3, #layer3 ) 
+					-- EIGRP is IP protocol 88 (0x58), so verify this
+					if ( p.ip_p ~= 88 ) then return end
 
-				local data = layer3:sub(p.ip_data_offset + 1)			
+					local data = layer3:sub(p.ip_data_offset + 1)			
+					local eigrp = require("eigrp")
+					-- Extract the EIGRP header
+					local response = eigrp.EIGRP.parse(data)
+					-- See if Software version TLV is included
+					local swvertlv
+					for num, tlv in pairs(response.tlvs) do
+						if tlv.type == eigrp.TLV.SWVER then
+							swvertlv = num
+						end
+					end
 
-				local eigrp = require("eigrp")
-				-- Extract the EIGRP header
-				local response = eigrp.EIGRP.parse(data)
-				-- See if Software version TLV is included
-				local swvertlv
-				for num, tlv in pairs(response.tlvs) do
-				    if tlv.type == eigrp.TLV.SWVER then
-					swvertlv = num
-				    end
-				end
-				if swvertlv then
-				    if ( not(self.results) ) then
-					self.results = tab.new(5)
-					tab.addrow(self.results, 'Sender IP', 'AS number', 'EIGRP version', 'IOS version')
-				    end
+					if swvertlv then
+						if ( not(self.results) ) then
+							self.results = tab.new(5)
+							tab.addrow(self.results, 'Sender IP', 'AS number', 'EIGRP version', 'IOS version')
+						end
 
-				    if ( not(self.dups[("%s:%s"):format(p.ip_src,response.as)]) ) then
-					if ( target.ALLOW_NEW_TARGETS ) then target.add(p.ip_src) end
-					self.dups[("%s:%s"):format(p.ip_src,response.as)] = true
-					tab.addrow( self.results, p.ip_src, response.as, response.tlvs[swvertlv].majv .. '.' .. response.tlvs[swvertlv].minv, response.tlvs[swvertlv].majtlv .. '.' .. response.tlvs[swvertlv].mintlv)
-				    end
-				end	
-			    end,
+					if ( not(self.dups[("%s:%s"):format(p.ip_src,response.as)]) ) then
+						if ( target.ALLOW_NEW_TARGETS ) then target.add(p.ip_src) end
+							self.dups[("%s:%s"):format(p.ip_src,response.as)] = true
+							tab.addrow( self.results, p.ip_src, response.as, response.tlvs[swvertlv].majv .. '.' .. response.tlvs[swvertlv].minv, response.tlvs[swvertlv].majtlv .. '.' .. response.tlvs[swvertlv].mintlv)
+						end
+					end	
+				end,
 
-			    getResults = function(self)	return { name = "EIGRP Hello", (self.results and tab.dump(self.results) or "")  } end,
+				getResults = function(self)	return { name = "EIGRP Hello", (self.results and tab.dump(self.results) or "")  } end,
 			},
 
 			-- OSPF
 			['02010'] = { -- OSPFv2 Hello packet
 
-			new = function(self)
-			    local o = { dups = {} }
-			    setmetatable(o, self)
-			    self.__index = self
-			    return o
-			end,
+				new = function(self)
+					local o = { dups = {} }
+					setmetatable(o, self)
+					self.__index = self
+					return o
+				end,
 
-			process = function(self, layer3)
-			    local p = packet.Packet:new( layer3, #layer3 ) 
-			    -- IP Protocol is 89 for OSPF
-			    if p.ip_p ~= 89 then return end
+				process = function(self, layer3)
+					local p = packet.Packet:new( layer3, #layer3 ) 
+						-- IP Protocol is 89 for OSPF
+						if p.ip_p ~= 89 then return end
 
-			    local ospf = require("ospf")
+						local ospf = require("ospf")
+						local data = layer3:sub(p.ip_data_offset + 1)			
+						local header = ospf.OSPF.Header.parse(data)
+						if header then
+							if not(self.results) then
+								self.results = tab.new(5)
+								tab.addrow(self.results, 'Source IP', 'Router ID', 'Area ID', 'Auth Type', 'Password')
+							end
+							local srcip = p.ip_src
+							local areaid = header.area_id
+							local routerid = header.router_id
+							local authtype = header.auth_type
+							local authdata 
 
-			    local data = layer3:sub(p.ip_data_offset + 1)			
-			    local header = ospf.OSPF.Header.parse(data)
-			    if header then
-				if not(self.results) then
-				    self.results = tab.new(5)
-				    tab.addrow(self.results, 'Source IP', 'Router ID', 'Area ID', 'Auth Type', 'Password')
-				end
-				local srcip = p.ip_src
-				local areaid = header.area_id
-				local routerid = header.router_id
-				local authtype = header.auth_type
-				local authdata 
-				-- Format authentication type and data
-				if header.auth_type == 0 then
-				    authtype = "None"
-				    authdata = ''
-				elseif header.auth_type == 1 then
-				    authtype = "Password"
-				    authdata = header.auth_data.password
-				elseif header.auth_type == 2 then
-				    authtype = "OSPF MD5"
-				    authdata = "" -- Not really helpful, as the MD5 
-				    -- is applied to the whole packet+password
-				else
-				    -- Error
-				    stdnse.print_debug("Unknown OSPF auth type %d", header.auth_type)
-				    return
-				end
+							-- Format authentication type and data
+							if header.auth_type == 0 then
+								authtype = "None"
+								authdata = ''
+							elseif header.auth_type == 1 then
+								authtype = "Password"
+								authdata = header.auth_data.password
+							elseif header.auth_type == 2 then
+								authtype = "OSPF MD5"
+								authdata = "" -- Not really helpful, as the MD5 
+								-- is applied to the whole packet+password
+							else
+				 				-- Error
+								stdnse.print_debug("Unknown OSPF auth type %d", header.auth_type)
+								return
+							end
 
-				if ( not(self.dups[("%s:%s"):format(routerid,areaid)]) ) then
-				    if ( target.ALLOW_NEW_TARGETS ) then target.add(routerid) end
-				    self.dups[("%s:%s"):format(routerid,areaid)] = true
-				    tab.addrow( self.results, srcip, routerid, areaid, authtype, authdata)
-				end
-			    else
-				return nil
-			    end
+							if ( not(self.dups[("%s:%s"):format(routerid,areaid)]) ) then
+								if ( target.ALLOW_NEW_TARGETS ) then target.add(routerid) end
+								self.dups[("%s:%s"):format(routerid,areaid)] = true
+								tab.addrow( self.results, srcip, routerid, areaid, authtype, authdata)
+							end
+						else
+							return nil
+						end
+				end,
 
-			end,
-
-			getResults = function(self)	return { name = "OSPF Hello", (self.results and tab.dump(self.results) or "")  } end,
-		    },
+				getResults = function(self)	return { name = "OSPF Hello", (self.results and tab.dump(self.results) or "")  } end,
+			},
 		},
 
 		udp = {
 
-		    -- DHCP
-		    [68] = {
+			-- DHCP
+			[68] = {
 			new = function(self)
-			    local o = { dups = {} }
-			    setmetatable(o, self)
-			    self.__index = self
-			    return o
+				local o = { dups = {} }
+				setmetatable(o, self)
+				self.__index = self
+				return o
 			end,
 
 			getOption = function(options, name)
-			    for _, v in ipairs(options) do
-				if ( v.name == name ) then
-				    if ( type(v.value) == "table" ) then
-					return stdnse.strjoin(", ", v.value)
-				    else
-					return v.value
-				    end
+				for _, v in ipairs(options) do
+					if ( v.name == name ) then
+						if ( type(v.value) == "table" ) then
+							return stdnse.strjoin(", ", v.value)
+						else
+							return v.value
+						end
+					end
 				end
-			    end
 			end,
 
 			process = function(self, layer3)
-			    local dhcp = require("dhcp")
-			    local p = packet.Packet:new( layer3, #layer3 )
-			    local data = layer3:sub(p.udp_offset + 9)
+				local dhcp = require("dhcp")
+				local p = packet.Packet:new( layer3, #layer3 )
+				local data = layer3:sub(p.udp_offset + 9)
 
-			    -- the dhcp.parse function isn't optimal for doing
-			    -- this, but it will do for now. First, we need to
-			    -- extract the xid as the parse function checks that it
-			    -- was the same as in the request, which we didn't do.
-			    local pos, msgtype, _, _, _, xid = bin.unpack("<CCCCA4", data)
+				-- the dhcp.parse function isn't optimal for doing
+				-- this, but it will do for now. First, we need to
+				-- extract the xid as the parse function checks that it
+				-- was the same as in the request, which we didn't do.
+				local pos, msgtype, _, _, _, xid = bin.unpack("<CCCCA4", data)
 
-			    -- attempt to parse the data
-			    local status, result = dhcp.dhcp_parse(data, xid)
+				-- attempt to parse the data
+				local status, result = dhcp.dhcp_parse(data, xid)
 
-			    if ( status ) then
-				if ( not(self.results) ) then
+				if ( status ) then
+					if ( not(self.results) ) then
 				    self.results = tab.new(5)
 				    tab.addrow(self.results, "srv ip", "cli ip", "mask", "gw", "dns" )
-				end
+					end
 				local uniq_key = ("%s:%s"):format(p.ip_src, result.yiaddr_str)
 
 				if ( not(self.dups[uniq_key]) ) then
-				    if ( target.ALLOW_NEW_TARGETS ) then target.add(p.ip_src) end
-				    local mask = self.getOption(result.options, "Subnet Mask") or "-"
-				    local gw = self.getOption(result.options, "Router") or "-"
-				    local dns = self.getOption(result.options, "Domain Name Server") or "-"
-				    tab.addrow(self.results, p.ip_src, result.yiaddr_str, mask, gw, dns )
+					if ( target.ALLOW_NEW_TARGETS ) then target.add(p.ip_src) end
+						local mask = self.getOption(result.options, "Subnet Mask") or "-"
+						local gw = self.getOption(result.options, "Router") or "-"
+						local dns = self.getOption(result.options, "Domain Name Server") or "-"
+						tab.addrow(self.results, p.ip_src, result.yiaddr_str, mask, gw, dns )
+					end
 				end
-			    end
-
 			end,
 
 			getResults = function(self)	return { name = "DHCP", (self.results and tab.dump(self.results) or "") } end,
-		    },
+		},
 
-		    -- Netbios
-		    [137] = {
+		-- Netbios
+		[137] = {
 
 			new = function(self)
-			    local o = { dups = {} }
-			    setmetatable(o, self)
-			    self.__index = self
-			    return o
+				local o = { dups = {} }
+				setmetatable(o, self)
+				self.__index = self
+				return o
 			end,
 
 			process = function(self, layer3)
-			    local dns = require('dns')
-			    local bin = require('bin')
-			    local netbios = require('netbios')
-			    local p = packet.Packet:new( layer3, #layer3 )
-			    local data = layer3:sub(p.udp_offset + 9)
+				local dns = require('dns')
+				local bin = require('bin')
+				local netbios = require('netbios')
+				local p = packet.Packet:new( layer3, #layer3 )
+				local data = layer3:sub(p.udp_offset + 9)
 
-			    local dresp = dns.decode(data)
-			    if ( not(dresp.questions) or #dresp.questions < 1 ) then return end
+				local dresp = dns.decode(data)
+				if ( not(dresp.questions) or #dresp.questions < 1 ) then return end
 
-			    local name = netbios.name_decode("\32" .. dresp.questions[1].dname)
+				local name = netbios.name_decode("\32" .. dresp.questions[1].dname)
 
-			    if ( not(self.results) ) then
-				self.results = tab.new(2)				
-				tab.addrow(	self.results, 'ip', 'query' )
-			    end
+				if ( not(self.results) ) then
+					self.results = tab.new(2)				
+					tab.addrow(	self.results, 'ip', 'query' )
+				end
 
-			    -- check for duplicates
-			    if ( not(self.dups[("%s:%s"):format(p.ip_src, name)]) ) then
-				if ( target.ALLOW_NEW_TARGETS ) then target.add(p.ip_src) end
-				tab.addrow( self.results, p.ip_src, name )
-				self.dups[("%s:%s"):format(p.ip_src, name)] = true
-			    end
+				-- check for duplicates
+				if ( not(self.dups[("%s:%s"):format(p.ip_src, name)]) ) then
+					if ( target.ALLOW_NEW_TARGETS ) then target.add(p.ip_src) end
+						tab.addrow( self.results, p.ip_src, name )
+						self.dups[("%s:%s"):format(p.ip_src, name)] = true
+					end
 			end,
 
 			getResults = function(self)	return { name = "Netbios", (self.results and tab.dump(self.results) or "") } end,
-		    },
+		},
 
-		    --- SSDP
-		    [1900] = {
+		--- SSDP
+		[1900] = {
 
 			new = function(self)
-			    local o = { dups = {} }
-			    setmetatable(o, self)
-			    self.__index = self
-			    return o
+				local o = { dups = {} }
+				setmetatable(o, self)
+				self.__index = self
+				return o
 			end,
 
 			process = function(self, layer3)
-			    local p = packet.Packet:new( layer3, #layer3 )
-			    local data = layer3:sub(p.udp_offset + 9)
+				local p = packet.Packet:new( layer3, #layer3 )
+				local data = layer3:sub(p.udp_offset + 9)
 
-			    local headers = stdnse.strsplit("\r\n", data)
-			    for _, h in ipairs(headers) do
-				local st = ""
-				if ( h:match("^ST:.*") ) then
-				    st = h:match("^ST:(.*)")
-				    if ( not(self.results) ) then
-					self.results = tab.new(1)
-					tab.addrow(	self.results, 'ip', 'uri' )
-				    end
-				    if ( not(self.dups[("%s:%s"):format(p.ip_src,st)]) ) then
-					if ( target.ALLOW_NEW_TARGETS ) then target.add(p.ip_src) end
-					tab.addrow(	self.results, p.ip_src, st )
-					self.dups[("%s:%s"):format(p.ip_src,st)] = true
-				    end
+				local headers = stdnse.strsplit("\r\n", data)
+				for _, h in ipairs(headers) do
+					local st = ""
+					if ( h:match("^ST:.*") ) then
+						st = h:match("^ST:(.*)")
+						if ( not(self.results) ) then
+							self.results = tab.new(1)
+							tab.addrow(	self.results, 'ip', 'uri' )
+						end
+						if ( not(self.dups[("%s:%s"):format(p.ip_src,st)]) ) then
+							if ( target.ALLOW_NEW_TARGETS ) then target.add(p.ip_src) end
+							tab.addrow(	self.results, p.ip_src, st )
+							self.dups[("%s:%s"):format(p.ip_src,st)] = true
+						end
+					end
 				end
-			    end			
 			end,
 
 			getResults = function(self)	return { name = "SSDP", (self.results and tab.dump(self.results) or "") } end,
+		},
 
-		    },
-
-		    --- HSRP
-		    [1985] = {
+		--- HSRP
+		[1985] = {
 
 			new = function(self)
-			    local o = { dups = {} }
-			    setmetatable(o, self)
-			    self.__index = self
-			    return o
+				local o = { dups = {} }
+				setmetatable(o, self)
+				self.__index = self
+				return o
 			end,
 
 			process = function(self, layer3)
-			    local p = packet.Packet:new( layer3, #layer3 )
-			    local data = layer3:sub(p.udp_offset + 9)
-			    local ipOps = require("ipOps")
+				local p = packet.Packet:new( layer3, #layer3 )
+				local data = layer3:sub(p.udp_offset + 9)
+				local ipOps = require("ipOps")
 
-			    local State = {
-				[0] = "Initial",
-				[1] = "Learn",
-				[2] = "Listen",
-				[4] = "Speak",
-				[8] = "Standby",
-				[16] = "Active"
-			    }
+				local State = {
+					[0] = "Initial",
+					[1] = "Learn",
+					[2] = "Listen",
+					[4] = "Speak",
+					[8] = "Standby",
+					[16] = "Active"
+				}
 
-			    local Op = {
-				[0] = "Hello",
-				[1] = "Coup",
-				[2] = "Resign",
-			    }
+				local Op = {
+					[0] = "Hello",
+					[1] = "Coup",
+					[2] = "Resign",
+				}
 
-			    local pos, version, op, state, _, _, prio, group, _, secret = bin.unpack("CCCCCCCCz", data) 
-			    if ( version ~= 0 ) then return end
-			    pos = pos + ( 7 - #secret )
-			    local virtip
-			    pos, virtip = bin.unpack("<I", data, pos)
+				local pos, version, op, state, _, _, prio, group, _, secret = bin.unpack("CCCCCCCCz", data) 
+				if ( version ~= 0 ) then return end
+				pos = pos + ( 7 - #secret )
+				local virtip
+				pos, virtip = bin.unpack("<I", data, pos)
 
-			    if ( not(self.dups[p.ip_src]) ) then
-				if ( not(self.results) ) then
-				    self.results = tab.new(7)
-				    tab.addrow(self.results, 'ip', 'version', 'op', 'state', 'prio', 'group', 'secret', 'virtual ip')
+				if ( not(self.dups[p.ip_src]) ) then
+					if ( not(self.results) ) then
+						self.results = tab.new(7)
+						tab.addrow(self.results, 'ip', 'version', 'op', 'state', 'prio', 'group', 'secret', 'virtual ip')
+					end
+					if ( target.ALLOW_NEW_TARGETS ) then target.add(p.ip_src) end
+					self.dups[p.ip_src] = true
+					tab.addrow(self.results, p.ip_src, version, Op[op], State[state], prio, group, secret, ipOps.fromdword(virtip))
 				end
-				if ( target.ALLOW_NEW_TARGETS ) then target.add(p.ip_src) end
-				self.dups[p.ip_src] = true
-				tab.addrow(self.results, p.ip_src, version, Op[op], State[state], prio, group, secret, ipOps.fromdword(virtip))
-			    end
-
 			end,
 
 			getResults = function(self)	return { name = "HSRP", (self.results and tab.dump(self.results) or "") } end,
 
-		    },
+		},
 
 
-		    -- Dropbox
-		    [17500] = {
+		-- Dropbox
+		[17500] = {
 			new = function(self)
-			    local o = { dups = {} }
-			    setmetatable(o, self)
-			    self.__index = self
-			    return o
+				local o = { dups = {} }
+				setmetatable(o, self)
+				self.__index = self
+				return o
 			end,
 
 			process = function(self, layer3)
-			    local json = require("json")
-			    local p = packet.Packet:new( layer3, #layer3 )
-			    local data = layer3:sub(p.udp_offset + 9)
-			    local status, info = json.parse(data)
-			    if ( not(status) ) then
-				return false, "Failed to parse JSON data"
-			    end
-
-			    -- Add host to list.
-			    for _, key1 in pairs({"namespaces", "version"}) do
-				for key2, val in pairs(info[key1]) do
-				    info[key1][key2] = tostring(info[key1][key2])
+				local json = require("json")
+				local p = packet.Packet:new( layer3, #layer3 )
+				local data = layer3:sub(p.udp_offset + 9)
+				local status, info = json.parse(data)
+				if ( not(status) ) then
+					return false, "Failed to parse JSON data"
 				end
-			    end
 
-			    if ( not(self.results) ) then
-				self.results = tab.new(6)
-				tab.addrow(
-				self.results,
-				'displayname',
-				'ip',
-				'port',
-				'version',
-				'host_int',
-				'namespaces'
-				)
-			    end
+				-- Add host to list.
+				for _, key1 in pairs({"namespaces", "version"}) do
+					for key2, val in pairs(info[key1]) do
+						info[key1][key2] = tostring(info[key1][key2])
+					end
+				end
 
-			    if ( not(self.dups[p.ip_src]) ) then
-				tab.addrow(
-				self.results,
-				info.displayname,
-				p.ip_src,
-				info.port,
-				stdnse.strjoin(".", info.version),
-				info.host_int,
-				stdnse.strjoin(", ", info.namespaces)
-				)
-				self.dups[p.ip_src] = true
-				if ( target.ALLOW_NEW_TARGETS ) then target.add(p.ip_src) end
-			    end
-			end,
-
-			getResults = function(self)	return { name = "DropBox", (self.results and tab.dump(self.results) or "") } end,
-
-		    },
-
-		    --- Squeezebox Discovery
-		    [3483] = {
-
-			new = function(self)
-			    local o = { dups = {} }
-			    setmetatable(o, self)
-			    self.__index = self
-			    return o
-			end,
-
-			process = function(self, layer3)
-			    local p = packet.Packet:new( layer3, #layer3 )
-			    local data = layer3:sub(p.udp_offset + 9)
-
-			    if ( data:match("^eIPAD") ) then
 				if ( not(self.results) ) then
-				    self.results = tab.new(1)
-				    tab.addrow(	self.results, 'ip' )
+					self.results = tab.new(6)
+					tab.addrow(
+						self.results,
+						'displayname',
+						'ip',
+						'port',
+						'version',
+						'host_int',
+						'namespaces'
+					)
 				end
 
 				if ( not(self.dups[p.ip_src]) ) then
-				    tab.addrow(	self.results, p.ip_src )
-				    self.dups[p.ip_src] = true
-				    if ( target.ALLOW_NEW_TARGETS ) then target.add(p.ip_src) end
+					tab.addrow(
+						self.results,
+						info.displayname,
+						p.ip_src,
+						info.port,
+						stdnse.strjoin(".", info.version),
+						info.host_int,
+						stdnse.strjoin(", ", info.namespaces)
+					)
+					self.dups[p.ip_src] = true
+					if ( target.ALLOW_NEW_TARGETS ) then target.add(p.ip_src) end
 				end
-			    end
+			end,
+
+			getResults = function(self)	return { name = "DropBox", (self.results and tab.dump(self.results) or "") } end,
+		},
+
+		--- Squeezebox Discovery
+		[3483] = {
+
+			new = function(self)
+				local o = { dups = {} }
+				setmetatable(o, self)
+				self.__index = self
+				return o
+			end,
+
+			process = function(self, layer3)
+			local p = packet.Packet:new( layer3, #layer3 )
+			local data = layer3:sub(p.udp_offset + 9)
+
+			if ( data:match("^eIPAD") ) then
+				if ( not(self.results) ) then
+					self.results = tab.new(1)
+					tab.addrow(	self.results, 'ip' )
+				end
+
+				if ( not(self.dups[p.ip_src]) ) then
+					tab.addrow(	self.results, p.ip_src )
+					self.dups[p.ip_src] = true
+					if ( target.ALLOW_NEW_TARGETS ) then target.add(p.ip_src) end
+				end
+			end
 
 			end,
 
 			getResults = function(self)	return { name = "Squeezebox Discovery", (self.results and tab.dump(self.results) or "") } end,
 
-		    },
+		},
 
-		    -- Multicast DNS/BonJour/ZeroConf
-		    [5353] = {
+		-- Multicast DNS/BonJour/ZeroConf
+		[5353] = {
 
 			new = function(self)
-			    local o = { dups = {} }
-			    setmetatable(o, self)
-			    self.__index = self
-			    return o
+				local o = { dups = {} }
+				setmetatable(o, self)
+				self.__index = self
+				return o
 			end,
 
 			process = function(self, layer3)
-			    local dns = require('dns')
-			    local bin = require('bin')
+				local dns = require('dns')
+				local bin = require('bin')
+				local p = packet.Packet:new( layer3, #layer3 )
+				local data = layer3:sub(p.udp_offset + 9)
+				local dresp = dns.decode(data)
+				local name
 
-			    local p = packet.Packet:new( layer3, #layer3 )
-			    local data = layer3:sub(p.udp_offset + 9)
+				if ( dresp.questions and #dresp.questions > 0 ) then
+					name = dresp.questions[1].dname
+				elseif ( dresp.answers and #dresp.answers > 0 ) then
+					name = dresp.answers[1].dname
+				end
 
-			    local dresp = dns.decode(data)
-			    local name
+				if ( not(name) ) then return end
 
-			    if ( dresp.questions and #dresp.questions > 0 ) then
-				name = dresp.questions[1].dname
-			    elseif ( dresp.answers and #dresp.answers > 0 ) then
-				name = dresp.answers[1].dname
-			    end
+				if ( not(self.results) ) then
+					self.results = tab.new(2)				
+					tab.addrow(	self.results, 'ip', 'query' )
+				end
 
-			    if ( not(name) ) then return end
-
-			    if ( not(self.results) ) then
-				self.results = tab.new(2)				
-				tab.addrow(	self.results, 'ip', 'query' )
-			    end
-
-			    -- check for duplicates
-			    if ( not(self.dups[("%s:%s"):format(p.ip_src, name)]) ) then
-				tab.addrow( self.results, p.ip_src, name )
-				self.dups[("%s:%s"):format(p.ip_src, name)] = true
-				if ( target.ALLOW_NEW_TARGETS ) then target.add(p.ip_src) end
-			    end
+				-- check for duplicates
+				if ( not(self.dups[("%s:%s"):format(p.ip_src, name)]) ) then
+					tab.addrow( self.results, p.ip_src, name )
+					self.dups[("%s:%s"):format(p.ip_src, name)] = true
+					if ( target.ALLOW_NEW_TARGETS ) then target.add(p.ip_src) end
+				end
 			end,
 
 			getResults = function(self)	return { name = "MDNS", (self.results and tab.dump(self.results) or "") } end,
-		    },
+		},
 
-		    --- Spotify
-		    [57621] = {
+		--- Spotify
+		[57621] = {
 
 			new = function(self)
-			    local o = { dups = {} }
-			    setmetatable(o, self)
-			    self.__index = self
-			    return o
+				local o = { dups = {} }
+				setmetatable(o, self)
+				self.__index = self
+				return o
 			end,
 
 			process = function(self, layer3)
-			    local p = packet.Packet:new( layer3, #layer3 )
-			    local data = layer3:sub(p.udp_offset + 9)
+				local p = packet.Packet:new( layer3, #layer3 )
+				local data = layer3:sub(p.udp_offset + 9)
 
-			    if ( data:match("^SpotUdp") ) then
-				if ( not(self.results) ) then
-				    self.results = tab.new(1)
-				    tab.addrow(	self.results, 'ip' )
-				end
+				if ( data:match("^SpotUdp") ) then
+					if ( not(self.results) ) then
+						self.results = tab.new(1)
+						tab.addrow(	self.results, 'ip' )
+					end
 
-				if ( not(self.dups[p.ip_src]) ) then
-				    tab.addrow(	self.results, p.ip_src )
-				    self.dups[p.ip_src] = true
-				    if ( target.ALLOW_NEW_TARGETS ) then target.add(p.ip_src) end
+					if ( not(self.dups[p.ip_src]) ) then
+						tab.addrow(	self.results, p.ip_src )
+						self.dups[p.ip_src] = true
+						if ( target.ALLOW_NEW_TARGETS ) then target.add(p.ip_src) end
+					end
 				end
-			    end
 
 			end,
 
 			getResults = function(self)	return { name = "Spotify", (self.results and tab.dump(self.results) or "") } end,
 
-		    }
-
 		}
-	    }
+
+	}
+}