March 2014 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'public/build_torrify_manpage_again'
by nickm＠torproject.org 31 Mar '14

31 Mar '14

commit 4ebad0d947cbb74b674468e6601894468629f814 Merge: f82e499 91f6a42 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 31 10:52:09 2014 -0400 Merge remote-tracking branch 'public/build_torrify_manpage_again' changes/bug11321 | 5 +++++ doc/include.am | 22 ++++++++++++---------- 2 files changed, 17 insertions(+), 10 deletions(-)

1 0

[tor/master] Fix build of torify.1
by nickm＠torproject.org 31 Mar '14

31 Mar '14

commit 91f6a422cc2a7801e399111353e20ddbe2e17f33 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 26 12:11:38 2014 -0400 Fix build of torify.1 The build was broken by changes in f8c45339f72525c68, but we didn't notice, since that commit also made torify.1 only get built when tor-fw-helper was turned on. Fixes bug 11321; bugfix on Tor 0.2.5.1-alpha. --- changes/bug11321 | 5 +++++ doc/include.am | 22 ++++++++++++---------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/changes/bug11321 b/changes/bug11321 new file mode 100644 index 0000000..d737a1f --- /dev/null +++ b/changes/bug11321 @@ -0,0 +1,5 @@ + o Minor bugfixes (build): + - Build the torify.1 manpage again. Previously, we were only + trying to build it when also building tor-fw-helper. That's why + we didn't notice that we'd broken the ability to build it. + Fixes bug 11321; bugfix on 0.2.5.1-alpha. diff --git a/doc/include.am b/doc/include.am index 37c0237..30d3e20 100644 --- a/doc/include.am +++ b/doc/include.am @@ -12,17 +12,17 @@ # part of the source distribution, so that people without asciidoc can # just use the .1 and .html files. -regular_mans = doc/tor doc/tor-gencert doc/tor-resolve -all_mans = $(regular_mans) doc/torify doc/tor-fw-helper - -if USE_ASCIIDOC +base_mans = doc/tor doc/tor-gencert doc/tor-resolve doc/torify +all_mans = $(base_mans) doc/tor-fw-helper if USE_FW_HELPER -nodist_man1_MANS = $(all_mans:=.1) -doc_DATA = $(all_mans:=.html) +install_mans = $(all_mans) else -nodist_man1_MANS = $(regular_mans:=.1) -doc_DATA = $(regular_mans:=.html) +install_mans = $(base_mans) endif + +if USE_ASCIIDOC +nodist_man1_MANS = $(install_mans:=.1) +doc_DATA = $(install_mans:=.html) html_in = $(all_mans:=.html.in) man_in = $(all_mans:=.1.in) txt_in = $(all_mans:=.1.txt) @@ -53,11 +53,13 @@ $(man_in) : $(AM_V_GEN)$(top_srcdir)/doc/asciidoc-helper.sh man @A2X@ $(top_srcdir)/$@ doc/tor.1.in: doc/tor.1.txt +doc/torify.1.in: doc/torify.1.txt doc/tor-gencert.1.in: doc/tor-gencert.1.txt doc/tor-resolve.1.in: doc/tor-resolve.1.txt doc/tor-fw-helper.1.in: doc/tor-fw-helper.1.txt doc/tor.html.in: doc/tor.1.txt +doc/torify.html.in: doc/torify.1.txt doc/tor-gencert.html.in: doc/tor-gencert.1.txt doc/tor-resolve.html.in: doc/tor-resolve.1.txt doc/tor-fw-helper.html.in: doc/tor-fw-helper.1.txt @@ -74,13 +76,13 @@ $(asciidoc_product) : doc/tor.html: doc/tor.html.in doc/tor-gencert.html: doc/tor-gencert.html.in doc/tor-resolve.html: doc/tor-resolve.html.in -doc/torify.html: doc/torify.1.txt +doc/torify.html: doc/torify.html.in doc/tor-fw-helper.html: doc/tor-fw-helper.html.in doc/tor.1: doc/tor.1.in doc/tor-gencert.1: doc/tor-gencert.1.in doc/tor-resolve.1: doc/tor-resolve.1.in -doc/torify.1: doc/torify.1.txt +doc/torify.1: doc/torify.1.in doc/tor-fw-helper.1: doc/tor-fw-helper.1.in CLEANFILES+= $(asciidoc_product) config.log

1 0

[tor/master] Make dump_desc() use binary mode
by nickm＠torproject.org 31 Mar '14

31 Mar '14

commit bfe783f167d4d88123117a460cde652707bdb2ef Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 27 23:53:03 2014 -0400 Make dump_desc() use binary mode Otherwise, it could mung the thing that came over the net on windows, which would defeat the purpose of recording the unparseable thing. Fixes bug 11342; bugfix on 0.2.2.1-alpha. --- changes/bug11342 | 4 ++++ src/or/routerparse.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug11342 b/changes/bug11342 new file mode 100644 index 0000000..a52a551 --- /dev/null +++ b/changes/bug11342 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - When dumping a malformed directory object to disk, save it in binary + mode on windows, not text mode. Fixes bug 11342; bugfix on + 0.2.2.1-alpha. diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 3aa4bdf..d52a982 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -598,7 +598,7 @@ dump_desc(const char *desc, const char *type) char *content = tor_malloc_zero(filelen); tor_snprintf(content, filelen, "Unable to parse descriptor of type " "%s:\n%s", type, desc); - write_str_to_file(debugfile, content, 0); + write_str_to_file(debugfile, content, 1); log_info(LD_DIR, "Unable to parse descriptor of type %s. See file " "unparseable-desc in data directory for details.", type); tor_free(content);

1 0

[tor/master] Merge remote-tracking branch 'public/bug11342'
by nickm＠torproject.org 31 Mar '14

31 Mar '14

commit f82e499aa58be77ac91b04eedbc43409681100d0 Merge: 5e0cfba bfe783f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 31 10:51:09 2014 -0400 Merge remote-tracking branch 'public/bug11342' changes/bug11342 | 4 ++++ src/or/routerparse.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/master] Fix a clang compilation warning
by nickm＠torproject.org 31 Mar '14

31 Mar '14

commit 5e0cfba969e886b2f1769b70c425de658b229e9f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 31 10:07:42 2014 -0400 Fix a clang compilation warning Subtracting two time_t values was yielding something that maybe can't be fit in an int. Bugfix on 0389d4aa; bug not in any released Tor. --- src/or/microdesc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/or/microdesc.c b/src/or/microdesc.c index 454ec94..4977332 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -378,19 +378,19 @@ microdesc_cache_clean(microdesc_cache_t *cache, time_t cutoff, int force) /* Let's try to diagnose and fix #7164 . */ smartlist_t *nodes = nodelist_find_nodes_with_microdesc(*mdp); const networkstatus_t *ns = networkstatus_get_latest_consensus(); - int networkstatus_age = -1; + long networkstatus_age = -1; if (ns) { networkstatus_age = now - ns->valid_after; } log_warn(LD_BUG, "Microdescriptor seemed very old " "(last listed %d hours ago vs %d hour cutoff), but is still " "marked as being held by %d node(s). I found %d node(s) " - "holding it. Current networkstatus is %d hours old.", + "holding it. Current networkstatus is %ld hours old.", (int)((now - (*mdp)->last_listed) / 3600), (int)((now - cutoff) / 3600), held_by_nodes, smartlist_len(nodes), - (int)(networkstatus_age / 3600)); + networkstatus_age / 3600); SMARTLIST_FOREACH_BEGIN(nodes, const node_t *, node) { const char *rs_match = "No RS";

1 0

[metrics-tasks/master] Fix typo (#9889).
by karsten＠torproject.org 31 Mar '14

31 Mar '14

commit 789691395a9c59211c62c1c5cd8bbdb50abd69c0 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Mar 26 12:42:42 2014 +0100 Fix typo (#9889). --- task-9889/tshirt.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/task-9889/tshirt.py b/task-9889/tshirt.py index afee3da..d9f5962 100755 --- a/task-9889/tshirt.py +++ b/task-9889/tshirt.py @@ -28,30 +28,30 @@ def print_debug_info(fingerprint, first_seen_check, exit_port_check, uptime_perc else: print("Average bandwidth in past 2 months : " + str(avg_bandwidth) + "KBytes/s") - print("\nElligibility") + print("\nEligibility") print("------------") if not first_seen_check: - print("Not elligible for T-shirt") + print("Not eligible for T-shirt") print("Reason : Relay first appeared in past 2 months") elif uptime_percent < 95: - print("Not elligible for T-shirt") + print("Not eligible for T-shirt") print("Reason : Insufficient relay uptime percentage") else: if exit_port_check is False: if avg_bandwidth >= 500: - print("Elligible for T-shirt") + print("Eligible for T-shirt") print("Reason : Average bandwidth greater than 500KBytes/s and " "relay uptime greater than 95%") else: - print("Not elligible for T-shirt") + print("Not eligible for T-shirt") print("Reason : Average bandwidth less than 500KBytes/s and port 80 blocked") else: if avg_bandwidth < 100: - print("Not elligible for T-shirt") + print("Not eligible for T-shirt") print("Reason : Average bandwidth less than 100KBytes/s") else: - print("Elligible for T-shirt") + print("Eligible for T-shirt") print("Reason : Average bandwidth greater than 100KBytes/s," "relay uptime greater than 95% and port 80 unblocked") print("")

1 0

[metrics-tasks/master] Include another check based on first_seen (#9889).
by karsten＠torproject.org 31 Mar '14

31 Mar '14

commit 00cdcec322b0e7e9a17efbe82de93825e2afefd9 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Mar 26 12:41:33 2014 +0100 Include another check based on first_seen (#9889). We only checked uptime fraction, but that may be >= 95% regardless of overall uptime. Let's only consider relays that have been around for the past two months. --- task-9889/tshirt.py | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/task-9889/tshirt.py b/task-9889/tshirt.py index 581fac3..afee3da 100755 --- a/task-9889/tshirt.py +++ b/task-9889/tshirt.py @@ -9,7 +9,7 @@ from datetime import timedelta, datetime TWO_MONTHS = 2 * 30 * 86400 -def print_debug_info(fingerprint, exit_port_check, uptime_percent, avg_bandwidth): +def print_debug_info(fingerprint, first_seen_check, exit_port_check, uptime_percent, avg_bandwidth): """ Provides debugging information about relay operator's eligibility for acquiring a t-shirt """ @@ -17,6 +17,7 @@ def print_debug_info(fingerprint, exit_port_check, uptime_percent, avg_bandwidth print("\nRelay details") print("-------------") print("Fingerprint : " + fingerprint) + print("First seen at least 2 months ago : " + str(first_seen_check)) print("Exit to port 80 allowed : " + str(exit_port_check)) if uptime_percent == -1: print("Uptime percentage in past 2 months : Insufficient data") @@ -30,9 +31,12 @@ def print_debug_info(fingerprint, exit_port_check, uptime_percent, avg_bandwidth print("\nElligibility") print("------------") - if uptime_percent < 95: + if not first_seen_check: print("Not elligible for T-shirt") - print("Reason : Insufficient relay up time") + print("Reason : Relay first appeared in past 2 months") + elif uptime_percent < 95: + print("Not elligible for T-shirt") + print("Reason : Insufficient relay uptime percentage") else: if exit_port_check is False: if avg_bandwidth >= 500: @@ -115,6 +119,14 @@ def check_in_ports(ports): return False +def check_first_seen(response): + """ Checks if relay was first seen at least 2 months ago """ + + today = datetime.now() + first_seen = datetime.strptime(response['first_seen'], "%Y-%m-%d %H:%M:%S") + return (today - first_seen).total_seconds() >= TWO_MONTHS + + def check_exit_port(response): """ Checks if relay allows network traffic to exit through port 80 """ @@ -151,16 +163,17 @@ def check_tshirt(search_query): print "Fetched bandwidth document" uptime_data = fetch_data('uptime', params)['relays'] print "Fetched uptime document" - params['fields'] = 'exit_policy_summary,fingerprint' - exit_policies = fetch_data('details', params)['relays'] + params['fields'] = 'exit_policy_summary,fingerprint,first_seen' + details_data = fetch_data('details', params)['relays'] print "Fetched details document" - for i in range(len(exit_policies)): - fingerprint = exit_policies[i]['fingerprint'] - exit_port_check = check_exit_port(exit_policies[i]) + for i in range(len(details_data)): + fingerprint = details_data[i]['fingerprint'] + first_seen_check = check_first_seen(details_data[i]) + exit_port_check = check_exit_port(details_data[i]) uptime_percent = get_uptime_percent(uptime_data[i]) avg_bandwidth = get_avg_bandwidth(bandwidth_data[i]) - print_debug_info(fingerprint, exit_port_check, uptime_percent, avg_bandwidth) + print_debug_info(fingerprint, first_seen_check, exit_port_check, uptime_percent, avg_bandwidth) if __name__ == "__main__":

1 0

[metrics-tasks/master] Add code to check if relay qualifies for tshirt (#9889)
by karsten＠torproject.org 31 Mar '14

31 Mar '14

commit 3abffe2c86724c3e93b29d670b5673c7f68e5e80 Author: Sreenatha Bhatlapenumarthi <sreenatha.dev(a)gmail.com> Date: Wed Mar 19 19:03:16 2014 +0530 Add code to check if relay qualifies for tshirt (#9889) --- task-9889/tshirt.py | 141 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 141 insertions(+) diff --git a/task-9889/tshirt.py b/task-9889/tshirt.py new file mode 100755 index 0000000..b04148b --- /dev/null +++ b/task-9889/tshirt.py @@ -0,0 +1,141 @@ +#!/usr/bin/python + +import urllib, urllib2 +import json +from datetime import datetime + +def print_debug_info(exit_port_check, uptime_percent, avg_bandwidth): + """ Provides debugging information about relay operator's eligibility + for acquiring a t-shirt """ + + print("\nRelay details") + print("=============") + print("Exit to port 80 allowed : " + str(exit_port_check)) + print("Uptime percentage in past 2 months : " + str(uptime_percent)) + print("Average bandwidth in past 2 months : " + str(avg_bandwidth) + "KBytes/s") + + print("\nElligibility") + print("============") + if avg_bandwidth >= 500: + print("Elligible for T-shirt") + print("Reason : Average bandwidth greater than 500KBytes/s") + else: + if exit_port_check is False: + print("Not elligible for T-shirt") + print("Reason : Average bandwidth less than 500KBytes/s and port 80 blocked") + else: + if uptime_percent < 95: + print("Not elligible for T-shirt") + print("Reason : Insufficient relay up time") + else: + if avg_bandwidth < 100: + print("Not elligible for T-shirt") + print("Reason : Average bandwidth less than 100KBytes/s") + else: + print("Elligible for T-shirt") + print("Reason : Average bandwidth greater than 100KBytes/s, relay uptime greater than 95% and port 80 unblocked") + print("") + + +def calculate_sum(relay_history): + """ Calculates the sum of values in 2-month time frame """ + + two_months = 2 * 30 * 86400 + two_months_values = two_months / relay_history['interval'] + _sum = 0 + for i in relay_history['values'][-two_months_values:]: + if i is not 'null' and i is not None: + _sum += (i/1000.0) + return _sum * relay_history['interval'] + + +def fetch_data(doc_type, params): + """ Fetches onionoo data and returns response formatted as a dictionary """ + + # Build the request + base_URL = 'https://onionoo.torproject.org/' + doc_type + request_URL = base_URL + '?' + urllib.urlencode(params) + request = urllib2.Request(url=request_URL) + # Send request to Onionoo + try: + response = urllib2.urlopen(request) + except urllib2.HTTPError, error: + print("Error " + str(error.code) + ": " + error.reason) + exit() + # Exit if no relay object in response + response_dict = json.loads(response.read()) + if response_dict['relays'] == []: + print("Error: No such relay") + exit() + return response_dict + + +def check_exit_port(fingerprint): + """ Checks if relay allows network traffic to exit through port 80 """ + + params = { + 'lookup' : fingerprint, + 'fields' : 'exit_policy_summary' + } + response = fetch_data('details', params) + exit_policy = response['relays'][0]['exit_policy_summary'] + if 'accept' in exit_policy: + return '80' in exit_policy['accept'] + elif 'reject' in exit_policy: + return '80' not in exit_policy['reject'] + else: + return False + + +def get_uptime_percent(fingerprint): + """ Calculates the relay's uptime from onionoo's uptime documents """ + + params = { + 'lookup' : fingerprint + } + response = fetch_data('uptime', params) + uptime = calculate_sum(response['relays'][0]['uptime']['3_months']) + uptime_percent = round(uptime/(2*30*864), 2) + return uptime_percent + + +def get_avg_bandwidth(fingerprint): + """ Calculates average bandwidth of traffic through the relay """ + + params = { + 'lookup' : fingerprint + } + response = fetch_data('bandwidth', params) + + # Calculate the sum of values in response + bandwidth_data = response['relays'][0]['write_history']['3_months'] + traffic_sum = calculate_sum(bandwidth_data) + + # Find number of values between last and today + last_date = datetime.strptime(bandwidth_data['last'], "%Y-%m-%d %H:%M:%S") + today_date = datetime.now() + time_interval = int((today_date - last_date).total_seconds()) + last_today_values = time_interval/bandwidth_data['interval'] + + # Calculate the result + two_months = 2 * 30 * 86400 + two_months_values = two_months/bandwidth_data['interval'] + total_values = two_months_values + last_today_values + result = (traffic_sum * bandwidth_data['factor'])/total_values + + return round(result/1000.0,2) + + +def check_tshirt(fingerprint): + """ Checks if the relay satisfies qualification criteria for a t-shirt """ + + exit_port_check = check_exit_port(fingerprint) + uptime_percent = get_uptime_percent(fingerprint) + avg_bandwidth = get_avg_bandwidth(fingerprint) + print_debug_info(exit_port_check, uptime_percent, avg_bandwidth) + + +if __name__ == "__main__": + fingerprint = raw_input('Enter relay fingerprint: ') + check_tshirt(fingerprint) +

1 0

[metrics-tasks/master] Removed threading and modified the 'calculate_sum' method (#9889)
by karsten＠torproject.org 31 Mar '14

31 Mar '14

commit 2f8696e1492c23a2d08562b2dead973ef0d82d2e Author: Sreenatha Bhatlapenumarthi <sreenatha.dev(a)gmail.com> Date: Sun Mar 23 21:48:31 2014 +0530 Removed threading and modified the 'calculate_sum' method (#9889) --- task-9889/tshirt.py | 149 ++++++++++++++++++++++----------------------------- 1 file changed, 63 insertions(+), 86 deletions(-) diff --git a/task-9889/tshirt.py b/task-9889/tshirt.py index feba0ad..ec67881 100755 --- a/task-9889/tshirt.py +++ b/task-9889/tshirt.py @@ -4,16 +4,10 @@ import urllib, urllib2 import json import threading import _strptime -from datetime import datetime +from datetime import timedelta, datetime TWO_MONTHS = 2 * 30 * 86400 -# Global variables -bandwidth_data = [] -uptime_data = [] -exit_policies = [] -thread_lock = threading.Lock() - def print_debug_info(fingerprint, exit_port_check, uptime_percent, avg_bandwidth): """ Provides debugging information about relay operator's eligibility @@ -59,29 +53,6 @@ def print_debug_info(fingerprint, exit_port_check, uptime_percent, avg_bandwidth print("") -def calculate_sum(relay_history): - """ Calculates the sum of values in 2-month time frame """ - - two_months_values = TWO_MONTHS / relay_history['interval'] - _sum = 0 - for i in relay_history['values'][-two_months_values:]: - if i is not 'null' and i is not None: - _sum += (i/1000.0) - return _sum * relay_history['interval'] - - -def check_in_ports(ports): - """ Checks for port 80 is present in the ports list """ - - for entry in ports: - if entry == '80': - return True - if '-' in entry: - [x,y] = entry.split('-') - if 80 in range(int(x),int(y)): - return True - return False - def fetch_data(doc_type, params): """ Fetches onionoo data and returns response formatted as a dictionary """ @@ -103,6 +74,57 @@ def fetch_data(doc_type, params): return response_dict +def calculate_2mo_avg(response, response_type): + """ Calculates the average of values in 2-month time frame """ + + # Check if required data is present in the response + if response_type == 'uptime': + if '3_months' not in response['uptime'].keys(): + return -1 + data = response['uptime']['3_months'] + elif response_type == 'bandwidth': + if '3_months' not in response['write_history'].keys(): + return -1 + data = response['write_history']['3_months'] + # Sum up all values within past 2 months + _sum = 0 + count = 0 + today = datetime.now() + first = datetime.strptime(data['first'], "%Y-%m-%d %H:%M:%S") + last = datetime.strptime(data['last'], "%Y-%m-%d %H:%M:%S") + for i in range(data['count']): + value_date = first + timedelta(seconds=(i * float(data['interval']))) + if (today - value_date).total_seconds() <= TWO_MONTHS: + if data['values'][i] not in [None, 'null']: + _sum += (data['values'][i]) + count += 1 + # Find number of values between last and today + time_interval = int((today - last).total_seconds()) + last_today_values = time_interval/data['interval'] + # Calculate the result + if response_type == 'uptime': + total_up_time = _sum * data['factor'] * data['interval'] + uptime_percent = round(total_up_time * 100 / TWO_MONTHS, 2) + return uptime_percent + elif response_type == 'bandwidth': + total_values = count + last_today_values + result = (_sum * data['factor'])/total_values + return round(result/1000.0, 2) + + +def check_in_ports(ports): + """ Checks if port 80 is present in the ports list """ + + for entry in ports: + if entry == '80': + return True + if '-' in entry: + [x,y] = entry.split('-') + if 80 in range(int(x),int(y)): + return True + return False + + def check_exit_port(response): """ Checks if relay allows network traffic to exit through port 80 """ @@ -110,54 +132,29 @@ def check_exit_port(response): if 'accept' in exit_policy: return check_in_ports(exit_policy['accept']) elif 'reject' in exit_policy: - return check_in_ports(exit_policy['reject']) + return not check_in_ports(exit_policy['reject']) return False def get_uptime_percent(response): """ Calculates the relay's uptime from onionoo's uptime document """ - if '3_months' not in response['uptime'].keys(): - return -1 - uptime = calculate_sum(response['uptime']['3_months']) - uptime_percent = round(uptime/(2*30*864), 2) - return uptime_percent + return calculate_2mo_avg(response, 'uptime') def get_avg_bandwidth(response): """ Calculates average bandwidth of traffic through the relay """ - if '3_months' not in response['write_history'].keys(): - return -1 - - # Calculate the sum of values in response - bandwidth_data = response['write_history']['3_months'] - traffic_sum = calculate_sum(bandwidth_data) - - # Find number of values between last and today - last_date = datetime.strptime(bandwidth_data['last'], "%Y-%m-%d %H:%M:%S") - today_date = datetime.now() - time_interval = int((today_date - last_date).total_seconds()) - last_today_values = time_interval/bandwidth_data['interval'] + return calculate_2mo_avg(response, 'bandwidth') - # Calculate the result - two_months_values = TWO_MONTHS/bandwidth_data['interval'] - total_values = two_months_values + last_today_values - result = (traffic_sum * bandwidth_data['factor'])/total_values - - return round(result/1000.0,2) - def check_tshirt(search_query): - """ Fetches required onionoo documents and invokes threads """ - - global exit_policies - global uptime_data - global bandwidth_data - global thread_lock + """ Fetches required onionoo documents and evaluates the + t-shirt qualification criteria for each of the relays """ # Fetch the required documents from onionoo params = { + 'type' : 'relay', 'search' : search_query } bandwidth_data = fetch_data('bandwidth', params)['relays'] @@ -168,33 +165,13 @@ def check_tshirt(search_query): exit_policies = fetch_data('details', params)['relays'] print "Fetched details document" - # Create and start the threads - threads = [] for i in range(len(exit_policies)): - threads.append(relay_thread(i)) - threads[-1].start() - # Wait for the threads to finish - for thread in threads: - thread.join() - - -class relay_thread(threading.Thread): - """ A subclass of the Thread class that handles relay-specific data""" - def __init__(self, thread_id): - threading.Thread.__init__(self) - self.thread_id = thread_id - def run(self): - global exit_polices - global uptime_data - global bandwidth_data - fingerprint = exit_policies[self.thread_id]['fingerprint'] - exit_port_check = check_exit_port(exit_policies[self.thread_id]) - uptime_percent = get_uptime_percent(uptime_data[self.thread_id]) - avg_bandwidth = get_avg_bandwidth(bandwidth_data[self.thread_id]) - thread_lock.acquire() + fingerprint = exit_policies[i]['fingerprint'] + exit_port_check = check_exit_port(exit_policies[i]) + uptime_percent = get_uptime_percent(uptime_data[i]) + avg_bandwidth = get_avg_bandwidth(bandwidth_data[i]) print_debug_info(fingerprint, exit_port_check, uptime_percent, avg_bandwidth) - thread_lock.release() - + if __name__ == "__main__": search_query = raw_input('Enter relay search-query : ')

1 0

[metrics-tasks/master] Fix calculate_2mo_avg (#9889).
by karsten＠torproject.org 31 Mar '14

31 Mar '14

commit 2136868ce6632d3bfe1c2dd27d8013691262feb2 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Mar 26 12:31:17 2014 +0100 Fix calculate_2mo_avg (#9889). --- task-9889/tshirt.py | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/task-9889/tshirt.py b/task-9889/tshirt.py index ec67881..581fac3 100755 --- a/task-9889/tshirt.py +++ b/task-9889/tshirt.py @@ -98,18 +98,8 @@ def calculate_2mo_avg(response, response_type): if data['values'][i] not in [None, 'null']: _sum += (data['values'][i]) count += 1 - # Find number of values between last and today - time_interval = int((today - last).total_seconds()) - last_today_values = time_interval/data['interval'] # Calculate the result - if response_type == 'uptime': - total_up_time = _sum * data['factor'] * data['interval'] - uptime_percent = round(total_up_time * 100 / TWO_MONTHS, 2) - return uptime_percent - elif response_type == 'bandwidth': - total_values = count + last_today_values - result = (_sum * data['factor'])/total_values - return round(result/1000.0, 2) + return (_sum * data['factor'])/count def check_in_ports(ports): @@ -139,13 +129,13 @@ def check_exit_port(response): def get_uptime_percent(response): """ Calculates the relay's uptime from onionoo's uptime document """ - return calculate_2mo_avg(response, 'uptime') + return round(calculate_2mo_avg(response, 'uptime') * 100, 2) def get_avg_bandwidth(response): """ Calculates average bandwidth of traffic through the relay """ - return calculate_2mo_avg(response, 'bandwidth') + return round(calculate_2mo_avg(response, 'bandwidth') / 1000.0, 2) def check_tshirt(search_query):

1 0