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

Merge branch 'maint-0.3.3' into maint-0.3.4

Browse source
This commit is contained in:
Nick Mathewson 2018-07-20 10:42:29 -04:00
commit 977821e59f
2 changed files with 8 additions and 0 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.

4
src/or/control.c
View file

@ -1975,6 +1975,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"))
@ -1983,6 +1985,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"))