diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-07-20 10:42:23 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-07-20 10:42:23 -0400 |
| commit | be3a962ca7c6fc5fd72dfd9bb1def24efa4cdf2a (patch) | |
| tree | 56506e494eba178749c8c97073157134e2f5ead3 | |
| parent | 209332e71ab5a7633ee0c934be017740f3e9552a (diff) | |
| parent | e3e6335a08036fc64924b55e68f236a12e3c9118 (diff) | |
| download | tor-be3a962ca7c6fc5fd72dfd9bb1def24efa4cdf2a.tar.gz tor-be3a962ca7c6fc5fd72dfd9bb1def24efa4cdf2a.zip | |
Merge branch 'ticket26647_032' into maint-0.3.2
| -rw-r--r-- | changes/ticket26647 | 4 | ||||
| -rw-r--r-- | src/or/control.c | 5 |
2 files changed, 8 insertions, 1 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 202366aaec..3609210b95 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) */ - |