Historic archive of defunct list bismark-commits@lists.bufferbloat.net
 help / color / mirror / Atom feed
From: walter@svn.comics.unina.it
To: bismark-commits@lists.bufferbloat.net
Subject: [Bismark-commits] rev 338 - trunk/device/OpenWrt_common/scripts
Date: Wed, 18 May 2011 16:21:09 +0200	[thread overview]
Message-ID: <E1QMhcb-0007FZ-Fe@svn.comics.unina.it> (raw)

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 


                 reply	other threads:[~2011-05-18 14:05 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=E1QMhcb-0007FZ-Fe@svn.comics.unina.it \
    --to=walter@svn.comics.unina.it \
    --cc=bismark-commits@lists.bufferbloat.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox