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

[tor/maint-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 10 May '18

10 May '18

commit e5acbbd16d29a5d3187bf2867c4ffa15451669bb Merge: 394f102ea aa08c1970 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 10 08:02:10 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/ticket26062 | 3 +++ src/or/networkstatus.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --cc src/or/networkstatus.c index dd82f6681,fdaa469fa..3d99dd9ee --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@@ -1654,9 -1685,7 +1654,8 @@@ any_client_port_set(const or_options_t return (options->SocksPort_set || options->TransPort_set || options->NATDPort_set || - options->ControlPort_set || - options->DNSPort_set); + options->DNSPort_set || + options->HTTPTunnelPort_set); } /**

1 0

[tor/master] Merge branch 'maint-0.3.3'
by nickm＠torproject.org 10 May '18

10 May '18

commit bbee2b62c04e708bfda1419e856f6810825c020b Merge: d972a8a94 59812789f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 10 08:03:43 2018 -0400 Merge branch 'maint-0.3.3'

1 0

[tor/master] config: Move any_client_port_set() to config.c
by nickm＠torproject.org 10 May '18

10 May '18

commit 01ffe8e2f4ca24325e81f040e1ac3a5a17afa5d5 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Apr 25 13:41:04 2018 -0400 config: Move any_client_port_set() to config.c This functions is now used outside of networkstatus.c and makes more sense to be in config.c. It is also renamed to options_any_client_port_set() for the config.c namespace. No code behavior change. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/config.c | 15 +++++++++++++++ src/or/config.h | 3 +++ src/or/main.c | 2 +- src/or/networkstatus.c | 20 +------------------- src/or/networkstatus.h | 2 -- 5 files changed, 20 insertions(+), 22 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 9af613e93..20db37ae3 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -8433,3 +8433,18 @@ init_cookie_authentication(const char *fname, const char *header, return retval; } +/** + * Return true if any option is set in options to make us behave + * as a client. + */ +int +options_any_client_port_set(const or_options_t *options) +{ + return (options->SocksPort_set || + options->TransPort_set || + options->NATDPort_set || + options->ControlPort_set || + options->DNSPort_set || + options->HTTPTunnelPort_set); +} + diff --git a/src/or/config.h b/src/or/config.h index 1d3c27217..4b4127443 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -214,6 +214,9 @@ smartlist_t *get_options_from_transport_options_line(const char *line, const char *transport); smartlist_t *get_options_for_server_transport(const char *transport); +/* Port helper functions. */ +int options_any_client_port_set(const or_options_t *options); + #ifdef CONFIG_PRIVATE #define CL_PORT_NO_STREAM_OPTIONS (1u<<0) diff --git a/src/or/main.c b/src/or/main.c index c3505a2d9..6cda56b3c 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1497,7 +1497,7 @@ get_my_roles(const or_options_t *options) int roles = 0; int is_bridge = options->BridgeRelay; - int is_client = any_client_port_set(options); + int is_client = options_any_client_port_set(options); int is_relay = server_mode(options); int is_dirauth = authdir_mode_v3(options); int is_bridgeauth = authdir_mode_bridge(options); diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 44c0638c2..b7443b4c7 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1691,24 +1691,6 @@ networkstatus_set_current_consensus_from_ns(networkstatus_t *c, #endif /* defined(TOR_UNIT_TESTS) */ /** - * Return true if any option is set in options to make us behave - * as a client. - * - * XXXX If we need this elsewhere at any point, we should make it nonstatic - * XXXX and move it into another file. - */ -int -any_client_port_set(const or_options_t *options) -{ - return (options->SocksPort_set || - options->TransPort_set || - options->NATDPort_set || - options->ControlPort_set || - options->DNSPort_set || - options->HTTPTunnelPort_set); -} - -/** * Helper for handle_missing_protocol_warning: handles either the * client case (if is_client is set) or the server case otherwise. */ @@ -1743,7 +1725,7 @@ handle_missing_protocol_warning(const networkstatus_t *c, const or_options_t *options) { const int is_server = server_mode(options); - const int is_client = any_client_port_set(options) || !is_server; + const int is_client = options_any_client_port_set(options) || !is_server; if (is_server) handle_missing_protocol_warning_impl(c, 0); diff --git a/src/or/networkstatus.h b/src/or/networkstatus.h index 0c325959d..6a7a42f91 100644 --- a/src/or/networkstatus.h +++ b/src/or/networkstatus.h @@ -147,8 +147,6 @@ void vote_routerstatus_free_(vote_routerstatus_t *rs); #define vote_routerstatus_free(rs) \ FREE_AND_NULL(vote_routerstatus_t, vote_routerstatus_free_, (rs)) -int any_client_port_set(const or_options_t *options); - #ifdef NETWORKSTATUS_PRIVATE #ifdef TOR_UNIT_TESTS STATIC int networkstatus_set_current_consensus_from_ns(networkstatus_t *c,

1 0

[tor/master] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 10 May '18

10 May '18

commit aa08c197034a7dcd061f3c205a29dc1cb09641d3 Merge: 6361a250f bca8a104b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 10 08:00:35 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/ticket26062 | 3 +++ src/or/networkstatus.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 10 May '18

10 May '18

commit e5acbbd16d29a5d3187bf2867c4ffa15451669bb Merge: 394f102ea aa08c1970 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 10 08:02:10 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/ticket26062 | 3 +++ src/or/networkstatus.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --cc src/or/networkstatus.c index dd82f6681,fdaa469fa..3d99dd9ee --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@@ -1654,9 -1685,7 +1654,8 @@@ any_client_port_set(const or_options_t return (options->SocksPort_set || options->TransPort_set || options->NATDPort_set || - options->ControlPort_set || - options->DNSPort_set); + options->DNSPort_set || + options->HTTPTunnelPort_set); } /**

1 0

[tor/master] Having a ControlPort open doesn't mean we are a client
by nickm＠torproject.org 10 May '18

10 May '18

commit bca8a104b291c0f475c87905e0dc958978776ecb Author: David Goulet <dgoulet(a)torproject.org> Date: Wed May 9 12:40:06 2018 -0400 Having a ControlPort open doesn't mean we are a client The any_client_port_set() returns true if the ControlPort is set which is wrong because we can have that port open but still not behave as a tor client (like many relays for instance). Fixes #26062 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket26062 | 3 +++ src/or/networkstatus.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/changes/ticket26062 b/changes/ticket26062 new file mode 100644 index 000000000..1ee49d860 --- /dev/null +++ b/changes/ticket26062 @@ -0,0 +1,3 @@ + o Minor bugfixes (client): + - Don't consider Tor running as a client if the ControlPort is open. Fixes + bug 26062; bugfix on 0.2.9.4-alpha. diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index d9ae32560..d8e2c0027 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1584,7 +1584,6 @@ any_client_port_set(const or_options_t *options) return (options->SocksPort_set || options->TransPort_set || options->NATDPort_set || - options->ControlPort_set || options->DNSPort_set); }

1 0

[tor/master] Having a ControlPort open doesn't mean we are a client
by nickm＠torproject.org 10 May '18

10 May '18

commit 67a41b63063370c2c655a91a801f7be2dd4732a5 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Apr 25 13:43:37 2018 -0400 Having a ControlPort open doesn't mean we are a client The options_any_client_port_set() returns true if the ControlPort is set which is wrong because we can have that port open but still not behave as a tor client (like many relays for instance). Fixes #26062 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket26062 | 4 ++++ src/or/config.c | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/ticket26062 b/changes/ticket26062 new file mode 100644 index 000000000..cd1fe3df4 --- /dev/null +++ b/changes/ticket26062 @@ -0,0 +1,4 @@ + o Minor bugfixes (client): + - Don't consider Tor running as a client if the ControlPort is open. Fixes + bug 26062; bugfix on 0.2.9.4-alpha. + diff --git a/src/or/config.c b/src/or/config.c index 20db37ae3..5e84ec1d6 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -8443,7 +8443,6 @@ options_any_client_port_set(const or_options_t *options) return (options->SocksPort_set || options->TransPort_set || options->NATDPort_set || - options->ControlPort_set || options->DNSPort_set || options->HTTPTunnelPort_set); }

1 0

[tor/release-0.3.1] Having a ControlPort open doesn't mean we are a client
by nickm＠torproject.org 10 May '18

10 May '18

commit bca8a104b291c0f475c87905e0dc958978776ecb Author: David Goulet <dgoulet(a)torproject.org> Date: Wed May 9 12:40:06 2018 -0400 Having a ControlPort open doesn't mean we are a client The any_client_port_set() returns true if the ControlPort is set which is wrong because we can have that port open but still not behave as a tor client (like many relays for instance). Fixes #26062 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket26062 | 3 +++ src/or/networkstatus.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/changes/ticket26062 b/changes/ticket26062 new file mode 100644 index 000000000..1ee49d860 --- /dev/null +++ b/changes/ticket26062 @@ -0,0 +1,3 @@ + o Minor bugfixes (client): + - Don't consider Tor running as a client if the ControlPort is open. Fixes + bug 26062; bugfix on 0.2.9.4-alpha. diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index d9ae32560..d8e2c0027 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1584,7 +1584,6 @@ any_client_port_set(const or_options_t *options) return (options->SocksPort_set || options->TransPort_set || options->NATDPort_set || - options->ControlPort_set || options->DNSPort_set); }

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/ticket26062_034_01'
by nickm＠torproject.org 10 May '18

10 May '18

commit a4a7939ae1605936c55d4b483d5f01e947f7575c Merge: bbee2b62c 67a41b630 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 10 08:04:03 2018 -0400 Merge remote-tracking branch 'dgoulet/ticket26062_034_01' changes/ticket26062 | 4 ++++ src/or/config.c | 14 ++++++++++++++ src/or/config.h | 3 +++ src/or/main.c | 2 +- src/or/networkstatus.c | 20 +------------------- src/or/networkstatus.h | 2 -- 6 files changed, 23 insertions(+), 22 deletions(-)

1 0

[tor/release-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 10 May '18

10 May '18

commit aa08c197034a7dcd061f3c205a29dc1cb09641d3 Merge: 6361a250f bca8a104b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 10 08:00:35 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/ticket26062 | 3 +++ src/or/networkstatus.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-)

1 0