Move and rename analysis scripts to subdirectory

README

@@ -27,12 +27,12 @@ Add to crontab to run tests 4x a day:
 
 Analyze Tor bootstrap progress from logs:
 	1. Make the CSV: find log -name '*.log' | sort | ./makecsv > bootstrap.csv
-	2. Plot the results: Rscript graph.R bootstrap.csv
+	2. Plot the results: Rscript plot-bootstrap.R bootstrap.csv
 
 Analyze obfs4 throughput from pcap files:
     1. Adapt the variables CLIENT_TUPLE and SERVER_TUPLE in infer-throughput.py.
-    2. Run the script: python infer-throughput.py download.pcap > download.csv
-    3. Plot the results: Rscript plot-throughput.R download.csv    
+    2. Run the script: python obfs4-throughput.py download.pcap > download.csv
+    3. Plot the results: Rscript obfs4-throughput.R download.csv    
 
 Analyze snowflake throughput from pcap files:
     1. Plot the results: Rscript snowflake-throughput.R snowflake-throughput.csv

probetest.sh

@@ -22,10 +22,7 @@ case $CASE in
     'snowflake')
         # First test reachability of STUN servers
         "$dirname/stun-test/stun-test"
-        # Throughput/reachibility test of 100 snowflakes
+        # Throughput/reachibility test of 10 snowflakes
         "$dirname/snowflaketest"
-        # Process .pcap files and delete
-        "$dirname/snowflake-throughput.py" > snowflake-throughput.csv
-        rm *.pcap
         ;;
 esac

snowflaketest

@@ -148,8 +148,6 @@ for x in range(0, 10):
             #give data to log file
             timestamp = datetime.utcnow().strftime("%b %d %H:%M:%S.%f")
             output.write(timestamp+"\n")
-            subprocess.Popen(["/usr/bin/tshark", "-q", "-Xlua_script:../../../../snowflake-stage.lua", "-r",  "%s-%s.pcap" % (nickname, "eth0")],
-                                            stdout=output).communicate()[0]
             logging.info("Probed snowflake proxy %d time(s)" % (x+1))
 
     finally: