tor-commits January 2021

tor-commits@lists.torproject.org

16 participants
2244 discussions

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/260' into maint-0.4.5
by nickm＠torproject.org 19 Jan '21

19 Jan '21

commit f79a31f6d50b6b44e0bef091f3e6df0d473141bd Merge: f8cf2546ea f0c29f0883 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 19 12:02:21 2021 -0500 Merge remote-tracking branch 'tor-gitlab/mr/260' into maint-0.4.5 changes/ticket40231 | 4 ++++ src/feature/relay/relay_find_addr.c | 10 +++++++--- src/feature/relay/relay_periodic.c | 2 +- src/feature/relay/router.c | 18 +++++++++--------- src/feature/relay/router.h | 2 +- 5 … [View More]

1 0

[tor/master] Merge branch 'maint-0.4.5'
by nickm＠torproject.org 19 Jan '21

19 Jan '21

commit 4961645254a7cb1bc0a64947995a3ec2d77bffb0 Merge: 85c4087de9 f79a31f6d5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 19 12:02:28 2021 -0500 Merge branch 'maint-0.4.5' changes/ticket40231 | 4 ++++ src/feature/relay/relay_find_addr.c | 10 +++++++--- src/feature/relay/relay_periodic.c | 2 +- src/feature/relay/router.c | 18 +++++++++--------- src/feature/relay/router.h | 2 +- 5 files changed, 22 insertions(+), 14 deletions(-)

1 0

[tor/release-0.4.5] relay: Don't BUG() if we can't find authority descriptor
by nickm＠torproject.org 19 Jan '21

19 Jan '21

commit f0c29f0883045283d86b584f1634770358d84f41 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jan 14 09:56:11 2021 -0500 relay: Don't BUG() if we can't find authority descriptor We can end up trying to find our address from an authority while we don't have yet its descriptor. In this case, don't BUG() and just come back later. Closes #40231 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40231 … [View More]

1 0

[tor/release-0.4.5] relay: Don't flag that we published if descriptor build fails
by nickm＠torproject.org 19 Jan '21

19 Jan '21

commit 743a5ef2b3781b593f5299758d0a7fc78b5816c4 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jan 14 09:42:56 2021 -0500 relay: Don't flag that we published if descriptor build fails In case building the descriptor would fail, we could still flag that we did in fact publish the descriptors leading to no more attempt at publishing it which in turn makes the relay silent for some hours and not try to rebuild the descriptor later. This has … [View More]been spotted with #40231 because the operator used a localhost address for the ORPort and "AssumeReachable 1" leading to this code path where the descriptor failed to build but all conditions to "can I publish" were met. Related to #40231 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/feature/relay/relay_periodic.c | 2 +- src/feature/relay/router.c | 18 +++++++++--------- src/feature/relay/router.h | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/feature/relay/relay_periodic.c b/src/feature/relay/relay_periodic.c index a857ea8d92..a917d90f1a 100644 --- a/src/feature/relay/relay_periodic.c +++ b/src/feature/relay/relay_periodic.c @@ -104,7 +104,7 @@ rotate_onion_key_callback(time_t now, const or_options_t *options) log_info(LD_GENERAL,"Rotating onion key."); rotate_onion_key(); cpuworkers_rotate_keyinfo(); - if (router_rebuild_descriptor(1)<0) { + if (!router_rebuild_descriptor(1)) { log_info(LD_CONFIG, "Couldn't rebuild router descriptor"); } if (advertised_server_mode() && !net_is_disabled()) diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index e018561556..eb1d5a63f1 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -1427,10 +1427,9 @@ consider_publishable_server(int force) return; rebuilt = router_rebuild_descriptor(0); - if (decide_if_publishable_server()) { + if (rebuilt && decide_if_publishable_server()) { set_server_advertised(1); - if (rebuilt == 0) - router_upload_dir_desc_to_dirservers(force); + router_upload_dir_desc_to_dirservers(force); } else { set_server_advertised(0); } @@ -1817,7 +1816,7 @@ router_get_my_extrainfo(void) { if (!server_mode(get_options())) return NULL; - if (router_rebuild_descriptor(0)) + if (!router_rebuild_descriptor(0)) return NULL; return desc_extrainfo; } @@ -2414,9 +2413,10 @@ router_build_fresh_descriptor(routerinfo_t **r, extrainfo_t **e) /** If <b>force</b> is true, or our descriptor is out-of-date, rebuild a fresh * routerinfo, signed server descriptor, and extra-info document for this OR. - * Return 0 on success, -1 on temporary error. + * + * Return true on success, else false on temporary error. */ -int +bool router_rebuild_descriptor(int force) { int err = 0; @@ -2424,13 +2424,13 @@ router_rebuild_descriptor(int force) extrainfo_t *ei; if (desc_clean_since && !force) - return 0; + return true; log_info(LD_OR, "Rebuilding relay descriptor%s", force ? " (forced)" : ""); err = router_build_fresh_descriptor(&ri, &ei); if (err < 0) { - return err; + return false; } routerinfo_free(desc_routerinfo); @@ -2446,7 +2446,7 @@ router_rebuild_descriptor(int force) } desc_dirty_reason = NULL; control_event_my_descriptor_changed(); - return 0; + return true; } /** Called when we have a new set of consensus parameters. */ diff --git a/src/feature/relay/router.h b/src/feature/relay/router.h index 2648bb5112..aa03c27142 100644 --- a/src/feature/relay/router.h +++ b/src/feature/relay/router.h @@ -102,7 +102,7 @@ int router_extrainfo_digest_is_me(const char *digest); int router_is_me(const routerinfo_t *router); bool router_addr_is_my_published_addr(const tor_addr_t *addr); int router_build_fresh_descriptor(routerinfo_t **r, extrainfo_t **e); -int router_rebuild_descriptor(int force); +bool router_rebuild_descriptor(int force); char *router_dump_router_to_string(routerinfo_t *router, const crypto_pk_t *ident_key, const crypto_pk_t *tap_key, [View Less]

1 0

[tor/release-0.4.5] Merge remote-tracking branch 'tor-gitlab/mr/260' into maint-0.4.5
by nickm＠torproject.org 19 Jan '21

19 Jan '21

1 0

[tor/release-0.4.5] Merge branch 'maint-0.4.5' into release-0.4.5
by nickm＠torproject.org 19 Jan '21

19 Jan '21

commit 056b86a8b5df18de0ae79902922334c35cac1537 Merge: c38d46750e f79a31f6d5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 19 12:02:28 2021 -0500 Merge branch 'maint-0.4.5' into release-0.4.5 changes/ticket40231 | 4 ++++ src/feature/relay/relay_find_addr.c | 10 +++++++--- src/feature/relay/relay_periodic.c | 2 +- src/feature/relay/router.c | 18 +++++++++--------- src/feature/relay/router.h | 2 +- 5 files changed, 22 insertions(+), 14 deletions(-)

1 0

[tor/maint-0.4.5] m4: Change LIBS order of TOR_SEARCH_LIBRARY()
by nickm＠torproject.org 19 Jan '21

19 Jan '21

commit c5817a0dafc67882f15730ee818fbcdba1b7b915 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Jan 13 09:48:45 2021 -0500 m4: Change LIBS order of TOR_SEARCH_LIBRARY() Some gcc versions do explode if the order of the linker flags are not correct. One issue was statically building OpenSSL which would require that "-lssl -lcrypto" be put _before_ the "-lpthread -ldl" flags. I have not such problem with GCC 10 but does with GCC 9. Closes #… [View More]

1 0

[tor/maint-0.4.5] configure: Don't print disable option for module that can't be disabled
by nickm＠torproject.org 19 Jan '21

19 Jan '21

commit 8230d2ba3b9d571df4c7a425daa872d41a4f3180 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jan 14 09:25:46 2021 -0500 configure: Don't print disable option for module that can't be disabled This is currently for the dircache module that can not be disabled by itself, it is only disabled from the relay module. Thus, we should not print in the configure summary the disable option. Signed-off-by: David Goulet <dgoulet(a)torproject.org&… [View More]

1 0

[tor/master] m4: Change LIBS order of TOR_SEARCH_LIBRARY()
by nickm＠torproject.org 19 Jan '21

19 Jan '21

1 0

[tor/maint-0.4.5] Merge remote-tracking branch 'tor-gitlab/mr/258' into maint-0.4.5
by nickm＠torproject.org 19 Jan '21

19 Jan '21

commit f8cf2546ea6731d6fdca6a7cfc52d047bc47bb8b Merge: e5a0c739d4 8230d2ba3b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 19 11:59:58 2021 -0500 Merge remote-tracking branch 'tor-gitlab/mr/258' into maint-0.4.5 acinclude.m4 | 4 ++-- changes/ticket33624 | 5 +++++ configure.ac | 10 +++++++++- 3 files changed, 16 insertions(+), 3 deletions(-)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits January 2021