[or-cvs] r19718: {torflow} Add a 4th scanner to the mix to ensure scans complete in a r (in torflow/trunk/NetworkScanners/BwAuthority: . data data/scanner.1 data/scanner.2 data/scanner.3 data/scanner.4)
mikeperry at seul.org
mikeperry at seul.org
Mon Jun 15 09:57:04 UTC 2009
Author: mikeperry
Date: 2009-06-15 05:57:04 -0400 (Mon, 15 Jun 2009)
New Revision: 19718
Added:
torflow/trunk/NetworkScanners/BwAuthority/data/scanner.4/
torflow/trunk/NetworkScanners/BwAuthority/data/scanner.4/bwauthority.cfg
torflow/trunk/NetworkScanners/BwAuthority/data/scanner.4/scan-data/
torflow/trunk/NetworkScanners/BwAuthority/data/scanner.4/tor-data/
torflow/trunk/NetworkScanners/BwAuthority/data/scanner.4/torrc
Modified:
torflow/trunk/NetworkScanners/BwAuthority/cron.sh
torflow/trunk/NetworkScanners/BwAuthority/data/scanner.1/bwauthority.cfg
torflow/trunk/NetworkScanners/BwAuthority/data/scanner.2/bwauthority.cfg
torflow/trunk/NetworkScanners/BwAuthority/data/scanner.3/bwauthority.cfg
torflow/trunk/NetworkScanners/BwAuthority/data/scanner.3/torrc
torflow/trunk/NetworkScanners/BwAuthority/run_scan.sh
Log:
Add a 4th scanner to the mix to ensure scans complete in a
reasonable amount of time. Fix small bug in cron script.
Modified: torflow/trunk/NetworkScanners/BwAuthority/cron.sh
===================================================================
--- torflow/trunk/NetworkScanners/BwAuthority/cron.sh 2009-06-15 09:54:50 UTC (rev 19717)
+++ torflow/trunk/NetworkScanners/BwAuthority/cron.sh 2009-06-15 09:57:04 UTC (rev 19718)
@@ -1,8 +1,8 @@
#!/bin/sh
-SCANNER_DIR=$HOME/code/torflow-trunk/NetworkScanners/BwAuthority
+SCANNER_DIR=~/code/torflow-trunk/NetworkScanners/BwAuthority
TOR_DEST=$SCANNER_DIR/bwscan.V3BandwidthsFile
-
+cd $SCANNER_DIR # Needed for import to work properly.
$SCANNER_DIR/aggregate.py $SCANNER_DIR/data $SCANNER_DIR/data/bwscan.all
cp $SCANNER_DIR/data/bwscan.all $TOR_DEST
Modified: torflow/trunk/NetworkScanners/BwAuthority/data/scanner.1/bwauthority.cfg
===================================================================
--- torflow/trunk/NetworkScanners/BwAuthority/data/scanner.1/bwauthority.cfg 2009-06-15 09:54:50 UTC (rev 19717)
+++ torflow/trunk/NetworkScanners/BwAuthority/data/scanner.1/bwauthority.cfg 2009-06-15 09:57:04 UTC (rev 19718)
@@ -13,10 +13,10 @@
out_dir = ./data/scanner.1/scan-data
tor_dir = ./data/scanner.1/tor-data
start_pct = 0
-stop_pct = 20
+stop_pct = 10
save_every = 10
nodes_per_slice = 50
-circs_per_node = 2
+circs_per_node = 5
min_streams = 1
max_fetch_time = 1800
sleep_start = 01:30
Modified: torflow/trunk/NetworkScanners/BwAuthority/data/scanner.2/bwauthority.cfg
===================================================================
--- torflow/trunk/NetworkScanners/BwAuthority/data/scanner.2/bwauthority.cfg 2009-06-15 09:54:50 UTC (rev 19717)
+++ torflow/trunk/NetworkScanners/BwAuthority/data/scanner.2/bwauthority.cfg 2009-06-15 09:57:04 UTC (rev 19718)
@@ -12,11 +12,11 @@
[BwAuthority]
out_dir = ./data/scanner.2/scan-data
tor_dir = ./data/scanner.2/tor-data
-start_pct = 20
-stop_pct = 60
+start_pct = 10
+stop_pct = 35
save_every = 10
nodes_per_slice = 50
-circs_per_node = 2
+circs_per_node = 5
min_streams = 1
max_fetch_time = 1800
sleep_start = 01:30
Modified: torflow/trunk/NetworkScanners/BwAuthority/data/scanner.3/bwauthority.cfg
===================================================================
--- torflow/trunk/NetworkScanners/BwAuthority/data/scanner.3/bwauthority.cfg 2009-06-15 09:54:50 UTC (rev 19717)
+++ torflow/trunk/NetworkScanners/BwAuthority/data/scanner.3/bwauthority.cfg 2009-06-15 09:57:04 UTC (rev 19718)
@@ -12,11 +12,11 @@
[BwAuthority]
out_dir = ./data/scanner.3/scan-data
tor_dir = ./data/scanner.3/tor-data
-start_pct =60
-stop_pct = 100
+start_pct =35
+stop_pct = 65
save_every = 10
nodes_per_slice = 50
-circs_per_node = 2
+circs_per_node = 5
min_streams = 1
max_fetch_time = 1800
sleep_start = 01:30
Modified: torflow/trunk/NetworkScanners/BwAuthority/data/scanner.3/torrc
===================================================================
--- torflow/trunk/NetworkScanners/BwAuthority/data/scanner.3/torrc 2009-06-15 09:54:50 UTC (rev 19717)
+++ torflow/trunk/NetworkScanners/BwAuthority/data/scanner.3/torrc 2009-06-15 09:57:04 UTC (rev 19718)
@@ -6,7 +6,3 @@
FetchUselessDescriptors 1
DataDirectory ./data/scanner.3/tor-data
CookieAuthentication 1
-
-# XXX: This should be for test scans only. Our timeout values must match the
-# normal Tor clients.
-SocksTimeout 45
Added: torflow/trunk/NetworkScanners/BwAuthority/data/scanner.4/bwauthority.cfg
===================================================================
--- torflow/trunk/NetworkScanners/BwAuthority/data/scanner.4/bwauthority.cfg (rev 0)
+++ torflow/trunk/NetworkScanners/BwAuthority/data/scanner.4/bwauthority.cfg 2009-06-15 09:57:04 UTC (rev 19718)
@@ -0,0 +1,23 @@
+[TorCtl]
+loglevel=DEBUG
+tor_host = 127.0.0.1
+tor_port = 9140
+control_host = 127.0.0.1
+control_port = 9141
+control_pass =
+# XXX: Unused
+meta_host = 127.0.0.1
+meta_port = 9142
+
+[BwAuthority]
+out_dir = ./data/scanner.4/scan-data
+tor_dir = ./data/scanner.4/tor-data
+start_pct =65
+stop_pct = 100
+save_every = 10
+nodes_per_slice = 50
+circs_per_node = 5
+min_streams = 1
+max_fetch_time = 1800
+sleep_start = 01:30
+sleep_stop = 05:30
Added: torflow/trunk/NetworkScanners/BwAuthority/data/scanner.4/torrc
===================================================================
--- torflow/trunk/NetworkScanners/BwAuthority/data/scanner.4/torrc (rev 0)
+++ torflow/trunk/NetworkScanners/BwAuthority/data/scanner.4/torrc 2009-06-15 09:57:04 UTC (rev 19718)
@@ -0,0 +1,8 @@
+## Configuration file for metatroller on alternate prot
+SocksPort 9140 # what port to advertise for application connections
+ControlPort 9141
+SafeLogging 0
+Log notice file ./data/scanner.4/tor.log
+FetchUselessDescriptors 1
+DataDirectory ./data/scanner.4/tor-data
+CookieAuthentication 1
Modified: torflow/trunk/NetworkScanners/BwAuthority/run_scan.sh
===================================================================
--- torflow/trunk/NetworkScanners/BwAuthority/run_scan.sh 2009-06-15 09:54:50 UTC (rev 19717)
+++ torflow/trunk/NetworkScanners/BwAuthority/run_scan.sh 2009-06-15 09:57:04 UTC (rev 19718)
@@ -17,6 +17,7 @@
$TOR_EXE -f ./data/scanner.1/torrc &
$TOR_EXE -f ./data/scanner.2/torrc &
$TOR_EXE -f ./data/scanner.3/torrc &
+$TOR_EXE -f ./data/scanner.4/torrc &
# If this is a fresh start, we should allow the tors time to download
# new descriptors.
@@ -27,5 +28,6 @@
./bwauthority.py ./data/scanner.1/bwauthority.cfg >& ./data/scanner.1/bw.log &
./bwauthority.py ./data/scanner.2/bwauthority.cfg >& ./data/scanner.2/bw.log &
./bwauthority.py ./data/scanner.3/bwauthority.cfg >& ./data/scanner.3/bw.log &
+./bwauthority.py ./data/scanner.4/bwauthority.cfg >& ./data/scanner.4/bw.log &
More information about the tor-commits
mailing list