commit a8f21f91cfa916b662d07dd486857fdf848c6f1d Author: George Kadianakis <desnacked@gmail.com> Date: Mon Jul 18 02:33:31 2011 +0200 Updated #includes etc. to use transports.[ch]. --- src/or/Makefile.am | 4 ++-- src/or/circuitbuild.c | 2 +- src/or/config.c | 2 +- src/or/main.c | 2 +- src/or/transports.c | 4 ++-- src/or/transports.h | 8 ++++---- src/test/test_pt.c | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/or/Makefile.am b/src/or/Makefile.am index 4dc5ee5..41e89d7 100644 --- 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 003f579..3dba83b 100644 --- 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 5f2f11d..da35270 100644 --- 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 d79d9eb..5294e4a 100644 --- 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 49b0e13..aae39cd 100644 --- 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 80d5429..17a6803 100644 --- 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 02950b8..99fc514 100644 --- 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"