December 2016 - tor-commits - lists.torproject.org

[tor/master] re-add check for if circuit is an origin circuit
by nickm＠torproject.org 05 Dec '16

05 Dec '16

commit b252773fe912aa398741c1ec3d2a8eeabf7a52dc Author: Chelsea H. Komlo <chelsea.komlo(a)gmail.com> Date: Mon Nov 21 15:12:21 2016 -0500 re-add check for if circuit is an origin circuit --- src/or/circuituse.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 6fb4f82..cceaddd 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1033,12 +1033,15 @@ circuit_is_available_for_use(const circuit_t *circ) const origin_circuit_t *origin_circ; cpath_build_state_t *build_state; + if (!CIRCUIT_IS_ORIGIN(circ)) + return 0; /* We first filter out only origin circuits before doing the + following checks. */ if (circ->marked_for_close) return 0; /* Don't mess with marked circs */ if (circ->timestamp_dirty) return 0; /* Only count clean circs */ if (circ->purpose != CIRCUIT_PURPOSE_C_GENERAL) - return 0; /* Only pay attention to general purpose circuits. + return 0; /* We only pay attention to general purpose circuits. General purpose circuits are always origin circuits. */ origin_circ = CONST_TO_ORIGIN_CIRCUIT(circ);

1 0

[tor/master] Merge remote-tracking branch 'chelseakomlo/circuituse'
by nickm＠torproject.org 05 Dec '16

05 Dec '16

commit f96f4c0e4218ccba48e5b575020caca4f5e6576e Merge: 0ded723 2331e70 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 5 08:25:22 2016 -0500 Merge remote-tracking branch 'chelseakomlo/circuituse' changes/ticket18873 | 7 ++ src/or/circuitbuild.c | 6 +- src/or/circuitbuild.h | 5 +- src/or/circuituse.c | 188 ++++++++++++++++++++-------- src/or/circuituse.h | 20 +++ src/or/nodelist.c | 4 +- src/or/nodelist.h | 3 +- src/test/include.am | 1 + src/test/test.c | 1 + src/test/test.h | 1 + src/test/test_circuituse.c | 302 +++++++++++++++++++++++++++++++++++++++++++++ src/test/test_helpers.c | 23 ++++ src/test/test_helpers.h | 2 + src/test/test_oom.c | 19 +-- 14 files changed, 502 insertions(+), 80 deletions(-)

1 0

[tor/master] fix up spacing/style in needs_circuits_for_build
by nickm＠torproject.org 05 Dec '16

05 Dec '16

commit 2331e70d2d47b4d883aaee6e503ca93ada9ea16c Author: Chelsea H. Komlo <chelsea.komlo(a)gmail.com> Date: Tue Nov 22 16:00:59 2016 -0500 fix up spacing/style in needs_circuits_for_build --- src/or/circuituse.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index d478537..bc72015 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1123,9 +1123,8 @@ needs_circuits_for_build(int num) { if (router_have_consensus_path() != CONSENSUS_PATH_UNKNOWN) { if (num < CBT_MAX_UNUSED_OPEN_CIRCUITS && - ! circuit_build_times_disabled() && - circuit_build_times_needs_circuits_now(get_circuit_build_times())) - { + !circuit_build_times_disabled() && + circuit_build_times_needs_circuits_now(get_circuit_build_times())) { return 1; } }

1 0

[tor/master] adding better comments for defines
by nickm＠torproject.org 05 Dec '16

05 Dec '16

commit f83ed31089a19c6c74f8bde32b65ab7b46940327 Author: Chelsea H. Komlo <chelsea.komlo(a)gmail.com> Date: Tue Nov 22 14:57:19 2016 -0500 adding better comments for defines --- src/or/circuituse.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index cceaddd..d478537 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1067,6 +1067,7 @@ needs_exit_circuits(time_t now, int *needs_uptime, int *needs_capacity) router_have_consensus_path() == CONSENSUS_PATH_EXIT); } +/* Hidden services need at least this many internal circuits */ #define SUFFICIENT_UPTIME_INTERNAL_HS_SERVERS 3 /* Return true if we need any more hidden service server circuits. @@ -1079,7 +1080,11 @@ needs_hs_server_circuits(int num_uptime_internal) router_have_consensus_path() != CONSENSUS_PATH_UNKNOWN); } +/* We need at least this many internal circuits for hidden service clients */ #define SUFFICIENT_INTERNAL_HS_CLIENTS 3 + +/* We need at least this much uptime for internal circuits for hidden service + * clients */ #define SUFFICIENT_UPTIME_INTERNAL_HS_CLIENTS 2 /* Return true if we need any more hidden service client circuits. @@ -1100,11 +1105,13 @@ needs_hs_client_circuits(time_t now, int *needs_uptime, int *needs_capacity, router_have_consensus_path() != CONSENSUS_PATH_UNKNOWN); } -/* Check to see if we still need more circuits to learn - * a good build timeout. But if we're close to our max number we - * want, don't do another -- we want to leave a few slots open so - * we can still build circuits preemptively as needed. */ +/* The minimum number of open slots we should keep in order to preemptively + * build circuits. */ #define CBT_MIN_REMAINING_PREEMPTIVE_CIRCUITS 2 + +/* Check to see if we need more circuits to have a good build timeout. However, + * leave a couple slots open so that we can still build circuits preemptively + * as needed. */ #define CBT_MAX_UNUSED_OPEN_CIRCUITS (MAX_UNUSED_OPEN_CIRCUITS - \ CBT_MIN_REMAINING_PREEMPTIVE_CIRCUITS)

1 0

[tor/master] Merge branch 'maint-0.2.9'
by nickm＠torproject.org 05 Dec '16

05 Dec '16

commit 0ded72322c87ec836a40b6704ee0919add741a53 Merge: 8230cf7 cf2f36b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 5 08:21:46 2016 -0500 Merge branch 'maint-0.2.9' changes/20492 | 4 ++++ src/or/include.am | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 05 Dec '16

05 Dec '16

commit 5032489e80af7236dd571da34cb659ab5fc7ccd6 Merge: b4c648c cf2f36b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 5 08:21:40 2016 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 changes/20492 | 4 ++++ src/or/include.am | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/release-0.2.9] Test for .git as readable instead of a dir to support worktrees
by nickm＠torproject.org 05 Dec '16

05 Dec '16

commit cf2f36b8b422aa4cf11282bc14421b6dbfa54beb Author: J. Ryan Stinnett <jryans(a)gmail.com> Date: Sun Dec 4 21:16:59 2016 -0600 Test for .git as readable instead of a dir to support worktrees Fixes #20492. --- changes/20492 | 4 ++++ src/or/include.am | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/20492 b/changes/20492 new file mode 100644 index 0000000..fdcd4d0 --- /dev/null +++ b/changes/20492 @@ -0,0 +1,4 @@ + o Minor bugfix (build): + - The current Git revision when building from a local repository is now + detected correctly when using git worktrees. Fixes bug 20492; bugfix on + 0.2.3.9-alpha. diff --git a/src/or/include.am b/src/or/include.am index b4554aa..ae493b7 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -198,7 +198,7 @@ noinst_HEADERS+= $(ORHEADERS) micro-revision.i micro-revision.i: FORCE $(AM_V_at)rm -f micro-revision.tmp; \ - if test -d "$(top_srcdir)/.git" && \ + if test -r "$(top_srcdir)/.git" && \ test -x "`which git 2>&1;true`"; then \ HASH="`cd "$(top_srcdir)" && git rev-parse --short=16 HEAD`"; \ echo \"$$HASH\" > micro-revision.tmp; \

1 0

[tor/master] Test for .git as readable instead of a dir to support worktrees
by nickm＠torproject.org 05 Dec '16

05 Dec '16

commit cf2f36b8b422aa4cf11282bc14421b6dbfa54beb Author: J. Ryan Stinnett <jryans(a)gmail.com> Date: Sun Dec 4 21:16:59 2016 -0600 Test for .git as readable instead of a dir to support worktrees Fixes #20492. --- changes/20492 | 4 ++++ src/or/include.am | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/20492 b/changes/20492 new file mode 100644 index 0000000..fdcd4d0 --- /dev/null +++ b/changes/20492 @@ -0,0 +1,4 @@ + o Minor bugfix (build): + - The current Git revision when building from a local repository is now + detected correctly when using git worktrees. Fixes bug 20492; bugfix on + 0.2.3.9-alpha. diff --git a/src/or/include.am b/src/or/include.am index b4554aa..ae493b7 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -198,7 +198,7 @@ noinst_HEADERS+= $(ORHEADERS) micro-revision.i micro-revision.i: FORCE $(AM_V_at)rm -f micro-revision.tmp; \ - if test -d "$(top_srcdir)/.git" && \ + if test -r "$(top_srcdir)/.git" && \ test -x "`which git 2>&1;true`"; then \ HASH="`cd "$(top_srcdir)" && git rev-parse --short=16 HEAD`"; \ echo \"$$HASH\" > micro-revision.tmp; \

1 0

[tor/maint-0.2.9] Test for .git as readable instead of a dir to support worktrees
by nickm＠torproject.org 05 Dec '16

05 Dec '16

commit cf2f36b8b422aa4cf11282bc14421b6dbfa54beb Author: J. Ryan Stinnett <jryans(a)gmail.com> Date: Sun Dec 4 21:16:59 2016 -0600 Test for .git as readable instead of a dir to support worktrees Fixes #20492. --- changes/20492 | 4 ++++ src/or/include.am | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/20492 b/changes/20492 new file mode 100644 index 0000000..fdcd4d0 --- /dev/null +++ b/changes/20492 @@ -0,0 +1,4 @@ + o Minor bugfix (build): + - The current Git revision when building from a local repository is now + detected correctly when using git worktrees. Fixes bug 20492; bugfix on + 0.2.3.9-alpha. diff --git a/src/or/include.am b/src/or/include.am index b4554aa..ae493b7 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -198,7 +198,7 @@ noinst_HEADERS+= $(ORHEADERS) micro-revision.i micro-revision.i: FORCE $(AM_V_at)rm -f micro-revision.tmp; \ - if test -d "$(top_srcdir)/.git" && \ + if test -r "$(top_srcdir)/.git" && \ test -x "`which git 2>&1;true`"; then \ HASH="`cd "$(top_srcdir)" && git rev-parse --short=16 HEAD`"; \ echo \"$$HASH\" > micro-revision.tmp; \

1 0

[tor/master] Clarify that ClientRejectInternalAddresses also rejects mDNS *.local hosts
by nickm＠torproject.org 05 Dec '16

05 Dec '16

commit 7ffa95abd935fd6ac10abd96e8a8d14aa9035caf Author: J. Ryan Stinnett <jryans(a)gmail.com> Date: Sat Dec 3 21:06:30 2016 -0600 Clarify that ClientRejectInternalAddresses also rejects mDNS *.local hosts Fixes #17070. --- changes/17070 | 4 ++++ doc/tor.1.txt | 3 ++- src/common/address.c | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/17070 b/changes/17070 new file mode 100644 index 0000000..ffe616f --- /dev/null +++ b/changes/17070 @@ -0,0 +1,4 @@ + o Documentation (SOCKS connections): + - Clarify that when `ClientRejectInternalAddresses` is enabled (which is the + default), multicast DNS hostnames for machines on the local network (of + the form *.local) are also rejected. Closes ticket 17070. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index aa3859e..c4219d9 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1414,7 +1414,8 @@ The following options are useful only for clients (that is, if If true, Tor does not try to fulfill requests to connect to an internal address (like 127.0.0.1 or 192.168.0.1) __unless a exit node is specifically requested__ (for example, via a .exit hostname, or a - controller request). (Default: 1) + controller request). If true, multicast DNS hostnames for machines on the + local network (of the form *.local) are also rejected. (Default: 1) [[DownloadExtraInfo]] **DownloadExtraInfo** **0**|**1**:: If true, Tor downloads and caches "extra-info" documents. These documents diff --git a/src/common/address.c b/src/common/address.c index 773e688..fa6630e 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -2100,7 +2100,8 @@ get_interface_address,(int severity, uint32_t *addr)) } /** Return true if we can tell that <b>name</b> is a canonical name for the - * loopback address. */ + * loopback address. Return true also for *.local hostnames, which are + * multicast DNS names for hosts on the local network. */ int tor_addr_hostname_is_local(const char *name) {

1 0