support for pinging mservers list

projectbismark · Mar 23, 2012 · 8de239b · 8de239b
1 parent 9dfcdaf
commit 8de239b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/device/OpenWrt_common/etc/bismark-active.conf b/device/OpenWrt_common/etc/bismark-active.conf
@@ -71,6 +71,9 @@ ACTIVE_CONF_URL=https://"$ACTIVE_CONF_SERVER"/bismark/active-conf/"$DEVICE_ID"-a
 #URL to get ping_targets.list
 PING_TARGETS_URL=https://"$ACTIVE_CONF_SERVER"/bismark/active/ping_targets.list
 
+#URL to get mservers.list
+MSERVERS_URL=https://"$ACTIVE_CONF_SERVER"/bismark/active/mservers.list
+
 #URL to get dns_targets.list
 DNS_TARGETS_URL=https://"$ACTIVE_CONF_SERVER"/bismark/active/dns_targets.list
 

diff --git a/device/OpenWrt_common/scripts/bismark-measure-active b/device/OpenWrt_common/scripts/bismark-measure-active
@@ -137,7 +137,10 @@ if get_target Bismark PING $ZONE 10 ; then
 	fi
 
 	# MServer RTT
-	"$BROOT"/usr/bin/bismark-ping $dst | "$BROOT"/usr/bin/bismark-mstats RTT PING $src $dst >> $XML_FILE 
+	if [ $count -eq 0 ]; then
+		"$BROOT"/usr/bin/bismark-fping /tmp/bismark/mservers.list $src >> $XML_FILE
+	fi
+	#"$BROOT"/usr/bin/bismark-ping $dst | "$BROOT"/usr/bin/bismark-mstats RTT PING $src $dst >> $XML_FILE 
 fi
 
 # DNS delay and failure

diff --git a/device/OpenWrt_common/scripts/bismark-measure-wrapper b/device/OpenWrt_common/scripts/bismark-measure-wrapper
@@ -26,6 +26,7 @@ else
         dl_file $PING_TARGETS_URL  /tmp/bismark/ping_targets.list 
         #wget -O /tmp/bismark/dns_targets.list $DNS_TARGETS_URL
         dl_file $DNS_TARGETS_URL  /tmp/bismark/dns_targets.list 
+        dl_file $MSERVERS_URL /tmp/bismark/mservers.list 
 		date +%s > $LOCKFILE
 		"$BROOT"/usr/bin/bismark-measure-active
 		rm $LOCKFILE