January 2017 - tor-commits - lists.torproject.org

[tor/master] Remove some now-spurious blocks and indentation.
by nickm＠torproject.org 24 Jan '17

24 Jan '17

commit 3efe8bb8ac6c1b62cc488e72b890b699f2fe7081 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 18 15:45:02 2017 -0500 Remove some now-spurious blocks and indentation. --- src/or/entrynodes.c | 137 +++++++++++++++++++++++++--------------------------- 1 file changed, 65 insertions(+), 72 deletions(-) diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 22cab26..e99aa00 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -2944,22 +2944,20 @@ num_bridges_usable(void) { int n_options = 0; - if (1) { - /* XXXX prop271 Is this quite right? */ - tor_assert(get_options()->UseBridges); - guard_selection_t *gs = get_guard_selection_info(); - tor_assert(gs->type == GS_TYPE_BRIDGE); + /* XXXX prop271 Is this quite right? */ + tor_assert(get_options()->UseBridges); + guard_selection_t *gs = get_guard_selection_info(); + tor_assert(gs->type == GS_TYPE_BRIDGE); - SMARTLIST_FOREACH_BEGIN(gs->sampled_entry_guards, entry_guard_t *, guard) { - if (guard->is_reachable == GUARD_REACHABLE_NO) - continue; - if (tor_digest_is_zero(guard->identity)) - continue; - const node_t *node = node_get_by_id(guard->identity); - if (node && node->ri) - ++n_options; - } SMARTLIST_FOREACH_END(guard); - } + SMARTLIST_FOREACH_BEGIN(gs->sampled_entry_guards, entry_guard_t *, guard) { + if (guard->is_reachable == GUARD_REACHABLE_NO) + continue; + if (tor_digest_is_zero(guard->identity)) + continue; + const node_t *node = node_get_by_id(guard->identity); + if (node && node->ri) + ++n_options; + } SMARTLIST_FOREACH_END(guard); return n_options; } @@ -3106,27 +3104,26 @@ getinfo_helper_format_single_entry_guard(const entry_guard_t *e) char tbuf[ISO_TIME_LEN+1]; char nbuf[MAX_VERBOSE_NICKNAME_LEN+1]; - if (1) { - /* modern case. This is going to be a bit tricky, since the status - * codes above weren't really intended for prop271 guards. - * - * XXXX use a more appropriate format for exporting this information - */ - if (e->confirmed_idx < 0) { - status = "never-connected"; - } else if (! e->currently_listed) { - when = e->unlisted_since_date; - status = "unusable"; - } else if (! e->is_filtered_guard) { - status = "unusable"; - } else if (e->is_reachable == GUARD_REACHABLE_NO) { - when = e->failing_since; - status = "down"; - } else { - status = "up"; - } + /* This is going to be a bit tricky, since the status + * codes weren't really intended for prop271 guards. + * + * XXXX use a more appropriate format for exporting this information + */ + if (e->confirmed_idx < 0) { + status = "never-connected"; + } else if (! e->currently_listed) { + when = e->unlisted_since_date; + status = "unusable"; + } else if (! e->is_filtered_guard) { + status = "unusable"; + } else if (e->is_reachable == GUARD_REACHABLE_NO) { + when = e->failing_since; + status = "down"; + } else { + status = "up"; } + node = entry_guard_find_node(e); if (node) { node_get_verbose_nickname(node, nbuf); @@ -3247,26 +3244,24 @@ const node_t * guards_choose_guard(cpath_build_state_t *state, circuit_guard_state_t **guard_state_out) { - if (1) { - const node_t *r = NULL; - const uint8_t *exit_id = NULL; - entry_guard_restriction_t *rst = NULL; - // XXXX prop271 spec deviation -- use of restriction here. - if (state && (exit_id = build_state_get_exit_rsa_id(state))) { - /* We're building to a targeted exit node, so that node can't be - * chosen as our guard for this circuit. */ - rst = tor_malloc_zero(sizeof(entry_guard_restriction_t)); - memcpy(rst->exclude_id, exit_id, DIGEST_LEN); - } - if (entry_guard_pick_for_circuit(get_guard_selection_info(), - GUARD_USAGE_TRAFFIC, - rst, - &r, - guard_state_out) < 0) { - tor_assert(r == NULL); - } - return r; + const node_t *r = NULL; + const uint8_t *exit_id = NULL; + entry_guard_restriction_t *rst = NULL; + // XXXX prop271 spec deviation -- use of restriction here. + if (state && (exit_id = build_state_get_exit_rsa_id(state))) { + /* We're building to a targeted exit node, so that node can't be + * chosen as our guard for this circuit. */ + rst = tor_malloc_zero(sizeof(entry_guard_restriction_t)); + memcpy(rst->exclude_id, exit_id, DIGEST_LEN); + } + if (entry_guard_pick_for_circuit(get_guard_selection_info(), + GUARD_USAGE_TRAFFIC, + rst, + &r, + guard_state_out) < 0) { + tor_assert(r == NULL); } + return r; } /** Helper: pick a directory guard, with whatever algorithm is used. */ @@ -3274,25 +3269,23 @@ const node_t * guards_choose_dirguard(dirinfo_type_t info, circuit_guard_state_t **guard_state_out) { - if (1) { - /* XXXX prop271 We don't need to look at the dirinfo_type_t here, - * apparently. If you look at the old implementation, and you follow info - * downwards through choose_random_dirguard(), into - * choose_random_entry_impl(), into populate_live_entry_guards()... you - * find out that it isn't even used, and hasn't been since 0.2.7.1-alpha, - * when we realized that every Tor on the network would support - * microdescriptors. -NM */ - (void) info; - const node_t *r = NULL; - if (entry_guard_pick_for_circuit(get_guard_selection_info(), - GUARD_USAGE_DIRGUARD, - NULL, - &r, - guard_state_out) < 0) { - tor_assert(r == NULL); - } - return r; - } + /* XXXX prop271 We don't need to look at the dirinfo_type_t here, + * apparently. If you look at the old implementation, and you follow info + * downwards through choose_random_dirguard(), into + * choose_random_entry_impl(), into populate_live_entry_guards()... you + * find out that it isn't even used, and hasn't been since 0.2.7.1-alpha, + * when we realized that every Tor on the network would support + * microdescriptors. -NM */ + (void) info; + const node_t *r = NULL; + if (entry_guard_pick_for_circuit(get_guard_selection_info(), + GUARD_USAGE_DIRGUARD, + NULL, + &r, + guard_state_out) < 0) { + tor_assert(r == NULL); + } + return r; } /**

1 0

[tor/master] Remove PDS_FOR_GUARD
by nickm＠torproject.org 24 Jan '17

24 Jan '17

commit 5b97d7e110a1a4c9051d63f090c2a919416088ff Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 18 15:42:28 2017 -0500 Remove PDS_FOR_GUARD --- src/or/or.h | 4 ---- src/or/routerlist.c | 6 ------ 2 files changed, 10 deletions(-) diff --git a/src/or/or.h b/src/or/or.h index 81fcf61..80ce704 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -5328,10 +5328,6 @@ typedef struct dir_server_t { */ #define PDS_NO_EXISTING_MICRODESC_FETCH (1<<4) -/** This node is to be chosen as a directory guard, so don't choose any - * node that's currently a guard. */ -#define PDS_FOR_GUARD (1<<5) - /** Possible ways to weight routers when choosing one randomly. See * routerlist_sl_choose_by_bandwidth() for more information.*/ typedef enum bandwidth_weight_rule_t { diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 03f8bc7..4735271 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1996,10 +1996,8 @@ router_pick_directory_server_impl(dirinfo_type_t type, int flags, const int fascistfirewall = ! (flags & PDS_IGNORE_FASCISTFIREWALL); const int no_serverdesc_fetching =(flags & PDS_NO_EXISTING_SERVERDESC_FETCH); const int no_microdesc_fetching = (flags & PDS_NO_EXISTING_MICRODESC_FETCH); - const int for_guard = (flags & PDS_FOR_GUARD); int try_excluding = 1, n_excluded = 0, n_busy = 0; int try_ip_pref = 1; - tor_assert_nonfatal(! for_guard); // XXXX prop271 if (!consensus) return NULL; @@ -2033,10 +2031,6 @@ router_pick_directory_server_impl(dirinfo_type_t type, int flags, SKIP_MISSING_TRUSTED_EXTRAINFO(type, node->identity); - /* Ensure that a directory guard is actually a guard node. */ - if (for_guard && !node->is_possible_guard) { - continue; - } if (try_excluding && routerset_contains_routerstatus(options->ExcludeNodes, status, country)) {

1 0

[tor/master] Remove argument from guards_choose_dirguard
by nickm＠torproject.org 24 Jan '17

24 Jan '17

commit d5d7c3e63843ef4df72c809682ededa9e5c5dbfd Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 18 15:58:19 2017 -0500 Remove argument from guards_choose_dirguard --- src/or/directory.c | 5 ++--- src/or/entrynodes.c | 14 ++------------ src/or/entrynodes.h | 3 +-- 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index 9e41394..43d65dc 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -469,7 +469,7 @@ directory_pick_generic_dirserver(dirinfo_type_t type, int pds_flags, log_warn(LD_BUG, "Called when we have UseBridges set."); if (should_use_directory_guards(options)) { - const node_t *node = guards_choose_dirguard(type, guard_state_out); + const node_t *node = guards_choose_dirguard(guard_state_out); if (node) rs = node->rs; } else { @@ -559,8 +559,7 @@ MOCK_IMPL(void, directory_get_from_dirserver, ( * sort of dir fetch we'll be doing, so it won't return a bridge * that can't answer our question. */ - const node_t *node = guards_choose_dirguard(type, - &guard_state); + const node_t *node = guards_choose_dirguard(&guard_state); if (node && node->ri) { /* every bridge has a routerinfo. */ routerinfo_t *ri = node->ri; diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index e99aa00..b8263dd 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -3123,7 +3123,6 @@ getinfo_helper_format_single_entry_guard(const entry_guard_t *e) status = "up"; } - node = entry_guard_find_node(e); if (node) { node_get_verbose_nickname(node, nbuf); @@ -3266,17 +3265,8 @@ guards_choose_guard(cpath_build_state_t *state, /** Helper: pick a directory guard, with whatever algorithm is used. */ const node_t * -guards_choose_dirguard(dirinfo_type_t info, - circuit_guard_state_t **guard_state_out) -{ - /* XXXX prop271 We don't need to look at the dirinfo_type_t here, - * apparently. If you look at the old implementation, and you follow info - * downwards through choose_random_dirguard(), into - * choose_random_entry_impl(), into populate_live_entry_guards()... you - * find out that it isn't even used, and hasn't been since 0.2.7.1-alpha, - * when we realized that every Tor on the network would support - * microdescriptors. -NM */ - (void) info; +guards_choose_dirguard(circuit_guard_state_t **guard_state_out) +{ const node_t *r = NULL; if (entry_guard_pick_for_circuit(get_guard_selection_info(), GUARD_USAGE_DIRGUARD, diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h index 2fd11cb..6bbdff1 100644 --- a/src/or/entrynodes.h +++ b/src/or/entrynodes.h @@ -314,8 +314,7 @@ struct circuit_guard_state_t { int guards_update_all(void); const node_t *guards_choose_guard(cpath_build_state_t *state, circuit_guard_state_t **guard_state_out); -const node_t *guards_choose_dirguard(dirinfo_type_t info, - circuit_guard_state_t **guard_state_out); +const node_t *guards_choose_dirguard(circuit_guard_state_t **guard_state_out); #if 1 /* XXXX NM I would prefer that all of this stuff be private to

1 0

[tor/master] Merge remote-tracking branch 'asn/remove_legacy_guards'
by nickm＠torproject.org 24 Jan '17

24 Jan '17

commit fae4d3d9250ecc6cd34a70b642009bf8923a51f4 Merge: d95d988 b047d97 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 24 09:01:25 2017 -0500 Merge remote-tracking branch 'asn/remove_legacy_guards' src/or/bridges.c | 20 +- src/or/channel.c | 13 - src/or/circpathbias.c | 8 - src/or/circuitbuild.c | 25 +- src/or/circuituse.c | 4 - src/or/config.c | 20 - src/or/connection_or.c | 10 - src/or/directory.c | 5 +- src/or/entrynodes.c | 2041 ++------------------------------------------ src/or/entrynodes.h | 130 +-- src/or/or.h | 12 - src/or/routerlist.c | 15 - src/test/test_entrynodes.c | 786 ----------------- src/test/test_routerlist.c | 84 -- 14 files changed, 100 insertions(+), 3073 deletions(-)

1 0

[tor/master] Remove some more remnants of legacy guard selection.
by nickm＠torproject.org 24 Jan '17

24 Jan '17

commit b047d97b281ef7ab9a27069b876bceca3d5a002e Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Jan 24 13:31:33 2017 +0200 Remove some more remnants of legacy guard selection. --- src/or/entrynodes.c | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index b8263dd..a4021cc 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -11,11 +11,6 @@ * Entry nodes can be guards (for general use) or bridges (for censorship * circumvention). * - * XXXX prop271 This module is in flux, since I'm currently in the middle of - * implementation proposal 271. The module documentation here will describe - * the new algorithm and data structures; the old ones should get removed as - * proposal 271 is completed. - * * In general, we use entry guards to prevent traffic-sampling attacks: * if we chose every circuit independently, an adversary controlling * some fraction of paths on the network would observe a sample of every @@ -2782,8 +2777,8 @@ entry_guard_parse_from_state(const char *s) } /** - * Replace the Guards entries in <b>state</b> with a list of all our - * non-legacy sampled guards. + * Replace the Guards entries in <b>state</b> with a list of all our sampled + * guards. */ static void entry_guards_update_guards_in_state(or_state_t *state) @@ -2794,8 +2789,6 @@ entry_guards_update_guards_in_state(or_state_t *state) config_line_t **nextline = &lines; SMARTLIST_FOREACH_BEGIN(guard_contexts, guard_selection_t *, gs) { - if (!strcmp(gs->name, "legacy")) - continue; /* This is encoded differently. */ SMARTLIST_FOREACH_BEGIN(gs->sampled_entry_guards, entry_guard_t *, guard) { if (guard->is_persistent == 0) continue; @@ -2811,9 +2804,9 @@ entry_guards_update_guards_in_state(or_state_t *state) } /** - * Replace our non-legacy sampled guards from the Guards entries in - * <b>state</b>. Return 0 on success, -1 on failure. (If <b>set</b> is - * true, replace nothing -- only check whether replacing would work.) + * Replace our sampled guards from the Guards entries in <b>state</b>. Return 0 + * on success, -1 on failure. (If <b>set</b> is true, replace nothing -- only + * check whether replacing would work.) */ static int entry_guards_load_guards_from_state(or_state_t *state, int set) @@ -2828,8 +2821,6 @@ entry_guards_load_guards_from_state(or_state_t *state, int set) * let's be safe.) */ if (set) { SMARTLIST_FOREACH_BEGIN(guard_contexts, guard_selection_t *, gs) { - if (!strcmp(gs->name, "legacy")) - continue; guard_selection_free(gs); if (curr_guard_context == gs) curr_guard_context = NULL; @@ -2864,8 +2855,6 @@ entry_guards_load_guards_from_state(or_state_t *state, int set) if (set) { SMARTLIST_FOREACH_BEGIN(guard_contexts, guard_selection_t *, gs) { - if (!strcmp(gs->name, "legacy")) - continue; entry_guards_update_all(gs); } SMARTLIST_FOREACH_END(gs); } @@ -3081,7 +3070,7 @@ entry_guards_update_state(or_state_t *state) { entry_guards_dirty = 0; - // Handles all non-legacy guard info. + // Handles all guard info. entry_guards_update_guards_in_state(state); entry_guards_dirty = 0;

1 0

[metrics-web/master] Update Onionite link on operation page.
by karsten＠torproject.org 24 Jan '17

24 Jan '17

commit dde7e0b87a67e3aeebaf6b37e1490b3f8d01d851 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Jan 24 13:28:07 2017 +0100 Update Onionite link on operation page. --- website/web/WEB-INF/operation.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/web/WEB-INF/operation.jsp b/website/web/WEB-INF/operation.jsp index d018df1..9d2df0d 100644 --- a/website/web/WEB-INF/operation.jsp +++ b/website/web/WEB-INF/operation.jsp @@ -36,7 +36,7 @@ <li><a href="https://duckduckgo.com/" target="_blank">DuckDuckGo</a> displays Tor node details when including the keywords "tor node" in a search.</li> <li><a href="https://oniontip.com/" target="_blank">OnionTip</a> distributes bitcoin donations to relays that can receive them.</li> <li><a href="https://onionview.codeplex.com/" target="_blank">OnionView</a> plots the location of active Tor nodes on an interactive map of the world.</li> - <li><a href="https://tor-explorer-10kapart2016.azurewebsites.net/" target="_blank">Tor Explorer</a> displays data on each individual Tor node.</li> + <li><a href="https://onionite.now.sh/" target="_blank">Onionite</a> is a Progressive Web App to view information on the individual nodes that make up the Tor network.</li> </ul> </div>

1 0

[tor-browser-build/master] macosx-toolchain: remove unused variables
by boklm＠torproject.org 24 Jan '17

24 Jan '17

commit 288f5223ca434226cc376f0802a58a974b8e3d4b Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jan 24 12:51:38 2017 +0100 macosx-toolchain: remove unused variables macosx-toolchain is currently used in two components: firefox and tor. In the firefox build we don't use those (unexported) variables. In the tor build we only use CFLAGS and CXXFLAGS through the configure options, and we move them to var/FLAGS in rbm.conf. --- projects/macosx-toolchain/config | 9 --------- rbm.conf | 3 ++- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/projects/macosx-toolchain/config b/projects/macosx-toolchain/config index 0bf4575..6458485 100644 --- a/projects/macosx-toolchain/config +++ b/projects/macosx-toolchain/config @@ -11,15 +11,6 @@ var: export cctoolsdir=/var/tmp/dist/[% project %]/cctools/bin export PATH="$clangdir/helpers:$clangdir/bin:$cctoolsdir:$PATH" export LD_LIBRARY_PATH=/var/tmp/dist/[% project %]/clang/lib - CFLAGS="-target x86_64-apple-darwin10 -mlinker-version=136 -B $cctoolsdir -isysroot $sysrootdir" - CXXFLAGS="$CFLAGS" - CC="$clangdir/helpers/clang $CFLAGS" - CXX="$clangdir/helpers/clang++ $CXXFLAGS" - RANLIB=$cctoolsdir/x86_64-apple-darwin10-ranlib - AR=$cctoolsdir/x86_64-apple-darwin10-ar - AS=$cctoolsdir/x86_64-apple-darwin10-as - LD=$cctoolsdir/x86_64-apple-darwin10-ld - STRIP=$cctoolsdir/x86_64-apple-darwin10-strip input_files: - name: llvm diff --git a/rbm.conf b/rbm.conf index cbd725f..05e45a6 100644 --- a/rbm.conf +++ b/rbm.conf @@ -131,7 +131,8 @@ targets: osx: 1 osname: osx-x86_64 compiler: 'macosx-toolchain' - configure_opt: '--host=x86_64-apple-darwin10 CC="x86_64-apple-darwin10-clang $CFLAGS" CXX="x86_64-apple-darwin10-clang++ $CXXFLAGS"' + configure_opt: '--host=x86_64-apple-darwin10 CC="x86_64-apple-darwin10-clang [% c("var/FLAGS") %]" CXX="x86_64-apple-darwin10-clang++ [% c("var/FLAGS") %]"' + FLAGS: "-target x86_64-apple-darwin10 -mlinker-version=136 -B $cctoolsdir -isysroot $sysrootdir" locale_ja: ja-JP-mac deps: - build-essential

1 0

[metrics-web/master] Update news.
by karsten＠torproject.org 24 Jan '17

24 Jan '17

commit 8d9c72fef820b4e0d155eea95c0d30e2b336fbaa Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Jan 24 09:53:36 2017 +0100 Update news. --- website/etc/news.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/website/etc/news.json b/website/etc/news.json index 20e2a3b..9fae7da 100644 --- a/website/etc/news.json +++ b/website/etc/news.json @@ -439,5 +439,20 @@ "<a href=\"https://lists.torproject.org/pipermail/metrics-team/2016-December/000260.ht…">metrics-team thread</a>", "<a href=\"https://lists.torproject.org/pipermail/metrics-team/2017-January/000264.htm…">thread continues</a>" ] + }, + { + "start": "2017-01-15", + "place": "ae", + "protocols": [ + "<OR>", + "relay" + ], + "description": "Huge increase in relay users (200k+)", + "links": [ + "<a href=\"http://rougmnvswfsmd4dq.onion/userstats-relay-country.html?start=2017-01-15…">graph</a>", + "<a href=\"https://lists.torproject.org/pipermail/metrics-team/2017-January/000284.htm…">metrics-team thread</a>", + "<a href=\"https://www.reddit.com/r/TOR/comments/5pbukk/united_arab_emirates_went_from…">reddit thread</a>" + ], + "unknown": true } ]

1 0

[atlas/master] Remove the action attribute from the search form
by irl＠torproject.org 23 Jan '17

23 Jan '17

commit 42a43699cb47bafc4c066a423b2a575e59cfa93f Author: cypherpunks <cypherpunks(a)torproject.org> Date: Sat Jan 21 21:01:13 2017 +0000 Remove the action attribute from the search form Search form submissions are caught by a JavaScript event so the action is never used and can be removed. Really closes ticket 21234 this time. --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 8ed9b71..34a06af 100644 --- a/index.html +++ b/index.html @@ -41,7 +41,7 @@ <li><a href="#/about">About</a></li> <li><a href="#/top10">Top 10 Relays</a></li> </ul> - <form id="nav-search" class="navbar-search pull-right" action=""> + <form id="nav-search" class="navbar-search pull-right"> <input type="text" class="search-query" placeholder="Search"> </form> </div>

1 0

[tor-browser-build/master] Test commit (remove superfluous whitespace)
by gk＠torproject.org 23 Jan '17

23 Jan '17

commit 0159ed07a8c37f04637bf7d59bbbb35949caec63 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jan 23 21:10:17 2017 +0000 Test commit (remove superfluous whitespace) --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index a1d57c6..0b8e510 100644 --- a/README +++ b/README @@ -46,7 +46,7 @@ Starting a build To start a build, run one of the following commands, depending on the channel you want to build: - + $ make release $ make alpha $ make nightly

1 0