tor

commit 977821e59fb6e57639a842f498be32633bb0b0e1
parent 7260d07feec41a37d57e5e046d154760d569ecc6
Author: Nick Mathewson <nickm@torproject.org>
Date:   Fri, 20 Jul 2018 10:42:29 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

Diffstat:
A
changes/ticket26647
 | 
4
++++
M
src/or/control.c
 | 
4
++++

2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/changes/ticket26647 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
@@ -1975,6 +1975,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"))
@@ -1983,6 +1985,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"))