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 | dbf57ecf39e3066b567c5aade9e8b5575e1e1ec0 (patch) | |
| tree | b409d89e77f81ca4376b34b5db8407cb41e60469 | |
| parent | 0a60a94a558012f3b28162f06216ed5e2a4b5b0c (diff) | |
| parent | be3a962ca7c6fc5fd72dfd9bb1def24efa4cdf2a (diff) | |
| download | tor-dbf57ecf39e3066b567c5aade9e8b5575e1e1ec0.tar.gz tor-dbf57ecf39e3066b567c5aade9e8b5575e1e1ec0.zip | |
Merge branch 'maint-0.3.2' into maint-0.3.3
| -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 1898725025..3f677ba348 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1896,6 +1896,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")) @@ -1904,6 +1906,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")) |