November 2011 - tor-commits - lists.torproject.org

[torflow/master] Use desc bw if consensus bw is missing for some log lines
by mikeperry＠torproject.org 21 Nov '11

21 Nov '11

commit b6bbfd1c7e040e43a67bd13eb7bc6a0b6a1e87a1 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sun Nov 20 21:40:32 2011 -0800 Use desc bw if consensus bw is missing for some log lines --- NetworkScanners/BwAuthority/aggregate.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/NetworkScanners/BwAuthority/aggregate.py b/NetworkScanners/BwAuthority/aggregate.py index 86dcf71..46dce2e 100755 --- a/NetworkScanners/BwAuthority/aggregate.py +++ b/NetworkScanners/BwAuthority/aggregate.py @@ -652,7 +652,9 @@ def main(argv): #if time.mktime(r.published.utctimetuple()) - r.uptime \ # < oldest_timestamp: missed_nodes += 1.0 - if n.bandwidth != None: + if n.bandwidth == None: + missed_bw += r.bw + else: missed_bw += n.bandwidth # We still tend to miss about 80 nodes even with these # checks.. Possibly going in and out of hibernation?

1 0

[torflow/master] Be consistent about Wgd application for Guard+Exit nodes.
by mikeperry＠torproject.org 21 Nov '11

21 Nov '11

commit 54f0fe26a6371d8f2f8fa8c47753afd5289b690f Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sun Nov 20 21:16:50 2011 -0800 Be consistent about Wgd application for Guard+Exit nodes. Also correct log line. --- NetworkScanners/BwAuthority/aggregate.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/NetworkScanners/BwAuthority/aggregate.py b/NetworkScanners/BwAuthority/aggregate.py index 46b8300..fc16f67 100755 --- a/NetworkScanners/BwAuthority/aggregate.py +++ b/NetworkScanners/BwAuthority/aggregate.py @@ -557,8 +557,8 @@ def main(argv): and "Exit" in prev_consensus[n.idhex].flags): n.new_bw = n.get_pid_bw(prev_votes.vote_map[n.idhex], cs_junk.K_p*(1.0-cs_junk.bw_weights["Wgd"]), - cs_junk.K_i, - cs_junk.K_d, + cs_junk.K_i*(1.0-cs_junk.bw_weights["Wgd"]), + cs_junk.K_d*(1.0-cs_junk.bw_weights["Wgd"]), cs_junk.K_i_decay) else: n.new_bw = n.get_pid_bw(prev_votes.vote_map[n.idhex], @@ -659,7 +659,7 @@ def main(argv): plog("DEBUG", "Didn't measure "+n.idhex+"="+n.nickname+" at "+str(round((100.0*n.list_rank)/max_rank,1))+" "+str(n.bandwidth)) measured_pct = round(100.0*len(nodes)/(len(nodes)+missed_nodes),1) - measured_bw_pct = round((100.0*missed_bw)/tot_bw,1) + measured_bw_pct = 100.0 - round((100.0*missed_bw)/tot_bw,1) if measured_pct < MIN_REPORT: plog("NOTICE", "Did not measure "+str(MIN_REPORT)+"% of nodes yet ("+str(measured_pct)+"%)") sys.exit(1)

1 0

[torflow/master] Display a total of previous consensus bw measured in INFO logs.
by mikeperry＠torproject.org 21 Nov '11

21 Nov '11

commit c2479563d22bd55462d0c923a1f652aff0cb7133 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sun Nov 20 20:52:49 2011 -0800 Display a total of previous consensus bw measured in INFO logs. --- NetworkScanners/BwAuthority/aggregate.py | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/NetworkScanners/BwAuthority/aggregate.py b/NetworkScanners/BwAuthority/aggregate.py index 8e308d1..46b8300 100755 --- a/NetworkScanners/BwAuthority/aggregate.py +++ b/NetworkScanners/BwAuthority/aggregate.py @@ -637,7 +637,11 @@ def main(argv): plog("INFO", "Oldest updated node: "+time.ctime(oldest_updated)) missed_nodes = 0.0 + missed_bw = 0 + tot_bw = 0 for n in prev_consensus.itervalues(): + if n.bandwidth != None: + tot_bw += n.bandwidth if not n.measured: if "Fast" in n.flags and "Running" in n.flags: try: @@ -648,16 +652,21 @@ def main(argv): #if time.mktime(r.published.utctimetuple()) - r.uptime \ # < oldest_timestamp: missed_nodes += 1.0 + if n.bandwidth != None: + missed_bw += n.bandwidth # We still tend to miss about 80 nodes even with these # checks.. Possibly going in and out of hibernation? plog("DEBUG", "Didn't measure "+n.idhex+"="+n.nickname+" at "+str(round((100.0*n.list_rank)/max_rank,1))+" "+str(n.bandwidth)) measured_pct = round(100.0*len(nodes)/(len(nodes)+missed_nodes),1) + measured_bw_pct = round((100.0*missed_bw)/tot_bw,1) if measured_pct < MIN_REPORT: plog("NOTICE", "Did not measure "+str(MIN_REPORT)+"% of nodes yet ("+str(measured_pct)+"%)") sys.exit(1) - plog("INFO", "Measured "+str(measured_pct)+"% of all tor nodes.") + plog("INFO", + "Measured "+str(measured_pct) +"% of all tor nodes (" + +str(measured_bw_pct)+"% of previous consensus bw).") n_print = nodes.values() n_print.sort(lambda x,y: int(y.pid_error*1000) - int(x.pid_error*1000))

1 0

[torflow/master] Output git revision.
by mikeperry＠torproject.org 21 Nov '11

21 Nov '11

commit 02a11b2728581c0f446fd3aeeca2a1b42beb30e0 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sun Nov 20 20:43:11 2011 -0800 Output git revision. --- NetworkScanners/BwAuthority/aggregate.py | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/NetworkScanners/BwAuthority/aggregate.py b/NetworkScanners/BwAuthority/aggregate.py index c55b9a1..8e308d1 100755 --- a/NetworkScanners/BwAuthority/aggregate.py +++ b/NetworkScanners/BwAuthority/aggregate.py @@ -56,6 +56,9 @@ MAX_AGE = 2*GUARD_SAMPLE_RATE # If the resultant scan file is older than 1.5 days, something is wrong MAX_SCAN_AGE = 60*60*24*1.5 +# path to git repos (.git) +PATH_TO_TORFLOW_REPO = '../../.git/' +PATH_TO_TORCTL_REPO = '../../TorCtl/.git/' def base10_round(bw_val): # This keeps the first 3 decimal digits of the bw value only @@ -327,6 +330,11 @@ def main(argv): TorUtil.read_config(argv[1]+"/scanner.1/bwauthority.cfg") TorUtil.loglevel = "NOTICE" + (branch, head) = TorUtil.get_git_version(PATH_TO_TORFLOW_REPO) + plog('INFO', 'TorFlow Version: %s' % branch+' '+head) + (branch, head) = TorUtil.get_git_version(PATH_TO_TORCTL_REPO) + plog('INFO', 'TorCtl Version: %s' % branch+' '+head) + s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) s.connect((TorUtil.control_host,TorUtil.control_port)) c = TorCtl.Connection(s)

1 0

[torflow/master] Bug #4330: Have snakeinspector attach files if they exist
by mikeperry＠torproject.org 21 Nov '11

21 Nov '11

commit 63a3091397ffd4f4eae27f18c8103bb0ebfab7b1 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sat Nov 19 15:47:34 2011 -0800 Bug #4330: Have snakeinspector attach files if they exist --- NetworkScanners/ExitAuthority/snakeinspector.py | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/NetworkScanners/ExitAuthority/snakeinspector.py b/NetworkScanners/ExitAuthority/snakeinspector.py index 608df54..c359719 100755 --- a/NetworkScanners/ExitAuthority/snakeinspector.py +++ b/NetworkScanners/ExitAuthority/snakeinspector.py @@ -274,7 +274,20 @@ def main(argv): text += traceback.format_exc() # TODO: Attach files? Or is that too much.. Maybe serve # them via http and include links? - send_mail(mail_from_email, mail_to_email, subject, text) + if isinstance(r, HttpTestResult) or \ + isinstance(r, JsTestResult) or \ + isinstance(r, HtmlTestResult): + attach = [] + if r.content: + attach.append(r.content) + if r.content_old: + attach.append(r.content_old) + if r.content_exit: + attach.append(r.content_exit) + send_mail(mail_from_email, mail_to_email, subject, text, + attach) + else: + send_mail(mail_from_email, mail_to_email, subject, text) if __name__ == "__main__": main(sys.argv)

1 0

[torflow/master] Bug 2014: Provide url to backup bw server.
by mikeperry＠torproject.org 21 Nov '11

21 Nov '11

commit 5905ba33b4703c7436007120416f5bdcb43cff13 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sun Nov 20 17:48:18 2011 -0800 Bug 2014: Provide url to backup bw server. --- NetworkScanners/BwAuthority/bwauthority_child.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/NetworkScanners/BwAuthority/bwauthority_child.py b/NetworkScanners/BwAuthority/bwauthority_child.py index 64a5ca7..be9d5fe 100755 --- a/NetworkScanners/BwAuthority/bwauthority_child.py +++ b/NetworkScanners/BwAuthority/bwauthority_child.py @@ -47,7 +47,7 @@ user_agent = "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; .NET CLR 1.0.37 # Note these urls should be https due to caching considerations. # If you really must make them http, be sure to change exit_ports to [80] # below, or else the scan will not finish. -urls = ["https://38.229.70.2/"]#, "https://38.229.72.16/"] +urls = ["https://38.229.70.2/", "https://38.229.72.16/bwauth.torproject.org/"] # Do NOT modify this object directly after it is handed to PathBuilder

1 0

[tor/master] Changes file for bug4521 backports.
by nickm＠torproject.org 21 Nov '11

21 Nov '11

commit fbcd7c01e78c71df479c540c85a7ea94dc02a0a4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 20 20:15:13 2011 -0500 Changes file for bug4521 backports. --- changes/bug4521 | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/changes/bug4521 b/changes/bug4521 new file mode 100644 index 0000000..9b0bae9 --- /dev/null +++ b/changes/bug4521 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Backport fixes for a pair of compilation warnings on Windows. + Fixes bug 4521; bugfix on 0.2.2.28-beta and on 0.2.2.29-beta.

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 21 Nov '11

21 Nov '11

commit 3e9c86a8f964e8c6f11c57663bd4dc8998827eb5 Merge: 7992eb4 fbcd7c0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 20 20:16:49 2011 -0500 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug4521 | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)

1 0

[tor/master] Get rid of an unused parameter warning on win
by nickm＠torproject.org 21 Nov '11

21 Nov '11

commit 3dc2a1c62cf01218f1a1afc03e54b0b2b52046e7 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Aug 9 11:00:25 2011 +0200 Get rid of an unused parameter warning on win This is a backport of bed79c47f4ec0ee72b19e2b81c54131d516d07ef which accidentally only went into master --- src/common/util.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index de1ca36..7675ede 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1698,6 +1698,8 @@ check_private_dir(const char *dirname, cpd_check_t check, struct passwd *pw = NULL; uid_t running_uid; gid_t running_gid; +#else + (void)effective_user; #endif tor_assert(dirname);

1 0

[tor/master] Sockets are unsigned on windows
by nickm＠torproject.org 21 Nov '11

21 Nov '11

commit 2efa6eb652d9eb2dd6d91a5e4ef3e9eea1ac7d22 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Aug 9 10:59:03 2011 +0200 Sockets are unsigned on windows this gets rid of a warning about signed/unsigned comparison This is a backport of 0a5338e03cdf14ef80584c6ff8adeb49200b8a76 that accidentally only went into master --- src/common/compat.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/common/compat.h b/src/common/compat.h index 7e6058a..011b9c8 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -396,7 +396,7 @@ typedef int socklen_t; #ifdef MS_WINDOWS #define tor_socket_t intptr_t -#define SOCKET_OK(s) ((s) != INVALID_SOCKET) +#define SOCKET_OK(s) ((unsigned)(s) != INVALID_SOCKET) #else #define tor_socket_t int #define SOCKET_OK(s) ((s) >= 0)

1 0