[Bismark-commits] rev 326 - trunk/device/OpenWrt_common/lib trunk/device/OpenWrt_common/scripts

[Bismark-commits] rev 326 - trunk/device/OpenWrt_common/lib trunk/device/OpenWrt_common/scripts

[bismark]

Author: bismark
Date: 2011-04-16 19:33:41 +0200 (Sat, 16 Apr 2011)
New Revision: 326

Modified:
   trunk/device/OpenWrt_common/lib/functions.inc.sh
   trunk/device/OpenWrt_common/scripts/bismark-measure-active
   trunk/device/OpenWrt_common/scripts/bismark-netperf-thread
   trunk/device/OpenWrt_common/scripts/bismark-tr
Log:


Modified: trunk/device/OpenWrt_common/lib/functions.inc.sh
===================================================================
--- trunk/device/OpenWrt_common/lib/functions.inc.sh	2011-04-15 18:08:44 UTC (rev 325)
+++ trunk/device/OpenWrt_common/lib/functions.inc.sh	2011-04-16 17:33:41 UTC (rev 326)
@@ -58,7 +58,7 @@
 	if [ -e /tmp/ip ] && [ $(grep -c '^[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*$' /tmp/ip) -ge 1 ]; then
 		src=$(cat /tmp/ip)
 	else
-		src=$(ifconfig $WAN_IF | awk '/inet:/{ print substr($2,6) }')
+		src=$(ifconfig $WAN_IF | awk '/inet addr:/{ print substr($2,6) }')
 	fi
 }
 

Modified: trunk/device/OpenWrt_common/scripts/bismark-measure-active
===================================================================
--- trunk/device/OpenWrt_common/scripts/bismark-measure-active	2011-04-15 18:08:44 UTC (rev 325)
+++ trunk/device/OpenWrt_common/scripts/bismark-measure-active	2011-04-16 17:33:41 UTC (rev 326)
@@ -133,14 +133,17 @@
 		if get_target Bismark NETPERF $ZONE $BR_DURATION ; then
 			sleep $wait
 			( sleep 3 ; bismark-ping $dst | bismark-mstats ULRTTDW PING $src $dst >> $XML_FILE ) &
-			bismark-netperf $BR_DURATION $NTHREADS $dst dw | bismark-mstats BITRATE NETPERF $dst $src | grep -v nan >> $XML_FILE
+			bismark-netperf $BR_DURATION $NTHREADS $dst dw > /tmp/bismark/data/netperf-out
+			cat /tmp/bismark/data/netperf-out | bismark-mstats BITRATE NETPERF $dst $src | grep -v nan >> $XML_FILE
 		fi
 
 		# Upstream bitrate using NETPERF
 		if get_target Bismark NETPERF $ZONE $BR_DURATION ; then
 			sleep $wait
 			( sleep 3 ; bismark-ping $dst | bismark-mstats ULRTTUP PING $src $dst >> $XML_FILE ) &
-			bismark-netperf $BR_DURATION $NTHREADS $dst up | bismark-mstats BITRATE NETPERF $src $dst | grep -v nan >> $XML_FILE
+			bismark-netperf $BR_DURATION $NTHREADS $dst up > /tmp/bismark/data/netperf-out
+			cat /tmp/bismark/data/netperf-out | bismark-mstats BITRATE NETPERF $src $dst | grep -v nan >> $XML_FILE
+			rm /tmp/bismark/data/netperf-out
 		fi
 	fi
 

Modified: trunk/device/OpenWrt_common/scripts/bismark-netperf-thread
===================================================================
--- trunk/device/OpenWrt_common/scripts/bismark-netperf-thread	2011-04-15 18:08:44 UTC (rev 325)
+++ trunk/device/OpenWrt_common/scripts/bismark-netperf-thread	2011-04-16 17:33:41 UTC (rev 326)
@@ -39,11 +39,11 @@
 }
 
 keys=" -l$T -P0 -fk"
-if [ $dir = 'rev' ]
+if [ $dir = 'dw' ]
 then
 	keys=$keys' -t TCP_MAERTS'
 fi
-if [ $dir = 'fwd' ]
+if [ $dir = 'up' ]
 then
 	keys=$keys' -t TCP_STREAM'
 fi

Modified: trunk/device/OpenWrt_common/scripts/bismark-tr
===================================================================
--- trunk/device/OpenWrt_common/scripts/bismark-tr	2011-04-15 18:08:44 UTC (rev 325)
+++ trunk/device/OpenWrt_common/scripts/bismark-tr	2011-04-16 17:33:41 UTC (rev 326)
@@ -29,7 +29,6 @@
 }'
 
 # Select traceroute type
-echo $TR_TYPE
 case $TR_TYPE in
 UDP)  
 	cmd="traceroute"