July 2018 - tor-commits - lists.torproject.org

[tor/maint-0.3.4] Merge remote-tracking branch 'github/bug26269_031' into maint-0.3.2
by nickm＠torproject.org 09 Jul '18

09 Jul '18

commit 6ad2c2b92f275cbdf2911f03ffbd1ac708ec6fcc Merge: 4a604d993 ce692332b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 9 10:17:17 2018 -0400 Merge remote-tracking branch 'github/bug26269_031' into maint-0.3.2 src/test/test_entrynodes.c | 6 ++++++ 1 file changed, 6 insertions(+)

1 0

[tor/master] Allow single DA if explicitly configured
by nickm＠torproject.org 09 Jul '18

09 Jul '18

commit 97fad9948312417099fe3d8f5b17484be91ad3f9 Author: Gabriel L. Somlo <gsomlo(a)gmail.com> Date: Mon May 14 11:47:22 2018 -0400 Allow single DA if explicitly configured When on a private network a single directory authority is explicitly configured, allow that DA's instace of tor to pick itself as its own DA, by having router_pick_dirserver_generic() set the PDS_ALLOW_SELF flag when the list of potential sources contains only one element. This would subsequently allow router_pick_trusteddirserver_impl() to calculate is 'requreother' condition as 'false', enabling it to pick itself as a valid DA candidate. Fixes #25928 Signed-off-by: Gabriel Somlo <gsomlo(a)gmail.com> --- src/or/routerlist.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 76a236ff2..e8391724b 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1806,6 +1806,9 @@ router_pick_dirserver_generic(smartlist_t *sourcelist, const routerstatus_t *choice; int busy = 0; + if (smartlist_len(sourcelist) == 1) + flags |= PDS_ALLOW_SELF; + choice = router_pick_trusteddirserver_impl(sourcelist, type, flags, &busy); if (choice || !(flags & PDS_RETRY_IF_NO_SERVERS)) return choice;

1 0

[tor/master] Fix a GCC "potential null dereference" warning.
by nickm＠torproject.org 09 Jul '18

09 Jul '18

commit 015fcd0e1191aa6fec672a6e01bf348638eba8a0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 13 10:34:53 2018 -0400 Fix a GCC "potential null dereference" warning. Fixes bug 26269; bugfix on c30be5a82d47328 in 0.2.8.2-alpha --- changes/bug26269 | 5 +++++ src/or/router.c | 15 +++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/changes/bug26269 b/changes/bug26269 new file mode 100644 index 000000000..73dcdbf5c --- /dev/null +++ b/changes/bug26269 @@ -0,0 +1,5 @@ + o Minor bugfixes (compilation): + - Fix a compilation warning on some versions of GCC when + building code that calls routerinfo_get_my_routerinfo() twice, + assuming that the second call will succeed if the first one did. + Fixes bug 26269; bugfix on 0.2.8.2-alpha. diff --git a/src/or/router.c b/src/or/router.c index 31f2ff00d..35b6bd203 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1859,10 +1859,11 @@ router_compare_to_my_exit_policy(const tor_addr_t *addr, uint16_t port) MOCK_IMPL(int, router_my_exit_policy_is_reject_star,(void)) { - if (!router_get_my_routerinfo()) /* make sure routerinfo exists */ + const routerinfo_t *me = router_get_my_routerinfo(); + if (!me) /* make sure routerinfo exists */ return -1; - return router_get_my_routerinfo()->policy_is_reject_star; + return me->policy_is_reject_star; } /** Return true iff I'm a server and <b>digest</b> is equal to @@ -2432,10 +2433,11 @@ check_descriptor_bandwidth_changed(time_t now) { static time_t last_changed = 0; uint64_t prev, cur; - if (!router_get_my_routerinfo()) + const routerinfo_t *my_ri = router_get_my_routerinfo(); + if (!my_ri) /* make sure routerinfo exists */ return; - prev = router_get_my_routerinfo()->bandwidthcapacity; + prev = my_ri->bandwidthcapacity; cur = we_are_hibernating() ? 0 : rep_hist_bandwidth_assess(); if ((prev != cur && (!prev || !cur)) || cur > prev*2 || @@ -2486,14 +2488,15 @@ check_descriptor_ipaddress_changed(time_t now) const or_options_t *options = get_options(); const char *method = NULL; char *hostname = NULL; + const routerinfo_t *my_ri = router_get_my_routerinfo(); (void) now; - if (router_get_my_routerinfo() == NULL) + if (my_ri == NULL) /* make sure routerinfo exists */ return; /* XXXX ipv6 */ - prev = router_get_my_routerinfo()->addr; + prev = my_ri->addr; if (resolve_my_address(LOG_INFO, options, &cur, &method, &hostname) < 0) { log_info(LD_CONFIG,"options->Address didn't resolve into an IP."); return;

1 0

[tor/master] Merge branch 'bug26269_029' into maint-0.2.9
by nickm＠torproject.org 09 Jul '18

09 Jul '18

commit 8b53dfc3626f293f821b8e8afe88cca62224f20b Merge: 9faa28b60 015fcd0e1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 9 10:14:39 2018 -0400 Merge branch 'bug26269_029' into maint-0.2.9 changes/bug26269 | 5 +++++ src/or/router.c | 15 +++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-)

1 0

[tor/master] test_entrynodes: fix a GCC warning
by nickm＠torproject.org 09 Jul '18

09 Jul '18

commit ce692332b83a9eef1e0ca0ad649ef8cb081d711c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 13 10:45:15 2018 -0400 test_entrynodes: fix a GCC warning Some versions of GCC complain that the bfn_mock_node_get_by_id function might return NULL, but we're assuming that it won't. (We're assuming it won't return NULL because we know in the tests that we're passing it valid IDs.) To make GCC happy, tt_assert() that each node_t is set before using it. Fixes a second case of bug26269; bugfix on 0.3.0.1-alpha. --- src/test/test_entrynodes.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c index 1f008d93b..2162e338d 100644 --- a/src/test/test_entrynodes.c +++ b/src/test/test_entrynodes.c @@ -1113,6 +1113,7 @@ test_entry_guard_update_from_consensus_status(void *arg) for (i = 0; i < 5; ++i) { entry_guard_t *g = smartlist_get(gs->sampled_entry_guards, i); node_t *n = (node_t*) bfn_mock_node_get_by_id(g->identity); + tt_assert(n); n->is_possible_guard = 0; } @@ -1151,6 +1152,7 @@ test_entry_guard_update_from_consensus_status(void *arg) { entry_guard_t *g = smartlist_get(gs->sampled_entry_guards, 0); node_t *n = (node_t*) bfn_mock_node_get_by_id(g->identity); + tt_assert(n); n->is_possible_guard = 1; } { @@ -1158,6 +1160,7 @@ test_entry_guard_update_from_consensus_status(void *arg) */ entry_guard_t *g = smartlist_get(gs->sampled_entry_guards, 5); node_t *n = (node_t*) bfn_mock_node_get_by_id(g->identity); + tt_assert(n); smartlist_remove(big_fake_net_nodes, n); tor_free(n->rs); tor_free(n->md); @@ -1216,6 +1219,7 @@ test_entry_guard_update_from_consensus_repair(void *arg) /* these will get a date. */ entry_guard_t *g = smartlist_get(gs->sampled_entry_guards, i); node_t *n = (node_t*) bfn_mock_node_get_by_id(g->identity); + tt_assert(n); n->is_possible_guard = 0; g->currently_listed = 0; } @@ -1281,6 +1285,7 @@ test_entry_guard_update_from_consensus_remove(void *arg) { entry_guard_t *g = smartlist_get(gs->sampled_entry_guards, 0); node_t *n = (node_t*) bfn_mock_node_get_by_id(g->identity); + tt_assert(n); n->is_possible_guard = 0; g->currently_listed = 0; g->unlisted_since_date = one_day_ago; @@ -1290,6 +1295,7 @@ test_entry_guard_update_from_consensus_remove(void *arg) { entry_guard_t *g = smartlist_get(gs->sampled_entry_guards, 1); node_t *n = (node_t*) bfn_mock_node_get_by_id(g->identity); + tt_assert(n); n->is_possible_guard = 0; g->currently_listed = 0; g->unlisted_since_date = one_year_ago;

1 0

[tor/master] Merge remote-tracking branch 'gsomlo/gls-single-da'
by nickm＠torproject.org 09 Jul '18

09 Jul '18

commit 7746b071d8c8bd3d1175fa02a149d099bf082399 Merge: 4ff93dd94 97fad9948 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 9 09:59:46 2018 -0400 Merge remote-tracking branch 'gsomlo/gls-single-da' src/feature/nodelist/routerlist.c | 3 +++ 1 file changed, 3 insertions(+)

1 0

[tor/maint-0.3.4] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 09 Jul '18

09 Jul '18

commit 250e0fc1c4b1a4d1fdeb38c43399624996babab9 Merge: 69918629f 6ad2c2b92 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 9 10:17:20 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 src/test/test_entrynodes.c | 6 ++++++ 1 file changed, 6 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 09 Jul '18

09 Jul '18

commit 529faef28eb3e8907cfb814516953d6636f50487 Merge: afee78541 69918629f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 9 10:15:16 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug26269 | 5 +++++ src/or/router.c | 17 ++++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --cc src/or/router.c index 3879863e8,a3d7cd373..5485ec913 --- a/src/or/router.c +++ b/src/or/router.c @@@ -2636,12 -2523,11 +2637,14 @@@ check_descriptor_bandwidth_changed(time { static time_t last_changed = 0; uint64_t prev, cur; - if (!router_get_my_routerinfo()) + const routerinfo_t *my_ri = router_get_my_routerinfo(); + if (!my_ri) /* make sure routerinfo exists */ return; - prev = router_get_my_routerinfo()->bandwidthcapacity; + prev = my_ri->bandwidthcapacity; ++ + /* Consider ourselves to have zero bandwidth if we're hibernating or + * shutting down. */ cur = we_are_hibernating() ? 0 : rep_hist_bandwidth_assess(); if ((prev != cur && (!prev || !cur)) || cur > prev*2 || @@@ -3813,4 -3733,4 +3817,3 @@@ router_get_all_orports(const routerinfo fake_node.ri = (routerinfo_t *)ri; return node_get_all_orports(&fake_node); } --

1 0

[tor/master] Merge branch 'maint-0.2.9' into maint-0.3.2
by nickm＠torproject.org 09 Jul '18

09 Jul '18

commit 4a604d99382e4aad3df257e265c852f306f7bc7f Merge: d3894dc34 8b53dfc36 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 9 10:14:43 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug26269 | 5 +++++ src/or/router.c | 15 +++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 09 Jul '18

09 Jul '18

commit 250e0fc1c4b1a4d1fdeb38c43399624996babab9 Merge: 69918629f 6ad2c2b92 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 9 10:17:20 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 src/test/test_entrynodes.c | 6 ++++++ 1 file changed, 6 insertions(+)

1 0