Updated #includes etc. to use transports.[ch].

src/or/Makefile.am

@@ -39,7 +39,7 @@ libtor_a_SOURCES = \
 	networkstatus.c				\
 	nodelist.c				\
 	onion.c					\
-	pluggable_transports.c  \
+	transports.c            \
 	policies.c				\
 	reasons.c				\
 	relay.c					\
@@ -105,7 +105,7 @@ noinst_HEADERS = \
 	ntmain.h				\
 	onion.h					\
 	or.h					\
-	pluggable_transports.h  \
+	transports.h            \
 	policies.h				\
 	reasons.h				\
 	relay.h					\

src/or/circuitbuild.c

@@ -26,7 +26,7 @@
 #include "nodelist.h"
 #include "onion.h"
 #include "policies.h"
-#include "pluggable_transports.h"
+#include "transports.h"
 #include "relay.h"
 #include "rephist.h"
 #include "router.h"

src/or/config.c

@@ -35,7 +35,7 @@
 #include "router.h"
 #include "util.h"
 #include "routerlist.h"
-#include "pluggable_transports.h"
+#include "transports.h"
 #ifdef MS_WINDOWS
 #include <shlobj.h>
 #endif

src/or/main.c

@@ -37,7 +37,7 @@
 #include "ntmain.h"
 #include "onion.h"
 #include "policies.h"
-#include "pluggable_transports.h"
+#include "transports.h"
 #include "relay.h"
 #include "rendclient.h"
 #include "rendcommon.h"

src/or/transports.c

@@ -2,7 +2,7 @@
 /* See LICENSE for licensing information */
 
 /**
- * \file pluggable_transports.c
+ * \file transports.c
  * \brief Pluggable Transports related code.
  **/
 
@@ -10,7 +10,7 @@
 #include "or.h"
 #include "config.h"
 #include "circuitbuild.h"
-#include "pluggable_transports.h"
+#include "transports.h"
 
 /* ASN TIDY THESE UP*/
 static void set_environ(char ***envp, const char *method,

src/or/transports.h

@@ -4,12 +4,12 @@
 /* See LICENSE for licensing information */
 
 /**
- * \file pluggable_transpots.h
- * \brief Headers for pluggable_transpots.c
+ * \file transports.h
+ * \brief Headers for transports.c
  **/
 
-#ifndef TOR_PLUGGABLE_TRANSPORTS_H
-#define TOR_PLUGGABLE_TRANSPORTS_H
+#ifndef TOR_TRANSPORTS_H
+#define TOR_TRANSPORTS_H
 
 int pt_managed_launch_proxy(const char *method,
                          char **proxy_argv, int is_server);

src/test/test_pt.c

@@ -6,7 +6,7 @@
 #include "orconfig.h"
 #define PT_PRIVATE
 #include "or.h"
-#include "pluggable_transports.h"
+#include "transports.h"
 #include "circuitbuild.h"
 #include "test.h"