- tor-commits - lists.torproject.org

[flashproxy/master] Remove "CircuitBuildTimeout 60".
by dcf＠torproject.org 05 Jul '12

05 Jul '12

commit 45509aa495e1f9366ca27fc23587940fb3039692 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jul 5 02:53:10 2012 -0700 Remove "CircuitBuildTimeout 60". The warning referred to in e66c2962 seems to be a bug only in the warning, and the default timeout is actually in effect. See Trac ticket --- experiments/exercise/exercise.sh | 2 +- torrc | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/experiments/exercise/exercise.sh b/experiments/exercise/exercise.sh index dc6ca42..117b2f5 100755 --- a/experiments/exercise/exercise.sh +++ b/experiments/exercise/exercise.sh @@ -26,7 +26,7 @@ PIDS_TO_KILL+=($!) sleep 20 -"$TOR" ClientTransportPlugin "websocket socks4 127.0.0.1:$LOCAL_PORT" UseBridges 1 Bridge "websocket 127.0.0.1:$LOCAL_PORT" LearnCircuitBuildTimeout 0 CircuitBuildTimeout 60 & +"$TOR" ClientTransportPlugin "websocket socks4 127.0.0.1:$LOCAL_PORT" UseBridges 1 Bridge "websocket 127.0.0.1:$LOCAL_PORT" LearnCircuitBuildTimeout 0 & PIDS_TO_KILL+=($!) sleep 60 diff --git a/torrc b/torrc index c25a6c5..36b4f93 100644 --- a/torrc +++ b/torrc @@ -7,4 +7,3 @@ ClientTransportPlugin websocket socks4 127.0.0.1:9001 UseBridges 1 Bridge websocket 127.0.0.1:9001 LearnCircuitBuildTimeout 0 -CircuitBuildTimeout 60

1 0

[flashproxy/master] Use an explicit "python" command line in torrc.
by dcf＠torproject.org 05 Jul '12

05 Jul '12

commit 3694b80e6e3aad2aa9f5375eecbe4b41d93c1025 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Jul 4 14:06:55 2012 -0700 Use an explicit "python" command line in torrc. --- torrc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/torrc b/torrc index f13cf87..6cf16e9 100644 --- a/torrc +++ b/torrc @@ -1,6 +1,6 @@ ## Configuration file for Tor over flash proxies. ## Usage: -## connector.py +## python connector.py ## tor -f torrc ClientTransportPlugin websocket socks4 127.0.0.1:9001

1 0

[flashproxy/master] Add "LearnCircuitBuildTimeout 0" to torrc.
by dcf＠torproject.org 05 Jul '12

05 Jul '12

commit e66c2962b39e1bcf59f144665132e073338d9739 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Jul 4 14:08:58 2012 -0700 Add "LearnCircuitBuildTimeout 0" to torrc. This improves reliability when reconnecting over flash proxies; the rational is given in a1bf13ae. I am adding an explicit "CircuitBuildTimeout 60", even though tor(1) says that is the default, because without it I get the message Jul 04 14:08:37.683 [warn] CircuitBuildTimeout is shorter (0 seconds) than recommended (10 seconds), and LearnCircuitBuildTimeout is disabled. If tor isn't working, raise this value or enable LearnCircuitBuildTimeout. --- torrc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/torrc b/torrc index 6cf16e9..c25a6c5 100644 --- a/torrc +++ b/torrc @@ -6,3 +6,5 @@ ClientTransportPlugin websocket socks4 127.0.0.1:9001 UseBridges 1 Bridge websocket 127.0.0.1:9001 +LearnCircuitBuildTimeout 0 +CircuitBuildTimeout 60

1 0

[flashproxy/master] Add "CircuitBuildTimeout 60" to flashproxy-exercise configuration.
by dcf＠torproject.org 05 Jul '12

05 Jul '12

commit 86b9ccdbbe2daa89dd4ec35b7b70ccdae1b3cda2 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Jul 4 14:11:42 2012 -0700 Add "CircuitBuildTimeout 60" to flashproxy-exercise configuration. See similar change in 3694b80e. --- experiments/exercise/exercise.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/experiments/exercise/exercise.sh b/experiments/exercise/exercise.sh index 117b2f5..dc6ca42 100755 --- a/experiments/exercise/exercise.sh +++ b/experiments/exercise/exercise.sh @@ -26,7 +26,7 @@ PIDS_TO_KILL+=($!) sleep 20 -"$TOR" ClientTransportPlugin "websocket socks4 127.0.0.1:$LOCAL_PORT" UseBridges 1 Bridge "websocket 127.0.0.1:$LOCAL_PORT" LearnCircuitBuildTimeout 0 & +"$TOR" ClientTransportPlugin "websocket socks4 127.0.0.1:$LOCAL_PORT" UseBridges 1 Bridge "websocket 127.0.0.1:$LOCAL_PORT" LearnCircuitBuildTimeout 0 CircuitBuildTimeout 60 & PIDS_TO_KILL+=($!) sleep 60

1 0

[tor/master] On windows, ENOBUFS starts with WSA. #6296. Fix on 0.2.18-rc
by nickm＠torproject.org 05 Jul '12

05 Jul '12

commit e9b33ed1bf4140e3aeda5eb9126027fbe5a3ec5a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 5 05:01:00 2012 -0400 On windows, ENOBUFS starts with WSA. #6296. Fix on 0.2.18-rc --- changes/bug6296 | 4 ++++ src/common/compat.h | 3 +++ src/or/connection.c | 4 ++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/changes/bug6296 b/changes/bug6296 new file mode 100644 index 0000000..b452b17 --- /dev/null +++ b/changes/bug6296 @@ -0,0 +1,4 @@ + o Minor bugfixes: + + - Instead of ENOBUFS on Windows, say WSAENOBUFS. Fixes + compilation on Windows. Fixes bug 6296; bugfix on 0.2.3.18-rc. diff --git a/src/common/compat.h b/src/common/compat.h index 4efb0c8..42648bb 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -500,6 +500,8 @@ int network_init(void); * the actual errno after a socket operation fails. */ #if defined(_WIN32) +/** Expands to WSAe on Windows, and to e elsewhere. */ +#define SOCK_ERRNO(e) WSA##e /** Return true if e is EAGAIN or the local equivalent. */ #define ERRNO_IS_EAGAIN(e) ((e) == EAGAIN || (e) == WSAEWOULDBLOCK) /** Return true if e is EINPROGRESS or the local equivalent. */ @@ -520,6 +522,7 @@ int network_init(void); int tor_socket_errno(tor_socket_t sock); const char *tor_socket_strerror(int e); #else +#define SOCK_ERRNO(e) e #define ERRNO_IS_EAGAIN(e) ((e) == EAGAIN) #define ERRNO_IS_EINPROGRESS(e) ((e) == EINPROGRESS) #define ERRNO_IS_CONN_EINPROGRESS(e) ((e) == EINPROGRESS) diff --git a/src/or/connection.c b/src/or/connection.c index af5c011..95101ef 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1336,7 +1336,7 @@ connection_connect(connection_t *conn, const char *address, if (get_n_open_sockets() >= get_options()->_ConnLimit-1) { warn_too_many_conns(); - *socket_error = ENOBUFS; + *socket_error = SOCK_ERRNO(ENOBUFS); return -1; } @@ -1431,7 +1431,7 @@ connection_connect(connection_t *conn, const char *address, conn->s = s; if (connection_add_connecting(conn) < 0) { /* no space, forget it */ - *socket_error = ENOBUFS; + *socket_error = SOCK_ERRNO(ENOBUFS); return -1; } return inprogress ? 0 : 1;

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'
by nickm＠torproject.org 05 Jul '12

05 Jul '12

commit 7e8d7a017e130cc7855aa508e8a37321438b6e52 Merge: 46434ec e9b33ed Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 5 05:08:54 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' changes/bug6296 | 4 ++++ src/common/compat.h | 3 +++ src/or/connection.c | 4 ++-- 3 files changed, 9 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.3] On windows, ENOBUFS starts with WSA. #6296. Fix on 0.2.18-rc
by nickm＠torproject.org 05 Jul '12

05 Jul '12

commit e9b33ed1bf4140e3aeda5eb9126027fbe5a3ec5a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 5 05:01:00 2012 -0400 On windows, ENOBUFS starts with WSA. #6296. Fix on 0.2.18-rc --- changes/bug6296 | 4 ++++ src/common/compat.h | 3 +++ src/or/connection.c | 4 ++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/changes/bug6296 b/changes/bug6296 new file mode 100644 index 0000000..b452b17 --- /dev/null +++ b/changes/bug6296 @@ -0,0 +1,4 @@ + o Minor bugfixes: + + - Instead of ENOBUFS on Windows, say WSAENOBUFS. Fixes + compilation on Windows. Fixes bug 6296; bugfix on 0.2.3.18-rc. diff --git a/src/common/compat.h b/src/common/compat.h index 4efb0c8..42648bb 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -500,6 +500,8 @@ int network_init(void); * the actual errno after a socket operation fails. */ #if defined(_WIN32) +/** Expands to WSAe on Windows, and to e elsewhere. */ +#define SOCK_ERRNO(e) WSA##e /** Return true if e is EAGAIN or the local equivalent. */ #define ERRNO_IS_EAGAIN(e) ((e) == EAGAIN || (e) == WSAEWOULDBLOCK) /** Return true if e is EINPROGRESS or the local equivalent. */ @@ -520,6 +522,7 @@ int network_init(void); int tor_socket_errno(tor_socket_t sock); const char *tor_socket_strerror(int e); #else +#define SOCK_ERRNO(e) e #define ERRNO_IS_EAGAIN(e) ((e) == EAGAIN) #define ERRNO_IS_EINPROGRESS(e) ((e) == EINPROGRESS) #define ERRNO_IS_CONN_EINPROGRESS(e) ((e) == EINPROGRESS) diff --git a/src/or/connection.c b/src/or/connection.c index af5c011..95101ef 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1336,7 +1336,7 @@ connection_connect(connection_t *conn, const char *address, if (get_n_open_sockets() >= get_options()->_ConnLimit-1) { warn_too_many_conns(); - *socket_error = ENOBUFS; + *socket_error = SOCK_ERRNO(ENOBUFS); return -1; } @@ -1431,7 +1431,7 @@ connection_connect(connection_t *conn, const char *address, conn->s = s; if (connection_add_connecting(conn) < 0) { /* no space, forget it */ - *socket_error = ENOBUFS; + *socket_error = SOCK_ERRNO(ENOBUFS); return -1; } return inprogress ? 0 : 1;

1 0

[metrics-tasks/master] Take out two lines from .gitignore.
by karsten＠torproject.org 05 Jul '12

05 Jul '12

commit c4c6d16a81e28d2ab92f6536eb31ce9366700bb3 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jul 5 10:27:27 2012 +0200 Take out two lines from .gitignore. --- task-6232/.gitignore | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/task-6232/.gitignore b/task-6232/.gitignore index 15236f0..8a0c627 100644 --- a/task-6232/.gitignore +++ b/task-6232/.gitignore @@ -1,5 +1,3 @@ in/ -data/ -foo entropy.csv

1 0

[metrics-tasks/master] Take into account the router flags
by karsten＠torproject.org 05 Jul '12

05 Jul '12

commit 98859a1e367c4b5728fb0d7bc2c5acf8e99d2208 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Thu Jul 5 10:08:40 2012 +0200 Take into account the router flags Measure entropy for exit and guard nodes --- task-6232/pyentropy.py | 45 ++++++++++++++++++++++++++++++++++++--------- 1 files changed, 36 insertions(+), 9 deletions(-) diff --git a/task-6232/pyentropy.py b/task-6232/pyentropy.py index 226aca8..6fa5b86 100644 --- a/task-6232/pyentropy.py +++ b/task-6232/pyentropy.py @@ -1,6 +1,6 @@ """ Usage - python pyentropy.py <consensus-dir> <output-file> -Output - A CSV file of the format <valid-after>,<entropy> +Output - A CSV file of the format <valid-after>,<entropy for all nodes>,<entropy for exitnodes>,<entropy for guardnodes> rsync -arz --delete metrics.torproject.org::metrics-recent/relay-descriptors/consensuses in """ @@ -20,6 +20,8 @@ class Router: self.bandwidth = None self.flags = None self.probability = None + self.is_exit = None + self.is_guard = None def add(self, key, values): if key == 'r': @@ -28,7 +30,11 @@ class Router: self.bandwidth = int(values[0].split('=')[1]) if key == 's': self.flags = values - + if "Exit" in self.flags: + self.is_exit = True + if "Guard" in self.flags: + self.is_guard = True + def run(file_name): routers = [] # parse consensus @@ -47,11 +53,22 @@ def run(file_name): elif key in KEYS: router.add(key, values) - # build hash table with freq. distribution - # key: bandwidth - # value: number of bandwidth's observations - bw_dist = {} + # build hash table with freq. distribution + # key: bandwidth + # value: number of bandwidth's observations + + bw_dist, bw_dist_exit, bw_dist_guard = {}, {}, {} for router in routers: + if router.is_exit: + if bw_dist_exit.has_key(router.bandwidth): + bw_dist_exit[router.bandwidth] += 1 + else: + bw_dist_exit[router.bandwidth] = 1 + if router.is_guard: + if bw_dist_guard.has_key(router.bandwidth): + bw_dist_guard[router.bandwidth] += 1 + else: + bw_dist_guard[router.bandwidth] = 1 if bw_dist.has_key(router.bandwidth): bw_dist[router.bandwidth] += 1 else: @@ -61,13 +78,23 @@ def run(file_name): print "Error: amount of routers must be > 0." return; - entropy = 0.0 + entropy, entropy_exit, entropy_guard = 0.0, 0.0, 0.0 for bw in bw_dist.iterkeys(): - # p = probability of one particular bandwidth + # p = probability of one particular bandwidth p = float(bw_dist[bw]) / len(routers) entropy += -(p * math.log(p, 2)) + + for bw in bw_dist_exit.iterkeys(): + # p = probability of one particular bandwidth + p = float(bw_dist[bw]) / len(routers) + entropy_exit += -(p * math.log(p, 2)) + + for bw in bw_dist_guard.iterkeys(): + # p = probability of one particular bandwidth + p = float(bw_dist[bw]) / len(routers) + entropy_guard += -(p * math.log(p, 2)) - return ",".join([valid_after, str(entropy)]) + return ",".join([valid_after, str(entropy), str(entropy_exit), str(entropy_guard)]) def usage(): print "Usage - python pyentropy.py <consensus-dir> <output-file>"

1 0

[metrics-tasks/master] Replace tabs with spaces, add a usage function
by karsten＠torproject.org 05 Jul '12

05 Jul '12

commit 4d36a13e8b7790692e4969c8d4005a354bb249c1 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Thu Jul 5 00:28:26 2012 +0200 Replace tabs with spaces, add a usage function --- task-6232/.gitignore | 2 + task-6232/pyentropy.py | 121 ++++++++++++++++++++++++----------------------- 2 files changed, 64 insertions(+), 59 deletions(-) diff --git a/task-6232/.gitignore b/task-6232/.gitignore index 8a0c627..15236f0 100644 --- a/task-6232/.gitignore +++ b/task-6232/.gitignore @@ -1,3 +1,5 @@ in/ +data/ +foo entropy.csv diff --git a/task-6232/pyentropy.py b/task-6232/pyentropy.py index f13f709..226aca8 100644 --- a/task-6232/pyentropy.py +++ b/task-6232/pyentropy.py @@ -14,66 +14,69 @@ KEYS = ['r','s','v','w','p','m'] class Router: - def __init__(self): - self.lines = [] - self.nick = None - self.bandwidth = None - self.flags = None - self.probability = None - - def add(self, key, values): - if key == 'r': - self.nick = values[0] - if key == 'w': - self.bandwidth = int(values[0].split('=')[1]) - if key == 's': - self.flags = values - - + def __init__(self): + self.lines = [] + self.nick = None + self.bandwidth = None + self.flags = None + self.probability = None + + def add(self, key, values): + if key == 'r': + self.nick = values[0] + if key == 'w': + self.bandwidth = int(values[0].split('=')[1]) + if key == 's': + self.flags = values + def run(file_name): - routers = [] - # parse consensus - with open(file_name, 'r') as f: - for line in f.readlines(): - key = line.split()[0] - values = line.split()[1:] - if key =='r': - router = Router() - router.add(key, values) - elif key == 'p': - router.add(key, values) - routers.append(router) - elif key == 'valid-after': - valid_after = ' '.join(values) - elif key in KEYS: - router.add(key, values) - - # build hash table with freq. distribution - # key: bandwidth - # value: number of bandwidth's observations - bw_dist = {} - for router in routers: - if bw_dist.has_key(router.bandwidth): - bw_dist[router.bandwidth] += 1 - else: - bw_dist[router.bandwidth] = 1 - - if len(routers) <= 0: - print "Error: amount of routers must be > 0." - return; - - print "calculating entropy" - entropy = 0.0 - for bw in bw_dist.iterkeys(): - # p = probability of one particular bandwidth - p = float(bw_dist[bw]) / len(routers) - entropy += -(p * math.log(p, 2)) - - return ",".join([valid_after, str(entropy)]) + routers = [] + # parse consensus + with open(file_name, 'r') as f: + for line in f.readlines(): + key = line.split()[0] + values = line.split()[1:] + if key =='r': + router = Router() + router.add(key, values) + elif key == 'p': + router.add(key, values) + routers.append(router) + elif key == 'valid-after': + valid_after = ' '.join(values) + elif key in KEYS: + router.add(key, values) + + # build hash table with freq. distribution + # key: bandwidth + # value: number of bandwidth's observations + bw_dist = {} + for router in routers: + if bw_dist.has_key(router.bandwidth): + bw_dist[router.bandwidth] += 1 + else: + bw_dist[router.bandwidth] = 1 + + if len(routers) <= 0: + print "Error: amount of routers must be > 0." + return; + + entropy = 0.0 + for bw in bw_dist.iterkeys(): + # p = probability of one particular bandwidth + p = float(bw_dist[bw]) / len(routers) + entropy += -(p * math.log(p, 2)) + + return ",".join([valid_after, str(entropy)]) +def usage(): + print "Usage - python pyentropy.py <consensus-dir> <output-file>" if __name__ == "__main__": - with open(sys.argv[2], 'w') as f: - for file_name in os.listdir(sys.argv[1]): - string = run(os.path.join(sys.argv[1], file_name)) - f.write("%s\n" % (string)) + if len(sys.argv) != 3: + usage() + else: + with open(sys.argv[2], 'w') as f: + for file_name in os.listdir(sys.argv[1]): + string = run(os.path.join(sys.argv[1], file_name)) + f.write("%s\n" % (string))

1 0