Enancement in refresh & kill processes

test.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
+REFRESH=2
 HOSTS_FILES="$HOME/.hosts_scanner"
-#HOSTS_FILES="/tmp/hosts"
 verbose=0
 res_file=$(mktemp -t hosts_scanner.XXXXXXXXXX)
 date_cmd="date --rfc-3339=s"
@@ -9,10 +9,17 @@ lock="${res_file}.lock"
 
 pids=""
 clean_exit() {
+	clear
+	reset
 	echo "Ctrl+C pressed, exiting..."
 	for pid in $(echo $pids)
 	do
+		echo killing $pid
 		kill $pid
+	done
+	for pid in $(echo $pids)
+	do
+		wait $pid
 		echo $pid killed
 	done
 	rmdir ${res_file}.lock 2>/dev/null
@@ -25,8 +32,10 @@ clean_cidr() {
 	echo "CIDR killed, cleaning..."
 	for pid in $(echo $cidr_pids)
 	do
+		echo CIDR killing $pid
 		kill $pid
-		echo $pid killed
+		wait $pid
+		echo CIDR $pid killed
 	done
 	exit 0
 }
@@ -49,7 +58,10 @@ upd_ping() {
 	# $1 host
 	# $2 file
 	# $3 lock
+	# $4 delay
+
 	lock="$3"
+	test -z "$4" && delay=5 || delay=$4
 	last_up="never"
 	
 	while [ 1 ]
@@ -75,7 +87,7 @@ upd_ping() {
 
 		semrelease $lock
 
-		sleep 5
+		sleep $delay
 	done
 }
 
@@ -84,21 +96,40 @@ cidr_scan() {
 	# $1 cidr
 	# $2 result file
 	# $3 lock
+	# $4 delay
+
+	test -z "$4" && delay=5 || delay=$4
 
 	trap clean_cidr 15
 	while [ 1 ]
 	do
+		semlock $lock
+		echo "CIDR scanning $1" >&2
+		semrelease $lock
+
 		for h in $(nmap -sP -oG - $1 | grep "Up$" | cut -d " " -f 2)
 		do
 			rehost=$(echo $h|sed 's/\./\\./g')
-			if grep -v " $rehost " $2 > /dev/null
+			if grep " $rehost " $2 > /dev/null
 			then
+				continue
+			else
 				printf "%30s %8s %30s\n" $h "unknw" "unknwn" >> $res_file
 				upd_ping $h $2 $3 &
 				pid=$!
 				cidr_pids="${cidr_pids}\n$pid"
+
+				semlock $lock
+				echo "$pid scanning $h" >&2
+				semrelease $lock
 			fi
 		done
+
+		semlock $lock
+		echo "CIDR scanned $1" >&2
+		semrelease $lock
+
+		sleep $delay
 	done
 }
 
@@ -116,10 +147,10 @@ for h in $(cat "$HOSTS_FILES" )
 do
 	if echo $h |grep -v '/' > /dev/null
 	then
-		upd_ping $h $res_file $lock &
+		upd_ping $h $res_file $lock 5 &
 	else
 		# cidr scan
-		cidr_scan $h $res_file $lock &
+		cidr_scan $h $res_file $lock 10 &
 	fi
 	pid=$!
 	pids="${pids}\n$pid"
@@ -129,6 +160,8 @@ sleep 1
 
 while [ 1 ]
 do
+	#sleep 1
+	#continue
 
 	semlock $lock
 	clear
@@ -145,5 +178,5 @@ do
 	sed -E -e "s/\snever$/$(tput sgr0)\0/" -e "s/^.* down .*$/$(tput setaf 1)\0$(tput sgr0)/"  $res_file
 
 	semrelease $lock
-	sleep 1
+	sleep $REFRESH
 done