mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-28 06:13:31 +01:00
Merge branch 'maint-0.3.2' into maint-0.3.3
This commit is contained in:
commit
dbf57ecf39
4
changes/ticket26647
Normal file
4
changes/ticket26647
Normal 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.
|
@ -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"))
|
||||
|
Loading…
Reference in New Issue
Block a user