From f16e593628f9bfafe09e023a4ae0f172fd462b55 Mon Sep 17 00:00:00 2001 From: James Lee Date: Mon, 15 Aug 2011 22:39:41 +0000 Subject: [PATCH] report udp protocol correctly, see #5260, r13569 git-svn-id: file:///home/svn/framework3/trunk@13570 4d416f70-5f16-0410-b530-b9f4589650da --- lib/rex/parser/nexpose_raw_nokogiri.rb | 10 +++++----- lib/rex/parser/nexpose_simple_nokogiri.rb | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/rex/parser/nexpose_raw_nokogiri.rb b/lib/rex/parser/nexpose_raw_nokogiri.rb index 807d82c045..8b3dfb7e86 100644 --- a/lib/rex/parser/nexpose_raw_nokogiri.rb +++ b/lib/rex/parser/nexpose_raw_nokogiri.rb @@ -263,7 +263,7 @@ module Rex @state[:service].each do |k,v| case k when "protocol" - port_hash[:protocol] = v + port_hash[:proto] = v when "port" port_hash[:port] = v when "status" @@ -351,10 +351,10 @@ module Rex db.emit(:address,@report_data[:host],&block) if block host_object = db_report(:host, @report_data.merge( :workspace => @args[:wspace] ) ) - if host_object - db.report_import_note(host_object.workspace, host_object) - end - host_object + if host_object + db.report_import_note(host_object.workspace, host_object) + end + host_object end end diff --git a/lib/rex/parser/nexpose_simple_nokogiri.rb b/lib/rex/parser/nexpose_simple_nokogiri.rb index 7091e9ef01..6b5dcd370e 100644 --- a/lib/rex/parser/nexpose_simple_nokogiri.rb +++ b/lib/rex/parser/nexpose_simple_nokogiri.rb @@ -281,7 +281,7 @@ module Rex @state[:service].each do |k,v| case k when "protocol" - port_hash[:protocol] = v + port_hash[:proto] = v when "port" port_hash[:port] = v when "name"