Move transport-related functions from circuitbuild.c to transports.c.

Move 'transport_t' to transports.h, and all transport-related
functions that don't rely on 'bridge_list' to transports.c.

1 files changed, 1 insertions, 29 deletions

diff --git a/src/or/circuitbuild.h b/src/or/circuitbuild.h
index 984d04a99e..e6783d832f 100644
--- a/src/or/circuitbuild.h
+++ b/src/or/circuitbuild.h
@@ -12,20 +12,7 @@
 #ifndef _TOR_CIRCUITBUILD_H
 #define _TOR_CIRCUITBUILD_H
 
-/** Represents a pluggable transport proxy used by a bridge. */
-typedef struct {
-  /** SOCKS version: One of PROXY_SOCKS4, PROXY_SOCKS5. */
-  int socks_version;
-  /** Name of pluggable transport protocol */
-  char *name;
-  /** Address of proxy */
-  tor_addr_t addr;
-  /** Port of proxy */
-  uint16_t port;
-  /** Boolean: We are re-parsing our transport list, and we are going to remove
-   * this one if we don't find it in the list of configured transports. */
-  unsigned marked_for_removal : 1;
-} transport_t;
+#include "transports.h"
 
 char *circuit_list_path(origin_circuit_t *circ, int verbose);
 char *circuit_list_path_for_controller(origin_circuit_t *circ);
@@ -82,8 +69,6 @@ int getinfo_helper_entry_guards(control_connection_t *conn,
 
 void mark_bridge_list(void);
 void sweep_bridge_list(void);
-void mark_transport_list(void);
-void sweep_transport_list(void);
 
 int routerinfo_is_a_configured_bridge(const routerinfo_t *ri);
 int node_is_a_configured_bridge(const node_t *node);
@@ -151,21 +136,8 @@ void circuit_build_times_network_circ_success(circuit_build_times_t *cbt);
 /* DOCDOC circuit_build_times_get_bw_scale */
 int circuit_build_times_get_bw_scale(networkstatus_t *ns);
 
-void clear_transport_list(void);
-int transport_add_from_config(const tor_addr_t *addr, uint16_t port,
-                               const char *name, int socks_ver);
-int transport_add(transport_t *t);
-void transport_free(transport_t *transport);
-transport_t *transport_new(const tor_addr_t *addr, uint16_t port,
-                                      const char *name, int socks_ver);
-
-/* DOCDOC find_transport_name_by_bridge_addrport */
-const char *find_transport_name_by_bridge_addrport(const tor_addr_t *addr,
-                                                   uint16_t port);
-
 int find_transport_by_bridge_addrport(const tor_addr_t *addr, uint16_t port,
                                       const transport_t **transport);
-transport_t *transport_get_by_name(const char *name);
 
 #endif