mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-25 07:07:52 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'ticket26647_032' into maint-0.3.2

Browse source
This commit is contained in:
Nick Mathewson 2018-07-20 10:42:23 -04:00
commit be3a962ca7
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
changes/ticket26647 Normal file
View file

@ -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.

5
src/or/control.c
View file

@ -1848,6 +1848,8 @@ getinfo_helper_listeners(control_connection_t *control_conn,
if (!strcmp(question, "net/listeners/or")) if (!strcmp(question, "net/listeners/or"))
type = CONN_TYPE_OR_LISTENER; 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")) else if (!strcmp(question, "net/listeners/dir"))
type = CONN_TYPE_DIR_LISTENER; type = CONN_TYPE_DIR_LISTENER;
else if (!strcmp(question, "net/listeners/socks")) 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; type = CONN_TYPE_AP_TRANS_LISTENER;
else if (!strcmp(question, "net/listeners/natd")) else if (!strcmp(question, "net/listeners/natd"))
type = CONN_TYPE_AP_NATD_LISTENER; 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")) else if (!strcmp(question, "net/listeners/dns"))
type = CONN_TYPE_AP_DNS_LISTENER; type = CONN_TYPE_AP_DNS_LISTENER;
else if (!strcmp(question, "net/listeners/control")) else if (!strcmp(question, "net/listeners/control"))
@ -7318,4 +7322,3 @@ control_testing_set_global_event_mask(uint64_t mask)
global_event_mask = mask; global_event_mask = mask;
} }
#endif /* defined(TOR_UNIT_TESTS) */ #endif /* defined(TOR_UNIT_TESTS) */