commit 8e2ec74ae00dc727d3b633804e8c2bed7ee14473 Author: Nick Mathewson nickm@torproject.org Date: Fri Jun 10 16:17:38 2011 -0400
Tweak int_test.sh to work with more installations; add more to "alpha" --- src/test/integration_test/alpha | 22 ++++++++++++++++++++++ src/test/integration_test/int_test.sh | 7 ++++--- 2 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/src/test/integration_test/alpha b/src/test/integration_test/alpha index 5d8b67e..8ed2ec7 100644 --- a/src/test/integration_test/alpha +++ b/src/test/integration_test/alpha @@ -19,3 +19,25 @@ THIS IS A TEST FILE. IT'S USED BY THE INTEGRATION TESTS. "THERE IS AS YET INSUFFICIENT DATA FOR A MEANINGFUL ANSWER." "Can entropy ever be reversed?" "THERE IS AS YET INSUFFICIENT DATA FOR A MEANINGFUL ANSWER." + + In obfuscatory age geeky warfare did I wage + For hiding bits from nasty censors' sight + I was hacker to my set in that dim dark age of net + And I hacked from noon till three or four at night + + Then a rival from Helsinki said my protocol was dinky + So I flamed him with a condescending laugh, + Saying his designs for stego might as well be made of lego + And that my bikeshed was prettier by half. + + But Claude Shannon saw my shame. From his noiseless channel came + A message sent with not a wasted byte + "There are nine and sixty ways to disguise communiques + And EVERY SINGLE ONE OF THEM IS RIGHT" + + (apologies to Rudyard Kipling.) + + + + + (p.s. Not every stego scheme is in fact right.) diff --git a/src/test/integration_test/int_test.sh b/src/test/integration_test/int_test.sh index c1ac908..d97a7f7 100644 --- a/src/test/integration_test/int_test.sh +++ b/src/test/integration_test/int_test.sh @@ -1,9 +1,9 @@ #!/bin/bash
# replace this with your path to obfsproxy. -OBFSPROXY="/torland/obfsproxy/obfsproxy" +OBFSPROXY="../../../obfsproxy" # replace this with your path to ncat. -NCAT="/usr/bin/ncat" +NCAT=ncat
ENTRY_PORT=4999 SERVER_PORT=5000 @@ -13,7 +13,7 @@ DIR=inttemp_temp FILE1=$DIR/test1 FILE2=$DIR/test2
-mkdir $DIR ; :>$FILE1 +mkdir -p $DIR ; :>$FILE1
# TEST 1 # We open a server and a client and transfer a file. Then we check if the output of the @@ -22,6 +22,7 @@ mkdir $DIR ; :>$FILE1 $NCAT -k -l -o $FILE1 -p $NCAT_PORT > /dev/null & ncat1_pid=$!
+ $OBFSPROXY --log-min-severity=warn obfs2 --dest=127.0.0.1:$NCAT_PORT server 127.0.0.1:$SERVER_PORT \ + obfs2 --dest=127.0.0.1:$SERVER_PORT client 127.0.0.1:$ENTRY_PORT & obfsproxy_pid=$!