commit e3e6335a08036fc64924b55e68f236a12e3c9118
Author: Nick Mathewson <ni...@torproject.org>
Date: Tue Jul 10 10:50:43 2018 -0400
Add controller support for listing ExtORPort and HTTPTunnelPorts
Closes ticket 26647.
---
changes/ticket26647 | 4 ++++
src/or/control.c | 5 ++++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/changes/ticket26647 b/changes/ticket26647
new file mode 100644
index 000000000..1c2e917c6
--- /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 202366aae..3609210b9 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) */
-
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
