Fixes to the discovery command and added h323 discovery module to the…

… discovery command

pentest.rb

@@ -984,12 +984,17 @@ def cmd_network_discover(*args)
 			opts = Rex::Parser::Arguments.new(
 				"-r"   => [ true,	"IP Range to scan"],
 				"-d"   => [ true,	"Run Framework discovery modules against found hosts."],
-				"-s"   => [ true,	"Speed for scanning setting the most common ports 0: 10, 1:100 and 2: 1000."],
+				"-s"   => [ true,	"Speed for scanning setting the most common ports 0: 10, 1: 100 and 2: 1000."],
 				"-u"   => [ false,	"Perform UDP Scanning. NOTE:Must be ran as root."],
 				"-U"   => [ true,	"SMB Username for discovery(optional)."],
 				"-P"   => [ true,	"SMB Password for discovery(optional)."],
-				"-D"   => [ true,	"SMB Domain for discovery(optional)."]
+				"-D"   => [ true,	"SMB Domain for discovery(optional)."],
+				"-h"   => [ true,	"Help Message."]
 			)
+			if args.length == 0 
+				print_line opts.usage
+				return
+			end
 			opts.parse(args) do |opt, idx, val|
 				case opt
 
@@ -1107,6 +1112,10 @@ def run_version_scans(services)
 					opts = {'RHOSTS' => s.host.address, 'RPORT' => s.port}
 					run_aux_module("scanner/http/http_version",opts)
 
+				elsif (s.port == 1720) and s.info.nil?
+					opts = {'RHOSTS' => s.host.address, 'RPORT' => s.port}
+					run_aux_module("scanner/h323/h323_version",opts)
+
 				elsif (s.name == "https" || s.port == 443) and s.info.nil?
 					opts = {'RHOSTS' => s.host.address, 'RPORT' => s.port, 'SSL' => true}
 					run_aux_module("scanner/http/http_version",opts)