[or-cvs] r21386: {torflow} Add some restrictions to get an idea of the number of relays (torflow/trunk/NetworkScanners)

[mikeperry at seul.org]

Author: mikeperry
Date: 2010-01-02 12:45:20 -0500 (Sat, 02 Jan 2010)
New Revision: 21386

Modified:
   torflow/trunk/NetworkScanners/statsplitter.py
Log:

Add some restrictions to get an idea of the number
of relays that have the new circ window parameter
patch. Turns out the answer is about 80% by bw.



Modified: torflow/trunk/NetworkScanners/statsplitter.py
===================================================================
--- torflow/trunk/NetworkScanners/statsplitter.py	2010-01-02 17:44:37 UTC (rev 21385)
+++ torflow/trunk/NetworkScanners/statsplitter.py	2010-01-02 17:45:20 UTC (rev 21386)
@@ -24,6 +24,7 @@
 c = Connection(s)
 c.debug(file("control.log", "w"))
 c.authenticate(control_pass)
+#c.authenticate_cookie(file("/home/torperf/tor-data1/control_auth_cookie", "r"))
 FUDValue = c.get_option("FetchUselessDescriptors")[0][1]
 c.set_option("FetchUselessDescriptors", "1") 
 atexit.register(cleanup, *(c, FUDValue))
@@ -65,8 +66,14 @@
 
 super_bad = OrNodeRestriction([win_rst, nbw_limit_rst])
 
+# >= 0.2.2.2-alpha and >= 0.2.1.20
+cwind_yes = NodeRestrictionList([VersionRangeRestriction("0.2.1.20"),
+             NotNodeRestriction(VersionRangeRestriction("0.2.2.0", "0.2.2.1"))])
+       
+cwind_no = NotNodeRestriction(cwind_yes)
 
 fast_rst = FlagsRestriction(["Fast"], [])
+#exit_rst = NodeRestrictionList([cwind_yes, FlagsRestriction(["Exit"], [])])
 exit_rst = FlagsRestriction(["Exit"], [])
 dir_rst = FlagsRestriction(["V2Dir"], [])
 heavy_exits = OrNodeRestriction(