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

diff --git a/src/or/Makefile.am b/src/or/Makefile.am
index 4dc5ee55f6b912ee608cda8b533f3c417d28ef5d..41e89d7419754fd153e1a66611fd759d8e03f8b9 100644 (file)
--- a/src/or/Makefile.am
+++ b/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                                 \

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 003f579e7596b0d7b0706f051c0d033218f2102f..3dba83ba3084725d1506fe756e0f074525289a55 100644 (file)
--- a/src/or/circuitbuild.c
+++ b/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"

diff --git a/src/or/config.c b/src/or/config.c
index 5f2f11dddf4016174e2ac17f27548a11a1a2082c..da35270b4b337eb7fdb0bf43cba3594f8c176f55 100644 (file)
--- a/src/or/config.c
+++ b/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

diff --git a/src/or/main.c b/src/or/main.c
index d79d9ebaaad40c04746ab2c57dfa2267f3da47e7..5294e4ad0dfb6a8198e903ad7d6e8695cad2bc22 100644 (file)
--- a/src/or/main.c
+++ b/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"

diff --git a/src/or/transports.c b/src/or/transports.c
index 49b0e131af6fc51c614efb3a09d6c169503ad0e0..aae39cd8f0cf0e6f4241de03ca9bcc98434ce019 100644 (file)
--- a/src/or/transports.c
+++ b/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,

diff --git a/src/or/transports.h b/src/or/transports.h
index 80d5429e70870b7830975383786c78e59f3a64a0..17a68030d7aa71397899d6988376b7d9d020e4fc 100644 (file)
--- a/src/or/transports.h
+++ b/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);

diff --git a/src/test/test_pt.c b/src/test/test_pt.c
index 02950b8daaccfb6bad73af76daf6810eed133f42..99fc5145e0f9684fc0daf7bfca39d4ff0ea76fae 100644 (file)
--- a/src/test/test_pt.c
+++ b/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"