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

[torspec/master] Remove a clearly bogus statement
by nickm＠torproject.org 26 Apr '11

26 Apr '11

commit 460ac54abfb10b8130d4f0083340f0ef1094893c Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Mon Apr 11 03:09:44 2011 -0700 Remove a clearly bogus statement Each participant uses whatever consensus it received from another party and believed. --- rend-spec.txt | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/rend-spec.txt b/rend-spec.txt index 92661a8..f36db9f 100644 --- a/rend-spec.txt +++ b/rend-spec.txt @@ -510,9 +510,7 @@ consensus status document received from the directory authorities. A hidden service directory is deemed responsible for all descriptor IDs in the interval from its direct predecessor, exclusive, to its own ID, - inclusive; it further holds replicas for its 2 predecessors. A - participant only trusts its own routing list and never learns about - routing information from other parties. + inclusive; it further holds replicas for its 2 predecessors. Bob's OP publishes a new v2 descriptor once an hour or whenever its content changes. V2 descriptors can be found by clients within a given

1 0

[torspec/master] Try to explain which HSDirs are ‘responsible for’ a descriptor
by nickm＠torproject.org 26 Apr '11

26 Apr '11

commit bf46e42ae3f8d30c6cd4bfc6eeb132ad69190f82 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Mon Apr 11 03:27:16 2011 -0700 Try to explain which HSDirs are ‘responsible for’ a descriptor --- rend-spec.txt | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rend-spec.txt b/rend-spec.txt index f36db9f..023c83b 100644 --- a/rend-spec.txt +++ b/rend-spec.txt @@ -508,9 +508,12 @@ service directories with consecutive onion IDs. Bob's OP learns about the complete list of hidden service directories by filtering the consensus status document received from the directory authorities. A - hidden service directory is deemed responsible for all descriptor IDs in - the interval from its direct predecessor, exclusive, to its own ID, - inclusive; it further holds replicas for its 2 predecessors. + hidden service directory is deemed responsible for a descriptor ID if + it has the HSDir flag and its identity digest is one of the first three + identity digests of HSDir relays following the descriptor ID in a + circular list. A hidden service directory will only accept a descriptor + whose timestamp is no more than three days before or one day after the + current time according to the directory's clock. Bob's OP publishes a new v2 descriptor once an hour or whenever its content changes. V2 descriptors can be found by clients within a given

1 0

[torspec/master] Add an XXXX.
by nickm＠torproject.org 26 Apr '11

26 Apr '11

commit 7974465cf7bd15e5bd9b2c920d35ce91e3748265 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Mon Apr 11 03:05:13 2011 -0700 Add an XXXX. --- rend-spec.txt | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/rend-spec.txt b/rend-spec.txt index 3c14ebc..92661a8 100644 --- a/rend-spec.txt +++ b/rend-spec.txt @@ -500,6 +500,9 @@ request to a URL "/tor/rendezvous2/publish" relative to the hidden service directory's root, containing as its body Bob's service descriptor. + [XXX022 Reusing old circuits for HS dir posts is very bad. Do we really + do that? --RR] + At any time, there are 6 hidden service directories responsible for keeping replicas of a descriptor; they consist of 2 sets of 3 hidden service directories with consecutive onion IDs. Bob's OP learns about

1 0

[torspec/master] Merge remote-tracking branch 'rransom/bug2720'
by nickm＠torproject.org 26 Apr '11

26 Apr '11

commit e52b2be829a9a8027c173568b6d841feb3c1096a Merge: 49b1795 bf46e42 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 26 13:23:11 2011 -0400 Merge remote-tracking branch 'rransom/bug2720' rend-spec.txt | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-)

1 0

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

26 Apr '11

commit 33f058a5ba6d57023b00db87c5c9480276bc7acc Merge: 47f4725 b75d1da Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 26 13:12:43 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' src/or/dnsserv.c | 2 +- src/or/eventdns.c | 4 ++-- src/or/eventdns.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)

1 0

[tor/master] Make eventdns server functions const void* to match libevent
by nickm＠torproject.org 26 Apr '11

26 Apr '11

commit 6a829a340477a117d2e7cacc44688988d4b5be41 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 10 16:00:48 2011 -0500 Make eventdns server functions const void* to match libevent partial fix for bug 2332 --- src/or/dnsserv.c | 2 +- src/or/eventdns.c | 4 ++-- src/or/eventdns.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c index c491656..63ecbd2 100644 --- a/src/or/dnsserv.c +++ b/src/or/dnsserv.c @@ -280,7 +280,7 @@ dnsserv_resolved(edge_connection_t *conn, conn->socks_request->command == SOCKS_COMMAND_RESOLVE) { evdns_server_request_add_a_reply(req, name, - 1, (char*)answer, ttl); + 1, answer, ttl); } else if (answer_type == RESOLVED_TYPE_HOSTNAME && conn->socks_request->command == SOCKS_COMMAND_RESOLVE_PTR) { char *ans = tor_strndup(answer, answer_len); diff --git a/src/or/eventdns.c b/src/or/eventdns.c index 75a25bd..04913bf 100644 --- a/src/or/eventdns.c +++ b/src/or/eventdns.c @@ -1668,7 +1668,7 @@ evdns_server_request_add_reply(struct evdns_server_request *_req, int section, c /* exported function */ int -evdns_server_request_add_a_reply(struct evdns_server_request *req, const char *name, int n, void *addrs, int ttl) +evdns_server_request_add_a_reply(struct evdns_server_request *req, const char *name, int n, const void *addrs, int ttl) { return evdns_server_request_add_reply( req, EVDNS_ANSWER_SECTION, name, TYPE_A, CLASS_INET, @@ -1677,7 +1677,7 @@ evdns_server_request_add_a_reply(struct evdns_server_request *req, const char *n /* exported function */ int -evdns_server_request_add_aaaa_reply(struct evdns_server_request *req, const char *name, int n, void *addrs, int ttl) +evdns_server_request_add_aaaa_reply(struct evdns_server_request *req, const char *name, int n, const void *addrs, int ttl) { return evdns_server_request_add_reply( req, EVDNS_ANSWER_SECTION, name, TYPE_AAAA, CLASS_INET, diff --git a/src/or/eventdns.h b/src/or/eventdns.h index bf3b64d..2fe4ac9 100644 --- a/src/or/eventdns.h +++ b/src/or/eventdns.h @@ -323,8 +323,8 @@ struct evdns_server_port *evdns_add_server_port(int socket, int is_tcp, evdns_re void evdns_close_server_port(struct evdns_server_port *port); int evdns_server_request_add_reply(struct evdns_server_request *req, int section, const char *name, int type, int class, int ttl, int datalen, int is_name, const char *data); -int evdns_server_request_add_a_reply(struct evdns_server_request *req, const char *name, int n, void *addrs, int ttl); -int evdns_server_request_add_aaaa_reply(struct evdns_server_request *req, const char *name, int n, void *addrs, int ttl); +int evdns_server_request_add_a_reply(struct evdns_server_request *req, const char *name, int n, const void *addrs, int ttl); +int evdns_server_request_add_aaaa_reply(struct evdns_server_request *req, const char *name, int n, const void *addrs, int ttl); int evdns_server_request_add_ptr_reply(struct evdns_server_request *req, struct in_addr *in, const char *inaddr_name, const char *hostname, int ttl); int evdns_server_request_add_cname_reply(struct evdns_server_request *req, const char *name, const char *cname, int ttl);

1 0

[tor/master] Merge remote-tracking branch 'public/bug2332' into maint-0.2.2
by nickm＠torproject.org 26 Apr '11

26 Apr '11

commit b75d1daf40c0d104b8224df337949753a5e65e74 Merge: bb6d45a 6a829a3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 26 13:10:54 2011 -0400 Merge remote-tracking branch 'public/bug2332' into maint-0.2.2 src/or/dnsserv.c | 2 +- src/or/eventdns.c | 4 ++-- src/or/eventdns.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --cc src/or/dnsserv.c index f7a8d35,63ecbd2..243b730 --- a/src/or/dnsserv.c +++ b/src/or/dnsserv.c @@@ -280,9 -280,8 +280,9 @@@ dnsserv_resolved(edge_connection_t *con conn->socks_request->command == SOCKS_COMMAND_RESOLVE) { evdns_server_request_add_a_reply(req, name, - 1, (char*)answer, ttl); + 1, answer, ttl); } else if (answer_type == RESOLVED_TYPE_HOSTNAME && + answer_len < 256 && conn->socks_request->command == SOCKS_COMMAND_RESOLVE_PTR) { char *ans = tor_strndup(answer, answer_len); evdns_server_request_add_ptr_reply(req, NULL,

1 0

[tor/maint-0.2.2] Make eventdns server functions const void* to match libevent
by nickm＠torproject.org 26 Apr '11

26 Apr '11

commit 6a829a340477a117d2e7cacc44688988d4b5be41 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 10 16:00:48 2011 -0500 Make eventdns server functions const void* to match libevent partial fix for bug 2332 --- src/or/dnsserv.c | 2 +- src/or/eventdns.c | 4 ++-- src/or/eventdns.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c index c491656..63ecbd2 100644 --- a/src/or/dnsserv.c +++ b/src/or/dnsserv.c @@ -280,7 +280,7 @@ dnsserv_resolved(edge_connection_t *conn, conn->socks_request->command == SOCKS_COMMAND_RESOLVE) { evdns_server_request_add_a_reply(req, name, - 1, (char*)answer, ttl); + 1, answer, ttl); } else if (answer_type == RESOLVED_TYPE_HOSTNAME && conn->socks_request->command == SOCKS_COMMAND_RESOLVE_PTR) { char *ans = tor_strndup(answer, answer_len); diff --git a/src/or/eventdns.c b/src/or/eventdns.c index 75a25bd..04913bf 100644 --- a/src/or/eventdns.c +++ b/src/or/eventdns.c @@ -1668,7 +1668,7 @@ evdns_server_request_add_reply(struct evdns_server_request *_req, int section, c /* exported function */ int -evdns_server_request_add_a_reply(struct evdns_server_request *req, const char *name, int n, void *addrs, int ttl) +evdns_server_request_add_a_reply(struct evdns_server_request *req, const char *name, int n, const void *addrs, int ttl) { return evdns_server_request_add_reply( req, EVDNS_ANSWER_SECTION, name, TYPE_A, CLASS_INET, @@ -1677,7 +1677,7 @@ evdns_server_request_add_a_reply(struct evdns_server_request *req, const char *n /* exported function */ int -evdns_server_request_add_aaaa_reply(struct evdns_server_request *req, const char *name, int n, void *addrs, int ttl) +evdns_server_request_add_aaaa_reply(struct evdns_server_request *req, const char *name, int n, const void *addrs, int ttl) { return evdns_server_request_add_reply( req, EVDNS_ANSWER_SECTION, name, TYPE_AAAA, CLASS_INET, diff --git a/src/or/eventdns.h b/src/or/eventdns.h index bf3b64d..2fe4ac9 100644 --- a/src/or/eventdns.h +++ b/src/or/eventdns.h @@ -323,8 +323,8 @@ struct evdns_server_port *evdns_add_server_port(int socket, int is_tcp, evdns_re void evdns_close_server_port(struct evdns_server_port *port); int evdns_server_request_add_reply(struct evdns_server_request *req, int section, const char *name, int type, int class, int ttl, int datalen, int is_name, const char *data); -int evdns_server_request_add_a_reply(struct evdns_server_request *req, const char *name, int n, void *addrs, int ttl); -int evdns_server_request_add_aaaa_reply(struct evdns_server_request *req, const char *name, int n, void *addrs, int ttl); +int evdns_server_request_add_a_reply(struct evdns_server_request *req, const char *name, int n, const void *addrs, int ttl); +int evdns_server_request_add_aaaa_reply(struct evdns_server_request *req, const char *name, int n, const void *addrs, int ttl); int evdns_server_request_add_ptr_reply(struct evdns_server_request *req, struct in_addr *in, const char *inaddr_name, const char *hostname, int ttl); int evdns_server_request_add_cname_reply(struct evdns_server_request *req, const char *name, const char *cname, int ttl);

1 0

[tor/maint-0.2.2] Merge remote-tracking branch 'public/bug2332' into maint-0.2.2
by nickm＠torproject.org 26 Apr '11

26 Apr '11

commit b75d1daf40c0d104b8224df337949753a5e65e74 Merge: bb6d45a 6a829a3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 26 13:10:54 2011 -0400 Merge remote-tracking branch 'public/bug2332' into maint-0.2.2 src/or/dnsserv.c | 2 +- src/or/eventdns.c | 4 ++-- src/or/eventdns.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --cc src/or/dnsserv.c index f7a8d35,63ecbd2..243b730 --- a/src/or/dnsserv.c +++ b/src/or/dnsserv.c @@@ -280,9 -280,8 +280,9 @@@ dnsserv_resolved(edge_connection_t *con conn->socks_request->command == SOCKS_COMMAND_RESOLVE) { evdns_server_request_add_a_reply(req, name, - 1, (char*)answer, ttl); + 1, answer, ttl); } else if (answer_type == RESOLVED_TYPE_HOSTNAME && + answer_len < 256 && conn->socks_request->command == SOCKS_COMMAND_RESOLVE_PTR) { char *ans = tor_strndup(answer, answer_len); evdns_server_request_add_ptr_reply(req, NULL,

1 0

[arm/master] fix: minor commenting correction on lsof results
by atagar＠torproject.org 26 Apr '11

26 Apr '11

commit e4bf17a30fbeaa24f6980476ceb8e1a51ad0ba62 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Apr 26 08:55:19 2011 -0700 fix: minor commenting correction on lsof results A previous commit noted that lsof queries return itself in the results, so correcting the comment on this. --- src/util/torTools.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index f4a29af..5d8ffd8 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -225,8 +225,8 @@ def getPid(controlPort=9051, pidFilePath=None): try: results = sysTools.call("lsof -wnPi | egrep \"^tor.*:%i\"" % controlPort) - # This can result in multiple entries with the same pid (maybe from the - # query itself?). Checking all lines to see if they have the same pid. + # This can result in multiple entries with the same pid (from the query + # itself). Checking all lines to see if they're in agreement about the pid. if results: pid = ""

1 0