[or-cvs] r19597: {torflow} Add socks log message, and clean out scan dirs in run_scan s (torflow/trunk/NetworkScanners/BwAuthority)

[mikeperry at seul.org]

Author: mikeperry
Date: 2009-05-30 18:22:46 -0400 (Sat, 30 May 2009)
New Revision: 19597

Modified:
   torflow/trunk/NetworkScanners/BwAuthority/bwauthority.py
   torflow/trunk/NetworkScanners/BwAuthority/run_scan.sh
Log:

Add socks log message, and clean out scan dirs in run_scan script.



Modified: torflow/trunk/NetworkScanners/BwAuthority/bwauthority.py
===================================================================
--- torflow/trunk/NetworkScanners/BwAuthority/bwauthority.py	2009-05-30 10:10:08 UTC (rev 19596)
+++ torflow/trunk/NetworkScanners/BwAuthority/bwauthority.py	2009-05-30 22:22:46 UTC (rev 19597)
@@ -390,6 +390,7 @@
   # set SOCKS proxy
   socks.setdefaultproxy(socks.PROXY_TYPE_SOCKS5, TorUtil.tor_host, TorUtil.tor_port)
   socket.socket = socks.socksocket
+  plog("INFO", "Set socks proxy to "+TorUtil.tor_host+":"+TorUtil.tor_port)
 
   while True:
     pct = start_pct

Modified: torflow/trunk/NetworkScanners/BwAuthority/run_scan.sh
===================================================================
--- torflow/trunk/NetworkScanners/BwAuthority/run_scan.sh	2009-05-30 10:10:08 UTC (rev 19596)
+++ torflow/trunk/NetworkScanners/BwAuthority/run_scan.sh	2009-05-30 22:22:46 UTC (rev 19597)
@@ -8,6 +8,11 @@
 #      git checkout control-ns-wfix
 TOR_EXE=../../../tor.git/src/or/tor
 
+for i in scanner.*
+do
+  rm $i/scan-data/*
+done
+
 $TOR_EXE -f ./scanner.1/torrc & 
 $TOR_EXE -f ./scanner.2/torrc & 
 $TOR_EXE -f ./scanner.3/torrc &