diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-07-10 10:50:43 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-07-10 10:50:43 -0400 |
| commit | e3e6335a08036fc64924b55e68f236a12e3c9118 (patch) | |
| tree | 78bea3ed4330c2275c316137d607baf77d86e1eb /src | |
| parent | 6ad2c2b92f275cbdf2911f03ffbd1ac708ec6fcc (diff) | |
| download | tor-e3e6335a08036fc64924b55e68f236a12e3c9118.tar.gz tor-e3e6335a08036fc64924b55e68f236a12e3c9118.zip | |
Add controller support for listing ExtORPort and HTTPTunnelPorts
Closes ticket 26647.
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/control.c | 5 |
1 files changed, 4 insertions, 1 deletions
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) */ - |