[tor-commits] [stegotorus/master] disabled x_http.c by adding return 0 to x_http_detect.

[zwol at torproject.org]

commit 27c3f3c2dc33ca82ba5f558cf808e65c3747b3ba
Author: Vinod Yegneswaran <vinod at csl.sri.com>
Date:   Tue Nov 1 06:08:24 2011 +0000

    disabled x_http.c by adding return 0 to x_http_detect.
    svn version should now be working...
    
    git-svn-id: svn+ssh://spartan.csl.sri.com/svn/private/DEFIANCE@110 a58ff0ac-194c-e011-a152-003048836090
---
 src/steg/x_http.c |    1 +
 start-client.csh  |    4 ++--
 start-server.csh  |    4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/steg/x_http.c b/src/steg/x_http.c
index df0b94b..c26fe1f 100644
--- a/src/steg/x_http.c
+++ b/src/steg/x_http.c
@@ -71,6 +71,7 @@ x_http_detect(conn_t *conn)
 {
   struct evbuffer *buf = conn_get_inbound(conn);
   unsigned char *data;
+  return 0;
 
   /* Look for the text of http_response_1. */
   if (evbuffer_get_length(buf) >= sizeof http_response_1 - 1) {
diff --git a/start-client.csh b/start-client.csh
index 65f4465..a09302e 100644
--- a/start-client.csh
+++ b/start-client.csh
@@ -2,7 +2,7 @@
 # ./obfsproxy --log-min-severity=debug x_dsteg socks 127.0.0.1:1080 x_http
 
 setenv EVENT_NOKQUEUE yes 
-#./obfsproxy --log-min-severity=debug chop socks 127.0.0.1:1080 127.0.0.1:8080 x_http2 127.0.0.1:8081 x_http2
+./obfsproxy --log-min-severity=debug chop socks 127.0.0.1:1080 127.0.0.1:8080 x_http2 127.0.0.1:8081 x_http2
 # ./obfsproxy --log-min-severity=warn chop socks 127.0.0.1:1080 127.0.0.1:8080 x_http2 127.0.0.1:8081 x_http2
-./obfsproxy --log-min-severity=error chop socks 127.0.0.1:1080 127.0.0.1:8080 x_http2 127.0.0.1:8081 x_http2
+#./obfsproxy --log-min-severity=error chop socks 127.0.0.1:1080 127.0.0.1:8080 x_http2 127.0.0.1:8081 x_http2
 
diff --git a/start-server.csh b/start-server.csh
index 50b781a..935e8bb 100644
--- a/start-server.csh
+++ b/start-server.csh
@@ -1,6 +1,6 @@
 #!/bin/csh
 setenv EVENT_NOKQUEUE yes 
-#./obfsproxy --log-min-severity=debug chop server 87.73.82.145:8080 127.0.0.1:8080 127.0.0.1:8081
+./obfsproxy --log-min-severity=debug chop server 87.73.82.145:8080 127.0.0.1:8080 127.0.0.1:8081
 # ./obfsproxy --log-min-severity=warn chop server 87.73.82.145:8080 127.0.0.1:8080 127.0.0.1:8081
-./obfsproxy --log-min-severity=error chop server 87.73.82.145:8080 127.0.0.1:8080 127.0.0.1:8081
+#./obfsproxy --log-min-severity=error chop server 87.73.82.145:8080 127.0.0.1:8080 127.0.0.1:8081