Commit be3a962c authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge branch 'ticket26647_032' into maint-0.3.2

parents 209332e7 e3e6335a

changes/ticket26647

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  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.

src/or/control.c

+4 −1
Original line number Diff line number Diff line
@@ -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) */