commit 52513eb4f7dac382655ea86dab8ec5207492c42e Author: George Kadianakis desnacked@gmail.com Date: Wed Apr 27 02:12:02 2011 +0200
Programs that run are more fun: Trivial #include edits --- src/protocol.c | 4 ++-- src/test/unittest.c | 2 +- src/test/unittest_crypt.c | 2 +- src/test/unittest_obfs2.c | 4 ++-- src/test/unittest_socks.c | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/protocol.c b/src/protocol.c index 2195b29..1fbd3f7 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -5,8 +5,8 @@ #include "protocol.h" #include "network.h"
-#include "plugins/obfs2.h" -#include "plugins/dummy.h" +#include "protocols/obfs2.h" +#include "protocols/dummy.h"
/** This function initializes <protocol>. diff --git a/src/test/unittest.c b/src/test/unittest.c index 494e90b..41159ca 100644 --- a/src/test/unittest.c +++ b/src/test/unittest.c @@ -7,7 +7,7 @@ #include <stdlib.h>
#include "tinytest.h" -#include "../plugins/obfs2_crypt.h" +#include "../protocols/obfs2_crypt.h"
extern struct testcase_t crypt_tests[]; extern struct testcase_t protocol_tests[]; diff --git a/src/test/unittest_crypt.c b/src/test/unittest_crypt.c index b624e15..5980636 100644 --- a/src/test/unittest_crypt.c +++ b/src/test/unittest_crypt.c @@ -12,7 +12,7 @@
#include <openssl/aes.h>
-#include "../plugins/obfs2_crypt.h" +#include "../protocols/obfs2_crypt.h"
struct crypt_t { AES_KEY key; diff --git a/src/test/unittest_obfs2.c b/src/test/unittest_obfs2.c index cdac4c9..f006b2f 100644 --- a/src/test/unittest_obfs2.c +++ b/src/test/unittest_obfs2.c @@ -17,10 +17,10 @@
#define CRYPT_PROTOCOL_PRIVATE #define CRYPT_PRIVATE -#include "../plugins/obfs2_crypt.h" +#include "../protocols/obfs2_crypt.h" #include "../util.h" #include "../protocol.h" -#include "../plugins/obfs2.h" +#include "../protocols/obfs2.h"
/* Make sure we can successfully set up a protocol state */ static void diff --git a/src/test/unittest_socks.c b/src/test/unittest_socks.c index db91188..017e624 100644 --- a/src/test/unittest_socks.c +++ b/src/test/unittest_socks.c @@ -9,9 +9,9 @@
#define SOCKS_PRIVATE #include "../socks.h" -#include "../plugins/obfs2_crypt.h" +#include "../protocols/obfs2_crypt.h" #include "../util.h" -#include "../plugins/obfs2.h" +#include "../protocols/obfs2.h"
static void test_socks_send_negotiation(void *data)