commit 9de52a8c357de558f43b663fd2280c9a69074593 Author: Zack Weinberg zackw@panix.com Date: Sat Jul 30 17:26:47 2011 -0700
Disable obfs2 for the moment. --- .gitignore | 1 + Makefile.am | 11 ++++++----- src/protocol.c | 4 ++-- src/test/unittest.c | 4 ++-- 4 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/.gitignore b/.gitignore index 2a8bc47..a58a8c5 100644 --- a/.gitignore +++ b/.gitignore @@ -24,4 +24,5 @@ Makefile.in /libobfsproxy.a /obfsproxy /unittests +/tester.py
diff --git a/Makefile.am b/Makefile.am index 5a815ff..617fd27 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,8 +15,7 @@ libobfsproxy_a_SOURCES = \ src/protocol.c \ src/socks.c \ src/util.c \ - src/protocols/dummy.c \ - src/protocols/obfs2.c + src/protocols/dummy.c if NEED_SHA256 libobfsproxy_a_SOURCES += src/sha256.c endif @@ -30,8 +29,7 @@ unittests_SOURCES = \ src/test/unittest_container.c \ src/test/unittest_crypt.c \ src/test/unittest_socks.c \ - src/test/unittest_dummy.c \ - src/test/unittest_obfs2.c + src/test/unittest_dummy.c
noinst_HEADERS = \ src/container.h \ @@ -48,7 +46,10 @@ noinst_HEADERS = \ src/test/tinytest.h \ src/test/tinytest_macros.h
-EXTRA_DIST = doc/protocol-spec.txt +EXTRA_DIST = doc/protocol-spec.txt \ + src/protocols/obfs2.c \ + src/test/unittest_obfs2.c +
TESTS = unittests
diff --git a/src/protocol.c b/src/protocol.c index 2966e06..8366d58 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -5,7 +5,7 @@ #include "util.h"
#include "protocol.h" -#include "protocols/obfs2.h" +/*#include "protocols/obfs2.h"*/ #include "protocols/dummy.h"
/** @@ -15,7 +15,7 @@ const protocol_vtable *const supported_protocols[] = { &dummy_vtable, - &obfs2_vtable, + /*&obfs2_vtable,*/ }; const size_t n_supported_protocols = sizeof(supported_protocols)/sizeof(supported_protocols[0]); diff --git a/src/test/unittest.c b/src/test/unittest.c index 6ff938e..29c0af9 100644 --- a/src/test/unittest.c +++ b/src/test/unittest.c @@ -9,14 +9,14 @@ extern struct testcase_t container_tests[]; extern struct testcase_t crypt_tests[]; extern struct testcase_t socks_tests[]; extern struct testcase_t dummy_tests[]; -extern struct testcase_t obfs2_tests[]; +/*extern struct testcase_t obfs2_tests[];*/
struct testgroup_t groups[] = { { "container/", container_tests }, { "crypt/", crypt_tests }, { "socks/", socks_tests }, { "dummy/", dummy_tests }, - { "obfs2/", obfs2_tests }, + /*{ "obfs2/", obfs2_tests },*/ END_OF_GROUPS };