Update golds, comment out all the horribleness that we were doing to the...

Update golds, comment out all the horribleness that we were doing to the client outputs, and do some sane things instead. Finally, disable rekey since that is known to be broken right now.

basice2e/clients.goldoutput/client18.txt

-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

basice2e/clients.goldoutput/client42.txt

- Hello from Rick42, with E2E Encryption
 Received: Hello from Ben43, with E2E Encryption
+Sent: Hello from Rick42, with E2E Encryption

basice2e/clients.goldoutput/client43.txt

- Hello from Ben43, with E2E Encryption
 Received: Hello from Rick42, with E2E Encryption
+Sent: Hello from Ben43, with E2E Encryption

basice2e/clients.goldoutput/client45.txt

 Message from 7, Rick Received: Hello, 4
-Received: Hello, 4
-Sending Message to AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU=, Ben: Hello, 5
+Sending Message to 5, Ben: Hello, 5

basice2e/clients.goldoutput/client56.txt

 Message from 4, Jim Received: Hello, 5
-Received: Hello, 5
-Sending Message to AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAY=, Steph: Hello, 6
+Sending Message to 6, Steph: Hello, 6

basice2e/clients.goldoutput/client67.txt

 Message from 5, Ben Received: Hello, 6
-Received: Hello, 6
-Sending Message to AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAc=, Rick: Hello, 7
+Sending Message to 7, Rick: Hello, 7

basice2e/clients.goldoutput/client74.txt

 Message from 6, Steph Received: Hello, 7
-Received: Hello, 7
-Sending Message to AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ=, Jim: Hello, 4
+Sending Message to 4, Jim: Hello, 4

basice2e/clients.goldoutput/client9.txt

-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

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