diff --git a/basice2e/clients.goldoutput/client18.txt b/basice2e/clients.goldoutput/client18.txt index 9be1b32dd0fbd4d9c6136b7038b1a59d8384353a..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 --- a/basice2e/clients.goldoutput/client18.txt +++ b/basice2e/clients.goldoutput/client18.txt @@ -1,3 +0,0 @@ -Message from 9, Spencer Received: Hello, 18, with E2E Encryption -Received: Hello, 18, with E2E Encryption -Sending Message to AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAk=, Spencer: Hello, 9, with E2E Encryption diff --git a/basice2e/clients.goldoutput/client42.txt b/basice2e/clients.goldoutput/client42.txt index f24f5d7143a769875f7eb6468e3d74c72f5cd4cf..c98ed71ba740f2049a7fae7a54187d9e16673765 100644 --- a/basice2e/clients.goldoutput/client42.txt +++ b/basice2e/clients.goldoutput/client42.txt @@ -1,2 +1,2 @@ - Hello from Rick42, with E2E Encryption Received: Hello from Ben43, with E2E Encryption +Sent: Hello from Rick42, with E2E Encryption diff --git a/basice2e/clients.goldoutput/client43.txt b/basice2e/clients.goldoutput/client43.txt index 0463ff2a134e3775a7c738ee7b5011790c6250df..a4c82de7eec511c656bd1670bdb94d90af41a5a3 100644 --- a/basice2e/clients.goldoutput/client43.txt +++ b/basice2e/clients.goldoutput/client43.txt @@ -1,2 +1,2 @@ - Hello from Ben43, with E2E Encryption Received: Hello from Rick42, with E2E Encryption +Sent: Hello from Ben43, with E2E Encryption diff --git a/basice2e/clients.goldoutput/client45.txt b/basice2e/clients.goldoutput/client45.txt index bbbbb135dfccb8adebd471a1569d9400ee312cd3..364c8e147346f8bd6719e02d274211cf96195128 100644 --- a/basice2e/clients.goldoutput/client45.txt +++ b/basice2e/clients.goldoutput/client45.txt @@ -1,3 +1,2 @@ Message from 7, Rick Received: Hello, 4 -Received: Hello, 4 -Sending Message to AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU=, Ben: Hello, 5 +Sending Message to 5, Ben: Hello, 5 diff --git a/basice2e/clients.goldoutput/client56.txt b/basice2e/clients.goldoutput/client56.txt index 356b9a4cba30096034eedd16bf09d4958d2eb0a8..1384be5a4ce630dc90dff84dfb783290f9091de7 100644 --- a/basice2e/clients.goldoutput/client56.txt +++ b/basice2e/clients.goldoutput/client56.txt @@ -1,3 +1,2 @@ Message from 4, Jim Received: Hello, 5 -Received: Hello, 5 -Sending Message to AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAY=, Steph: Hello, 6 +Sending Message to 6, Steph: Hello, 6 diff --git a/basice2e/clients.goldoutput/client67.txt b/basice2e/clients.goldoutput/client67.txt index 5c9fdd177772f3524d5c2fdd2ac0848188c5b5aa..37a4dcdaf58be9e54e1e783937edae2521d579ca 100644 --- a/basice2e/clients.goldoutput/client67.txt +++ b/basice2e/clients.goldoutput/client67.txt @@ -1,3 +1,2 @@ Message from 5, Ben Received: Hello, 6 -Received: Hello, 6 -Sending Message to AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAc=, Rick: Hello, 7 +Sending Message to 7, Rick: Hello, 7 diff --git a/basice2e/clients.goldoutput/client74.txt b/basice2e/clients.goldoutput/client74.txt index c293c40cca584d480e5baa6805fe9d79e4d5387a..05887b80e1b4ea50b11fbac9fd130315a3e8da2d 100644 --- a/basice2e/clients.goldoutput/client74.txt +++ b/basice2e/clients.goldoutput/client74.txt @@ -1,3 +1,2 @@ Message from 6, Steph Received: Hello, 7 -Received: Hello, 7 -Sending Message to AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ=, Jim: Hello, 4 +Sending Message to 4, Jim: Hello, 4 diff --git a/basice2e/clients.goldoutput/client9.txt b/basice2e/clients.goldoutput/client9.txt index 1314bc60142526f57bf21bac39fc4060f3b9c38d..43b019ecdd4a252b4921ce0be522b18622c6645a 100644 --- a/basice2e/clients.goldoutput/client9.txt +++ b/basice2e/clients.goldoutput/client9.txt @@ -1,3 +1,2 @@ -Message from 18, Bernardo Received: Hello, 9, with E2E Encryption -Received: Hello, 9, with E2E Encryption -Sending Message to AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABI=, Bernardo: Hello, 18, with E2E Encryption +Message from 9, Spencer Received: Hi +Sending Message to 9, Spencer: Hi diff --git a/basice2e/run.sh b/basice2e/run.sh index 2ef300156018ad1c9e5ac3b030bb85ac40abfa2e..c952e00b93418378a87ad6ce776507831a6c3b0c 100755 --- a/basice2e/run.sh +++ b/basice2e/run.sh @@ -199,29 +199,34 @@ wait $PIDVAL2 # FIXME: Go into client and clean up it's output so this is not necessary -for C in $(ls -1 $CLIENTOUT); do - # Remove the [CLIENT] Lines and cut them down - strings $CLIENTOUT/$C | grep "\[CLIENT\]" | cut -d\ -f5- | grep -e "Received\:" -e "Sending Message" -e "Message from" > $CLIENTCLEAN/$C || true - # Take the clean lines and add them - strings $CLIENTOUT/$C | grep -v "\[CLIENT\]" | grep -e "Received\:" -e "Sending Message" -e "Message from" >> $CLIENTCLEAN/$C || true - strings $CLIENTOUT/$C | grep -v "\[CLIENT\]" | cut -d\ -f5- | grep -e "Received\:" >> $CLIENTCLEAN/$C || true -done +# for C in $(ls -1 $CLIENTOUT); do +# # Remove the [CLIENT] Lines and cut them down +# strings $CLIENTOUT/$C | grep "\[CLIENT\]" | cut -d\ -f5- | grep -e "Received\:" -e "Sending Message" -e "Message from" > $CLIENTCLEAN/$C || true +# # Take the clean lines and add them +# strings $CLIENTOUT/$C | grep -v "\[CLIENT\]" | grep -e "Received\:" -e "Sending Message" -e "Message from" >> $CLIENTCLEAN/$C || true +# strings $CLIENTOUT/$C | grep -v "\[CLIENT\]" | cut -d\ -f5- | grep -e "Received\:" >> $CLIENTCLEAN/$C || true +# done # only expect up to 10c messages from the e2e clients -head -10 $CLIENTCLEAN/client9_rekey.txt | strings | grep -v "\.\.\." | grep -v "Timestamp" > $CLIENTCLEAN/client9.txt || true -head -10 $CLIENTCLEAN/client18_rekey.txt | strings | grep -v "\.\.\." | grep -v "Timestamp" > $CLIENTCLEAN/client18.txt || true -rm $CLIENTCLEAN/client9_rekey.txt $CLIENTCLEAN/client18_rekey.txt || true +# head -10 $CLIENTCLEAN/client9_rekey.txt | strings | grep -v "\.\.\." | grep -v "Timestamp" > $CLIENTCLEAN/client9.txt || true +# head -10 $CLIENTCLEAN/client18_rekey.txt | strings | grep -v "\.\.\." | grep -v "Timestamp" > $CLIENTCLEAN/client18.txt || true +# rm $CLIENTCLEAN/client9_rekey.txt $CLIENTCLEAN/client18_rekey.txt || true + + +# strings $CLIENTCLEAN/client42.txt | grep -v "Timestamp" | grep -v "\.\.\." > $CLIENTCLEAN/client42-clean.txt || true +# strings $CLIENTCLEAN/client43.txt | grep -v "Timestamp" | grep -v "\.\.\." > $CLIENTCLEAN/client43-clean.txt || true +# strings $CLIENTCLEAN/client74.txt | grep -v "Timestamp" | grep -v "\.\.\." > $CLIENTCLEAN/client74-clean.txt || true +# mv $CLIENTCLEAN/client42-clean.txt $CLIENTCLEAN/client42.txt +# mv $CLIENTCLEAN/client43-clean.txt $CLIENTCLEAN/client43.txt + +cp $CLIENTOUT/*.txt $CLIENTCLEAN/ -strings $CLIENTCLEAN/client42.txt | grep -v "Timestamp" | grep -v "\.\.\." > $CLIENTCLEAN/client42-clean.txt || true -strings $CLIENTCLEAN/client43.txt | grep -v "Timestamp" | grep -v "\.\.\." > $CLIENTCLEAN/client43-clean.txt || true -strings $CLIENTCLEAN/client74.txt | grep -v "Timestamp" | grep -v "\.\.\." > $CLIENTCLEAN/client74-clean.txt || true -mv $CLIENTCLEAN/client42-clean.txt $CLIENTCLEAN/client42.txt -mv $CLIENTCLEAN/client43-clean.txt $CLIENTCLEAN/client43.txt -mv $CLIENTCLEAN/client74-clean.txt $CLIENTCLEAN/client74.txt +# Ignore rekey for now +rm $CLIENTCLEAN/*_rekey.txt -sed -i 's/Sending\ Message\ to\ .*,\ ://g' $CLIENTCLEAN/client42.txt -sed -i 's/Sending\ Message\ to\ .*,\ ://g' $CLIENTCLEAN/client43.txt +sed -i 's/Sending\ Message\ to\ .*,\ :/Sent:/g' $CLIENTCLEAN/client4[23].txt +sed -i 's/Message\ from\ .*, .* Received:/Received:/g' $CLIENTCLEAN/client4[23].txt for C in $(ls -1 $CLIENTCLEAN); do sort -o tmp $CLIENTCLEAN/$C || true