[tor-commits] [stegotorus/master] git-svn-id: svn+ssh://spartan.csl.sri.com/svn/private/DEFIANCE at 123 a58ff0ac-194c-e011-a152-003048836090

[zwol at torproject.org]

commit b111b5d76f2692e48bd692853fa3826696aa7bce
Author: Vinod Yegneswaran <vinod at csl.sri.com>
Date:   Sat Nov 5 00:22:59 2011 +0000

    git-svn-id: svn+ssh://spartan.csl.sri.com/svn/private/DEFIANCE@123 a58ff0ac-194c-e011-a152-003048836090
---
 src/steg/jsSteg.c  |    2 +-
 src/steg/x_http2.c |    2 +-
 start-server.csh   |    5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/steg/jsSteg.c b/src/steg/jsSteg.c
index a323d44..60b2d9a 100644
--- a/src/steg/jsSteg.c
+++ b/src/steg/jsSteg.c
@@ -1018,7 +1018,7 @@ x_http2_handle_client_JS_receive(steg_t *s, conn_t *conn, struct evbuffer *dest,
 
   // decCnt is an odd number or data is not a hex string
   if (decCnt % 2) {
-    log_debug("CLIENT ERROR: An odd number of hex characters received");
+    fprintf(stderr, "CLIENT ERROR: An odd number of hex characters received\n");
     //      buf_dump((unsigned char*)data, decCnt, stderr);
     return RECV_BAD;
   }
diff --git a/src/steg/x_http2.c b/src/steg/x_http2.c
index 1359238..f22dcea 100644
--- a/src/steg/x_http2.c
+++ b/src/steg/x_http2.c
@@ -624,7 +624,7 @@ x_http2_client_uri_transmit (steg_t *s, struct evbuffer *source, conn_t *conn) {
   //  fprintf(stderr, "outbuf = %s\n", outbuf);
 
   if (evbuffer_add(dest, outbuf, datalen)  ||  // add uri field
-      evbuffer_add(dest, "HTTP 1.1\r\nHost: ", 19) ||
+      evbuffer_add(dest, "HTTP/1.1\r\nHost: ", 19) ||
       evbuffer_add(dest, peername, strlen(peername)) ||
       evbuffer_add(dest, strstr(buf, "\r\n"), len - (unsigned int) (strstr(buf, "\r\n") - buf))  ||  // add everything but first line
       evbuffer_add(dest, "\r\n", 2)) {
diff --git a/start-server.csh b/start-server.csh
index 935e8bb..eb421c4 100644
--- a/start-server.csh
+++ b/start-server.csh
@@ -1,6 +1,9 @@
 #!/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=debug chop server 87.73.82.145:8080 128.18.9.71:8080 128.18.9.71:8081 
+# ./obfsproxy --log-min-severity=warn chop server 87.73.82.145:8080 128.18.9.71:8080 128.18.9.71:8081 
+./obfsproxy --log-min-severity=error chop server 87.73.82.145:8080 128.18.9.71:8080 128.18.9.71:8081