Merge branch 'master' of gogitme.opmantek.com:open-audit

Opmantek · Sep 27, 2017 · c01574d · c01574d
2 parents 64a86f5 + 67c6842
commit c01574d
Show file tree

Hide file tree

Showing 3 changed files with 441 additions and 6 deletions.
diff --git a/other/discover_subnet.sh b/other/discover_subnet.sh
@@ -330,10 +330,10 @@ if [[ "$hosts" != "" ]]; then
 		# -T3 set the timing (higher is faster) ($timing) default for the script is -T3
 		if [ "$debugging" -gt 0 ]; then
 			echo "Scanning Host: $host"
-			echo "nmap -vv -n $os_scan -Pn $host_timeout $timing $host 2>&1"
+			echo "nmap -vv -n $os_scan -Pn --host_timeout 60 $timing $host 2>&1"
 		fi
 		nmap_tcp_timer_start=$(timer)
-		nmap_scan=$(nmap -vv -n $os_scan -Pn $host_timeout $timing "$host" 2>&1)
+		nmap_scan=$(nmap -vv -n $os_scan -Pn --host_timeout 60 $timing $host 2>&1)
 		if [ "$debugging" -gt 0 ]; then
 			nmap_tcp_timer_end=$(timer "$nmap_tcp_timer_start")
 			echo "Nmap TCP scan time: $nmap_tcp_timer_end"

diff --git a/other/discover_subnet.vbs b/other/discover_subnet.vbs
@@ -272,9 +272,6 @@ else
     end if
 end if
 
-
-command = nmap_path & " -n -sL "$subnet_range" 2>/dev/null | grep "Nmap done" | cut -d" " -f3)
-
 log_entry = "Discovery for " & subnet_range & " submitted for discovery " & discovery_id & " starting"
 write_log()
 
@@ -302,7 +299,7 @@ dim hosts_scanned : hosts_scanned = 0
 dim db_log_duration : db_log_duration = 0
 dim db_log_status : db_log_status = ""
 dim db_log_message : db_log_message = ""
-dm host_timer : host_timer = 0
+dim host_timer : host_timer = 0
 
 db_log_status = "start"
 db_log_message = "Starting discovery, scanning " & hosts_in_subnet & " IP addresses"