diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-07-20 10:42:29 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-07-20 10:42:29 -0400 |
| commit | a1402bac344905ba3cd9fddac58ac2af0940f930 (patch) | |
| tree | 6aa7211f749f2fc8522a601614016d1c5de3f4e5 | |
| parent | 5ca3de21244d373f4c79b00d676f561dd50df4a9 (diff) | |
| parent | 977821e59fb6e57639a842f498be32633bb0b0e1 (diff) | |
| download | tor-a1402bac344905ba3cd9fddac58ac2af0940f930.tar.gz tor-a1402bac344905ba3cd9fddac58ac2af0940f930.zip | |
Merge branch 'maint-0.3.4' into release-0.3.4
| -rw-r--r-- | changes/ticket26647 | 4 | ||||
| -rw-r--r-- | src/or/control.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/changes/ticket26647 b/changes/ticket26647 new file mode 100644 index 0000000000..1c2e917c6d --- /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 09cf833e37..1115ef7b1d 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1975,6 +1975,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")) @@ -1983,6 +1985,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")) |