- tor-commits - lists.torproject.org

[tor/maint-0.2.2] Merge branch 'bug1345' into maint-0.2.2
by nickm＠torproject.org 15 May '11

15 May '11

commit a5d40c2d0f1372c119d4a4a4b0287ecea298322e Merge: 228b77f 2bb6bdc Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun May 15 11:40:14 2011 -0400 Merge branch 'bug1345' into maint-0.2.2 changes/bug1345 | 13 +++++++++++ src/common/container.c | 19 +++++++++++++++++ src/common/container.h | 2 + src/or/circuituse.c | 41 +++++++++++++++++++++++------------- src/or/circuituse.h | 2 + src/or/config.c | 23 ++++++++++++++++++++ src/or/connection_edge.c | 51 +++++++++++++++++++++++++++++++++++++++++++-- src/or/connection_edge.h | 1 + src/or/main.c | 1 - src/or/or.h | 3 ++ 10 files changed, 137 insertions(+), 19 deletions(-)

1 0

[tor/master] Accept hs descriptors even if we don't see an HSDir for us
by nickm＠torproject.org 15 May '11

15 May '11

commit 7779c63e93c516c7a2fdfedc8ef73ccdb06e1df8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 12 00:51:11 2011 -0400 Accept hs descriptors even if we don't see an HSDir for us The old behavior contributed to unreliability when hidden services and hsdirs had different consensus versions, and so had different opinions about who should be cacheing hsdir info. Bugfix on 0.2.0.10-alpha; based on discussions surrounding bug 2732. --- changes/bug2732-simple | 7 +++++++ src/or/routerlist.c | 5 ----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/changes/bug2732-simple b/changes/bug2732-simple new file mode 100644 index 0000000..3678361 --- /dev/null +++ b/changes/bug2732-simple @@ -0,0 +1,7 @@ + o Minor bugfixes + - Do not reject hidden service descriptors simply because we don't + think we have not been assigned the HSDir flag. Clients and + hidden services can have a more up-to-date view of the network + consensus, and if they think that the directory authorities + list us a HSDir, we might actually be one. Related to bug 2732; + bugfix on 0.2.0.10-alpha. diff --git a/src/or/routerlist.c b/src/or/routerlist.c index f567ccd..354e026 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -5778,11 +5778,6 @@ hid_serv_acting_as_directory(void) "being a hidden service directory."); return 0; } - if (!rs->is_hs_dir) { - log_info(LD_REND, "We're not listed as a hidden service directory in " - "the consensus, so we won't be one."); - return 0; - } return 1; }

1 0

[tor/master] Rip out more of hid_serv_acting_as_directory
by nickm＠torproject.org 15 May '11

15 May '11

commit 1b512fb9146a4354067491d9d7de92f594a83390 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun May 15 11:14:28 2011 -0400 Rip out more of hid_serv_acting_as_directory rransom notes correctly that now that we aren't checking our HSDir flag, we have no actual reason to check whether we are listed in the consensus at all when determining if we should act like a hidden service directory. --- src/or/routerlist.c | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 354e026..22cf87e 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -5758,8 +5758,6 @@ int hid_serv_acting_as_directory(void) { routerinfo_t *me = router_get_my_routerinfo(); - networkstatus_t *c; - routerstatus_t *rs; if (!me) return 0; if (!get_options()->HidServDirectoryV2) { @@ -5767,17 +5765,6 @@ hid_serv_acting_as_directory(void) "because we have not been configured as such."); return 0; } - if (!(c = networkstatus_get_latest_consensus())) { - log_info(LD_REND, "There's no consensus, so I can't tell if I'm a hidden " - "service directory"); - return 0; - } - rs = networkstatus_vote_find_entry(c, me->cache_info.identity_digest); - if (!rs) { - log_info(LD_REND, "We're not listed in the consensus, so we're not " - "being a hidden service directory."); - return 0; - } return 1; }

1 0

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

15 May '11

commit 2fd9cfdc234f5ec0d6799511be9ad7a57c52b45e Merge: 7236bb7 228b77f Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun May 15 11:23:02 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' Conflicts: src/or/routerlist.c changes/bug2732-simple | 7 +++++++ src/or/routerlist.c | 18 ------------------ 2 files changed, 7 insertions(+), 18 deletions(-) diff --cc src/or/routerlist.c index 8d25eaa,c26f003..2b38319 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@@ -5842,9 -5757,7 +5842,7 @@@ hid_serv_get_responsible_directories(sm int hid_serv_acting_as_directory(void) { - routerinfo_t *me = router_get_my_routerinfo(); + const routerinfo_t *me = router_get_my_routerinfo(); - networkstatus_t *c; - const routerstatus_t *rs; if (!me) return 0; if (!get_options()->HidServDirectoryV2) {

1 0

[tor/master] Merge branch 'bug2732-simpler' into maint-0.2.2
by nickm＠torproject.org 15 May '11

15 May '11

commit 228b77f64e3d545e9d4dac2adc845ecd929c4ac5 Merge: 5f2a1a7 1b512fb Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun May 15 11:17:54 2011 -0400 Merge branch 'bug2732-simpler' into maint-0.2.2 changes/bug2732-simple | 7 +++++++ src/or/routerlist.c | 18 ------------------ 2 files changed, 7 insertions(+), 18 deletions(-)

1 0

[tor/maint-0.2.2] Accept hs descriptors even if we don't see an HSDir for us
by nickm＠torproject.org 15 May '11

15 May '11

commit 7779c63e93c516c7a2fdfedc8ef73ccdb06e1df8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 12 00:51:11 2011 -0400 Accept hs descriptors even if we don't see an HSDir for us The old behavior contributed to unreliability when hidden services and hsdirs had different consensus versions, and so had different opinions about who should be cacheing hsdir info. Bugfix on 0.2.0.10-alpha; based on discussions surrounding bug 2732. --- changes/bug2732-simple | 7 +++++++ src/or/routerlist.c | 5 ----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/changes/bug2732-simple b/changes/bug2732-simple new file mode 100644 index 0000000..3678361 --- /dev/null +++ b/changes/bug2732-simple @@ -0,0 +1,7 @@ + o Minor bugfixes + - Do not reject hidden service descriptors simply because we don't + think we have not been assigned the HSDir flag. Clients and + hidden services can have a more up-to-date view of the network + consensus, and if they think that the directory authorities + list us a HSDir, we might actually be one. Related to bug 2732; + bugfix on 0.2.0.10-alpha. diff --git a/src/or/routerlist.c b/src/or/routerlist.c index f567ccd..354e026 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -5778,11 +5778,6 @@ hid_serv_acting_as_directory(void) "being a hidden service directory."); return 0; } - if (!rs->is_hs_dir) { - log_info(LD_REND, "We're not listed as a hidden service directory in " - "the consensus, so we won't be one."); - return 0; - } return 1; }

1 0

[tor/maint-0.2.2] Rip out more of hid_serv_acting_as_directory
by nickm＠torproject.org 15 May '11

15 May '11

commit 1b512fb9146a4354067491d9d7de92f594a83390 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun May 15 11:14:28 2011 -0400 Rip out more of hid_serv_acting_as_directory rransom notes correctly that now that we aren't checking our HSDir flag, we have no actual reason to check whether we are listed in the consensus at all when determining if we should act like a hidden service directory. --- src/or/routerlist.c | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 354e026..22cf87e 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -5758,8 +5758,6 @@ int hid_serv_acting_as_directory(void) { routerinfo_t *me = router_get_my_routerinfo(); - networkstatus_t *c; - routerstatus_t *rs; if (!me) return 0; if (!get_options()->HidServDirectoryV2) { @@ -5767,17 +5765,6 @@ hid_serv_acting_as_directory(void) "because we have not been configured as such."); return 0; } - if (!(c = networkstatus_get_latest_consensus())) { - log_info(LD_REND, "There's no consensus, so I can't tell if I'm a hidden " - "service directory"); - return 0; - } - rs = networkstatus_vote_find_entry(c, me->cache_info.identity_digest); - if (!rs) { - log_info(LD_REND, "We're not listed in the consensus, so we're not " - "being a hidden service directory."); - return 0; - } return 1; }

1 0

[tor/maint-0.2.2] Merge branch 'bug2732-simpler' into maint-0.2.2
by nickm＠torproject.org 15 May '11

15 May '11

commit 228b77f64e3d545e9d4dac2adc845ecd929c4ac5 Merge: 5f2a1a7 1b512fb Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun May 15 11:17:54 2011 -0400 Merge branch 'bug2732-simpler' into maint-0.2.2 changes/bug2732-simple | 7 +++++++ src/or/routerlist.c | 18 ------------------ 2 files changed, 7 insertions(+), 18 deletions(-)

1 0

[tor/master] Fix bug3183
by nickm＠torproject.org 15 May '11

15 May '11

commit ce3b553926ab13a59963890db93aa9d33b830f95 Author: George Kadianakis <desnacked(a)gmail.com> Date: Sun May 15 03:13:52 2011 +0200 Fix bug3183 --- src/or/status.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/or/status.c b/src/or/status.c index 3a51c8b..34a27b2 100644 --- a/src/or/status.c +++ b/src/or/status.c @@ -85,10 +85,9 @@ log_heartbeat(time_t now) const node_t *myself; or_options_t *options = get_options(); - int is_server = server_mode(options); (void)now; - if (is_server) { + if (public_server_mode(options)) { /* Let's check if we are in the current cached consensus. */ if (!(me = router_get_my_routerinfo())) return -1; /* Something stinks, we won't even attempt this. */

1 0

[tor/master] Merge remote-tracking branch 'asn-mytor/heartbeat'
by nickm＠torproject.org 15 May '11

15 May '11

commit f11c269ed690b2197bad6285d614fe161a0a03bc Merge: 600744b ce3b553 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun May 15 11:07:06 2011 -0400 Merge remote-tracking branch 'asn-mytor/heartbeat' src/or/status.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)

1 0