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

[tor/release-0.3.2] Merge branch 'ticket26647_032' into maint-0.3.2
by nickm＠torproject.org 20 Jul '18

20 Jul '18

commit be3a962ca7c6fc5fd72dfd9bb1def24efa4cdf2a Merge: 209332e71 e3e6335a0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 20 10:42:23 2018 -0400 Merge branch 'ticket26647_032' into maint-0.3.2 changes/ticket26647 | 4 ++++ src/or/control.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

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

20 Jul '18

commit be3a962ca7c6fc5fd72dfd9bb1def24efa4cdf2a Merge: 209332e71 e3e6335a0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 20 10:42:23 2018 -0400 Merge branch 'ticket26647_032' into maint-0.3.2 changes/ticket26647 | 4 ++++ src/or/control.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

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

20 Jul '18

commit be3a962ca7c6fc5fd72dfd9bb1def24efa4cdf2a Merge: 209332e71 e3e6335a0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 20 10:42:23 2018 -0400 Merge branch 'ticket26647_032' into maint-0.3.2 changes/ticket26647 | 4 ++++ src/or/control.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.3] Add controller support for listing ExtORPort and HTTPTunnelPorts
by nickm＠torproject.org 20 Jul '18

20 Jul '18

commit e3e6335a08036fc64924b55e68f236a12e3c9118 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 10 10:50:43 2018 -0400 Add controller support for listing ExtORPort and HTTPTunnelPorts Closes ticket 26647. --- changes/ticket26647 | 4 ++++ src/or/control.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/ticket26647 b/changes/ticket26647 new file mode 100644 index 000000000..1c2e917c6 --- /dev/null +++ b/changes/ticket26647 @@ -0,0 +1,4 @@ + o Minor features (controller): + - The control port now exposes the list of HTTPTunnelPorts and + ExtOrPorts via GETINFO net/listeners/httptunnel and net/listeners/extor + respectively. Closes ticket 26647. diff --git a/src/or/control.c b/src/or/control.c index 202366aae..3609210b9 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1848,6 +1848,8 @@ getinfo_helper_listeners(control_connection_t *control_conn, if (!strcmp(question, "net/listeners/or")) type = CONN_TYPE_OR_LISTENER; + else if (!strcmp(question, "net/listeners/extor")) + type = CONN_TYPE_EXT_OR_LISTENER; else if (!strcmp(question, "net/listeners/dir")) type = CONN_TYPE_DIR_LISTENER; else if (!strcmp(question, "net/listeners/socks")) @@ -1856,6 +1858,8 @@ getinfo_helper_listeners(control_connection_t *control_conn, type = CONN_TYPE_AP_TRANS_LISTENER; else if (!strcmp(question, "net/listeners/natd")) type = CONN_TYPE_AP_NATD_LISTENER; + else if (!strcmp(question, "net/listeners/httptunnel")) + type = CONN_TYPE_AP_HTTP_CONNECT_LISTENER; else if (!strcmp(question, "net/listeners/dns")) type = CONN_TYPE_AP_DNS_LISTENER; else if (!strcmp(question, "net/listeners/control")) @@ -7318,4 +7322,3 @@ control_testing_set_global_event_mask(uint64_t mask) global_event_mask = mask; } #endif /* defined(TOR_UNIT_TESTS) */ -

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 20 Jul '18

20 Jul '18

commit 8edbeb26bb90142408c55eb62dbf1a8993f38d6f Merge: 94871f75d be3a962ca Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 20 10:42:29 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/ticket26647 | 4 ++++ src/or/control.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

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

20 Jul '18

commit 977821e59fb6e57639a842f498be32633bb0b0e1 Merge: 7260d07fe dbf57ecf3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 20 10:42:29 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/ticket26647 | 4 ++++ src/or/control.c | 4 ++++ 2 files changed, 8 insertions(+)

1 0

[tor/release-0.3.4] Add controller support for listing ExtORPort and HTTPTunnelPorts
by nickm＠torproject.org 20 Jul '18

20 Jul '18

commit e3e6335a08036fc64924b55e68f236a12e3c9118 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 10 10:50:43 2018 -0400 Add controller support for listing ExtORPort and HTTPTunnelPorts Closes ticket 26647. --- changes/ticket26647 | 4 ++++ src/or/control.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/ticket26647 b/changes/ticket26647 new file mode 100644 index 000000000..1c2e917c6 --- /dev/null +++ b/changes/ticket26647 @@ -0,0 +1,4 @@ + o Minor features (controller): + - The control port now exposes the list of HTTPTunnelPorts and + ExtOrPorts via GETINFO net/listeners/httptunnel and net/listeners/extor + respectively. Closes ticket 26647. diff --git a/src/or/control.c b/src/or/control.c index 202366aae..3609210b9 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1848,6 +1848,8 @@ getinfo_helper_listeners(control_connection_t *control_conn, if (!strcmp(question, "net/listeners/or")) type = CONN_TYPE_OR_LISTENER; + else if (!strcmp(question, "net/listeners/extor")) + type = CONN_TYPE_EXT_OR_LISTENER; else if (!strcmp(question, "net/listeners/dir")) type = CONN_TYPE_DIR_LISTENER; else if (!strcmp(question, "net/listeners/socks")) @@ -1856,6 +1858,8 @@ getinfo_helper_listeners(control_connection_t *control_conn, type = CONN_TYPE_AP_TRANS_LISTENER; else if (!strcmp(question, "net/listeners/natd")) type = CONN_TYPE_AP_NATD_LISTENER; + else if (!strcmp(question, "net/listeners/httptunnel")) + type = CONN_TYPE_AP_HTTP_CONNECT_LISTENER; else if (!strcmp(question, "net/listeners/dns")) type = CONN_TYPE_AP_DNS_LISTENER; else if (!strcmp(question, "net/listeners/control")) @@ -7318,4 +7322,3 @@ control_testing_set_global_event_mask(uint64_t mask) global_event_mask = mask; } #endif /* defined(TOR_UNIT_TESTS) */ -

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 20 Jul '18

20 Jul '18

commit 2b12e2679115975ff4a7114e062285865cb1c669 Merge: 852155bb6 dbf57ecf3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 20 10:42:29 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/ticket26647 | 4 ++++ src/or/control.c | 4 ++++ 2 files changed, 8 insertions(+)

1 0

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

20 Jul '18

commit dbf57ecf39e3066b567c5aade9e8b5575e1e1ec0 Merge: 0a60a94a5 be3a962ca Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 20 10:42:29 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/ticket26647 | 4 ++++ src/or/control.c | 4 ++++ 2 files changed, 8 insertions(+)

1 0

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

20 Jul '18

commit dbf57ecf39e3066b567c5aade9e8b5575e1e1ec0 Merge: 0a60a94a5 be3a962ca Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 20 10:42:29 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/ticket26647 | 4 ++++ src/or/control.c | 4 ++++ 2 files changed, 8 insertions(+)

1 0