From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <www-data@comics.unina.it>
Received: from mail-33-ewr.dyndns.com (mxout-041-ewr.mailhop.org
	[216.146.33.41])
	by lists.bufferbloat.net (Postfix) with ESMTP id 11BB02E03C0
	for <bismark-commits@lists.bufferbloat.net>;
	Thu, 14 Apr 2011 17:41:18 -0700 (PDT)
Received: from scan-31-ewr.mailhop.org (scan-31-ewr.local [10.0.141.237])
	by mail-33-ewr.dyndns.com (Postfix) with ESMTP id 9F4D66F6F0F
	for <bismark-commits@lists.bufferbloat.net>;
	Thu, 14 Apr 2011 16:24:29 +0000 (UTC)
X-Spam-Score: 0.1 ()
X-Mail-Handler: MailHop by DynDNS
X-Originating-IP: 143.225.229.147
Received: from svn.comics.unina.it (unknown [143.225.229.147])
	by mail-33-ewr.dyndns.com (Postfix) with ESMTP id 16ADC6F6A21
	for <bismark-commits@lists.bufferbloat.net>;
	Thu, 14 Apr 2011 16:24:18 +0000 (UTC)
Received: from www-data by svn.comics.unina.it with local (Exim 4.69)
	(envelope-from <www-data@comics.unina.it>) id 1QAPOd-0001Q4-4T
	for bismark-commits@lists.bufferbloat.net;
	Thu, 14 Apr 2011 18:27:55 +0200
To: bismark-commits@lists.bufferbloat.net
From: walter@svn.comics.unina.it
Message-Id: <E1QAPOd-0001Q4-4T@svn.comics.unina.it>
Date: Thu, 14 Apr 2011 18:27:55 +0200
X-Mailman-Approved-At: Thu, 14 Apr 2011 21:25:17 -0700
Subject: [Bismark-commits] rev 319 - trunk/device/OpenWrt_common/etc
	trunk/device/OpenWrt_common/lib trunk/device/OpenWrt_common/scripts
X-BeenThere: bismark-commits@lists.bufferbloat.net
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: Commit log for the bismark source code
	<bismark-commits.lists.bufferbloat.net>
List-Unsubscribe: <https://lists.bufferbloat.net/options/bismark-commits>,
	<mailto:bismark-commits-request@lists.bufferbloat.net?subject=unsubscribe>
List-Archive: <https://lists.bufferbloat.net/pipermail/bismark-commits>
List-Post: <mailto:bismark-commits@lists.bufferbloat.net>
List-Help: <mailto:bismark-commits-request@lists.bufferbloat.net?subject=help>
List-Subscribe: <https://lists.bufferbloat.net/listinfo/bismark-commits>,
	<mailto:bismark-commits-request@lists.bufferbloat.net?subject=subscribe>
X-List-Received-Date: Fri, 15 Apr 2011 00:41:19 -0000

Author: walter
Date: 2011-04-14 18:27:55 +0200 (Thu, 14 Apr 2011)
New Revision: 319

Added:
   trunk/device/OpenWrt_common/lib/world_ips.list
Removed:
   trunk/device/OpenWrt_common/lib/gd.list
Modified:
   trunk/device/OpenWrt_common/etc/bismark.conf
   trunk/device/OpenWrt_common/scripts/bismark-measure-active
Log:
few misc changes

Modified: trunk/device/OpenWrt_common/etc/bismark.conf
===================================================================
--- trunk/device/OpenWrt_common/etc/bismark.conf	2011-04-14 15:09:45 UTC (rev 318)
+++ trunk/device/OpenWrt_common/etc/bismark.conf	2011-04-14 16:27:55 UTC (rev 319)
@@ -31,7 +31,7 @@
 
 # Measurement frequencies (n*5 minutes)
 TR_FQ=6
-BR_FQ=6
+BR_FQ=12
 UDP_FQ=3
 SP_FQ=144
 DNS_FQ=2
@@ -46,8 +46,8 @@
 TR_TYPE=UDP
 RTR_TYPE=UDP
 
-# HTTP transfer options
-HTTP_DURATION=15
+# Throughput options
+BR_DURATION=15
 
 # UDP options
 UDP_DURATION=10

Deleted: trunk/device/OpenWrt_common/lib/gd.list
===================================================================
--- trunk/device/OpenWrt_common/lib/gd.list	2011-04-14 15:09:45 UTC (rev 318)
+++ trunk/device/OpenWrt_common/lib/gd.list	2011-04-14 16:27:55 UTC (rev 319)
@@ -1,4 +0,0 @@
-# California
-128.48.110.150
-# Italy
-143.225.229.254

Copied: trunk/device/OpenWrt_common/lib/world_ips.list (from rev 318, trunk/device/OpenWrt_common/lib/gd.list)
===================================================================
--- trunk/device/OpenWrt_common/lib/world_ips.list	                        (rev 0)
+++ trunk/device/OpenWrt_common/lib/world_ips.list	2011-04-14 16:27:55 UTC (rev 319)
@@ -0,0 +1,4 @@
+# California
+128.48.110.150
+# Italy
+143.225.229.254

Modified: trunk/device/OpenWrt_common/scripts/bismark-measure-active
===================================================================
--- trunk/device/OpenWrt_common/scripts/bismark-measure-active	2011-04-14 15:09:45 UTC (rev 318)
+++ trunk/device/OpenWrt_common/scripts/bismark-measure-active	2011-04-14 16:27:55 UTC (rev 319)
@@ -50,7 +50,7 @@
 # XML file header
 cat > $xml_file <<-end
 	<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-	<measurements version="1.1">
+	<measurements version="1.2">
 	        <info deviceid=$DEVICE_ID />
 end
 
@@ -100,7 +100,7 @@
 
 	# Geo-distributed servers RTT
 	mkdir -p /tmp/gdrtt
-	for srv in $(grep -v ^# ~/conf/gd.list); do
+	for srv in $(grep -v ^# /usr/lib/bismark/world_ips.list); do
 		( bismark-ping $srv | bismark-mstats RTT PING $src $srv > /tmp/gdrtt/$srv ; cat /tmp/gdrtt/$srv >> $xml_file ) &
 	done