[Bismark-commits] rev 338 - trunk/device/OpenWrt_common/scripts

[Bismark-commits] rev 338 - trunk/device/OpenWrt_common/scripts

[walter]

Author: walter
Date: 2011-05-18 16:21:09 +0200 (Wed, 18 May 2011)
New Revision: 338

Modified:
   trunk/device/OpenWrt_common/scripts/bismark-measure-active
Log:
added default probe port to bismark-measure-active

Modified: trunk/device/OpenWrt_common/scripts/bismark-measure-active
===================================================================
--- trunk/device/OpenWrt_common/scripts/bismark-measure-active	2011-05-18 13:51:29 UTC (rev 337)
+++ trunk/device/OpenWrt_common/scripts/bismark-measure-active	2011-05-18 14:21:09 UTC (rev 338)
@@ -32,8 +32,12 @@
 get_target ()
 {
 	# Select probe port
-	read port_counter < /tmp/bismark/var/port_counter
-	PROBE_PORT=$(echo $PROBE_PORTS | awk '{print $'$((port_counter + 1))'}')
+	if [ -e /tmp/bismark/var/port_counter ]; then
+		read port_counter < /tmp/bismark/var/port_counter
+		PROBE_PORT=$(echo $PROBE_PORTS | awk '{print $'$((port_counter + 1))'}')
+	else
+		PROBE_PORT=5353
+	fi
 
 	# Send message
 	msg "$1 $2 $3 $4" | nc -u $NC_OPTS $SERVER $PROBE_PORT > $MEASURE_REPLY
@@ -67,7 +71,6 @@
 end
 
 ## Concurrent measurements ##
-count=0
 if [ $((count % TR_FQ)) -eq 0 ]; then
 	# Traceroute
 	if get_target Bismark TR $ZONE 0 ; then
@@ -96,7 +99,7 @@
 		fi
 	fi
 fi
-echo "Done TR"
+
 # Get Gateway IP
 if [ ! "$gwip" ]; then
 	bismark-tr "8.8.8.8" > /dev/null
@@ -119,12 +122,11 @@
 	# MServer RTT
 	bismark-ping $dst | bismark-mstats RTT PING $src $dst >> $XML_FILE 
 fi
-echo "Done PING"
+
 # DNS delay and failure
 if [ $((count % DNS_FQ)) -eq 0 ]; then
 	bismark-dns >> $XML_FILE
 fi
-echo "Done DNS"
 
 ## Serial measurements ##
 if [ ! -e /tmp/bismark/var/mlock ]; then