diff --git a/basice2e/clients.goldoutput/client110.txt b/basice2e/clients.goldoutput/client110.txt
index 9ef4ae6875d9e582e20f4a6055a64ebe1a797bfb..db2ba7f543032704a12bc2975e07e2ae996d3e59 100644
--- a/basice2e/clients.goldoutput/client110.txt
+++ b/basice2e/clients.goldoutput/client110.txt
@@ -1,5 +1,6 @@
Received new file transfer "LoremIpsum.txt" of size 100332 bytes with preview: "Lorem ipsum dolor sit amet, consectetur adipiscing elit."
Received progress callback {completed: true, received: 109, total: 109, err: <nil>}
+Received progress callback {completed: true, received: 109, total: 109, err: <nil>}
Completed receiving file:
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut at efficitur urna, et ultrices leo. Sed lacinia vestibulum tortor eu convallis. Proin imperdiet accumsan magna, sed volutpat tortor consectetur at. Mauris sed dolor sed sapien porta consectetur in eu sem. Maecenas vestibulum varius erat, eget porta eros vehicula mattis. Phasellus tempor odio at tortor maximus convallis. Nullam ut lorem laoreet, tincidunt ex sollicitudin, aliquam urna. Mauris vel enim consequat, sodales nibh quis, sollicitudin ipsum. Quisque lacinia, sapien a tempor eleifend, dolor nibh posuere neque, sit amet tempus dolor ante non nunc. Proin tempor blandit mollis. Mauris nunc sem, egestas eget velit ut, luctus molestie ipsum. Pellentesque sed eleifend dolor. Nullam pulvinar dignissim ante, eget luctus quam hendrerit vel. Proin ornare non tortor vitae rhoncus. Etiam tellus sem, condimentum id bibendum sed, blandit ac lorem. Maecenas gravida, neque quis blandit ultrices, nisl elit pretium nulla, ac volutpat massa odio sed arcu.
diff --git a/basice2e/clients.goldoutput/client111.txt b/basice2e/clients.goldoutput/client111.txt
index 879608dc7cf281bc5fc53c6af7a3e7c8941381c8..65de192ef80ff8d0f095022f9696d00d22f11501 100644
--- a/basice2e/clients.goldoutput/client111.txt
+++ b/basice2e/clients.goldoutput/client111.txt
@@ -1,3 +1,3 @@
-Sent progress callback for "LoremIpsum.txt" {completed: false, sent: 0, arrived: 0, total: 109, err: <nil>}
-Sent progress callback for "LoremIpsum.txt" {completed: true, sent: 0, arrived: 109, total: 109, err: <nil>}
+Sent progress callback for "LoremIpsum.txt" {completed: false, arrived: 0, total: 109, err: <nil>}
+Sent progress callback for "LoremIpsum.txt" {completed: true, arrived: 109, total: 109, err: <nil>}
Completed sending file.
diff --git a/basice2e/clients.goldoutput/client120.txt b/basice2e/clients.goldoutput/client120.txt
index 052956ed1263436982fb05d21a2875b498c9e788..f0fe55c6219a576d8f1431cfbe37391e4120265b 100644
--- a/basice2e/clients.goldoutput/client120.txt
+++ b/basice2e/clients.goldoutput/client120.txt
@@ -1,4 +1,5 @@
+
Message received: Hello from Client120 to myself, without E2E Encryption
Message received: Hello from Client121, with E2E Encryption
Message received: Hello from Client121, with E2E Encryption
diff --git a/basice2e/clients.goldoutput/client121.txt b/basice2e/clients.goldoutput/client121.txt
index a20a99f4bd1992c6f342780ec14f137bacab32dd..7cfbcdd3868ebc95e9205b9a7f23e1eafbc417fe 100644
--- a/basice2e/clients.goldoutput/client121.txt
+++ b/basice2e/clients.goldoutput/client121.txt
@@ -1,5 +1,5 @@
Adding
-Adding
+Backup update received.
Backup update received.
Message received: Hello from Client120, with E2E Encryption
Message received: Hello from Client120, with E2E Encryption
@@ -25,4 +25,3 @@ Sent: Hello from Client121, with E2E Encryption after 121 restoring backup
Sent: Hello from Client121, with E2E Encryption after 121 restoring backup
Sent: Hello from Client121, with E2E Encryption after 121 restoring backup
WARNING: unsafe channel creation enabled
-WARNING: unsafe channel creation enabled
diff --git a/basice2e/clients.goldoutput/client13-2.txt b/basice2e/clients.goldoutput/client13-2.txt
index 2dd1c77b195e8ef18c27e118e4e36cc91277dc67..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/basice2e/clients.goldoutput/client13-2.txt
+++ b/basice2e/clients.goldoutput/client13-2.txt
@@ -1 +0,0 @@
-Failed to register user josh13: rpc error: code = Unknown desc = Username "josh13" is already taken. Please try again
diff --git a/basice2e/clients.goldoutput/client42.txt b/basice2e/clients.goldoutput/client42.txt
index f627caca53293bff9489951f4a3b91d7a0fc72cc..b467a451c581c19d83a5e2516d5730d72e75bcb0 100644
--- a/basice2e/clients.goldoutput/client42.txt
+++ b/basice2e/clients.goldoutput/client42.txt
@@ -1,4 +1,5 @@
+
Message received: Hello from Ben43, with E2E Encryption
Message received: Hello from Ben43, with E2E Encryption
Message received: Hello from Ben43, with E2E Encryption
diff --git a/basice2e/clients.goldoutput/client43.txt b/basice2e/clients.goldoutput/client43.txt
index 418601325df3808fffb3a8f7b06fb66da8e1b08a..c6124be3d51873f48340f0378b14b134296ff6a0 100644
--- a/basice2e/clients.goldoutput/client43.txt
+++ b/basice2e/clients.goldoutput/client43.txt
@@ -1,3 +1,4 @@
+
Adding
Message received: Hello from Rick42, with E2E Encryption
Message received: Hello from Rick42, with E2E Encryption
diff --git a/basice2e/clients.goldoutput/client44.txt b/basice2e/clients.goldoutput/client44.txt
new file mode 100644
index 0000000000000000000000000000000000000000..490242cdfe44edc883280822d98668b4389d9e3d
--- /dev/null
+++ b/basice2e/clients.goldoutput/client44.txt
@@ -0,0 +1,3 @@
+Message received: Hello from David44 to myself, without E2E Encryption
+Received 1
+Sent: Hello from David44 to myself, without E2E Encryption
diff --git a/basice2e/clients.goldoutput/client45.txt b/basice2e/clients.goldoutput/client45.txt
index be35f686e33a732e20b54e7559d25b3aa68b64fe..d027c5421d929e381139142b8a695f530d8c27fd 100644
--- a/basice2e/clients.goldoutput/client45.txt
+++ b/basice2e/clients.goldoutput/client45.txt
@@ -1,4 +1,3 @@
-Adding
Message received: Hello, 4
Message received: Hello, 4
Message received: Hello, 4
@@ -39,7 +38,6 @@ Message received: Hello, 4
Message received: Hello, 4
Message received: Hello, 4
Message received: Hello, 4
-Received 0
Received 20
Received 20
Sent: Hello, 5
@@ -82,4 +80,3 @@ Sent: Hello, 5
Sent: Hello, 5
Sent: Hello, 5
Sent: Hello, 5
-WARNING: unsafe channel creation enabled
diff --git a/basice2e/clients.goldoutput/client52.txt b/basice2e/clients.goldoutput/client52.txt
index 87aadb606e1d823846bb66d9bf28b26c36e0e210..b4402f667a1033057c89cc4dfe00a0918d4029fb 100644
--- a/basice2e/clients.goldoutput/client52.txt
+++ b/basice2e/clients.goldoutput/client52.txt
@@ -1,3 +1,3 @@
-Sending single-use response message: Test single-use message Test single-use message Test single-use message Test single-use message Test single-use message Test single-use message Test single-use message Test single-use message
+Sending single-use response message: Test single-use message
Single-use transmission received: Test single-use message
Waiting for single-use message.
diff --git a/basice2e/run.sh b/basice2e/run.sh
index 81ffe889c19aef79627702bdf1576b43d5903c8f..d4357280092bd8e63306481e7306b5f2a304a599 100755
--- a/basice2e/run.sh
+++ b/basice2e/run.sh
@@ -33,8 +33,8 @@ CLIENTCLEAN=results/clients-cleaned
CLIENTOPTS="--password hello --ndf results/ndf.json --verify-sends --sendDelay 100 --waitTimeout 360 --unsafe-channel-creation -v $DEBUGLEVEL"
CLIENTUDOPTS="--password hello --ndf results/ndf.json -v $DEBUGLEVEL"
CLIENTSINGLEOPTS="--password hello --waitTimeout 360 --ndf results/ndf.json -v $DEBUGLEVEL"
-CLIENTGROUPOPTS="--password hello --waitTimeout 360 --ndf results/ndf.json -v $DEBUGLEVEL"
-CLIENTFILETRANSFEROPTS="--password hello --waitTimeout 360 --ndf results/ndf.json -v $DEBUGLEVEL"
+CLIENTGROUPOPTS="--password hello --waitTimeout 600 --ndf results/ndf.json -v $DEBUGLEVEL"
+CLIENTFILETRANSFEROPTS="--password hello --waitTimeout 600 --ndf results/ndf.json -v $DEBUGLEVEL"
CLIENTREKEYOPTS="--password hello --ndf results/ndf.json --verify-sends --waitTimeout 420 --unsafe-channel-creation -v $DEBUGLEVEL"
CLIENTBACKUPOPTS="--password hello --ndf results/ndf.json -v $DEBUGLEVEL"
@@ -932,7 +932,7 @@ wait $PIDVAL3
echo "Group User IDs: $CLIENT80ID $CLIENT81ID $CLIENT82ID"
echo "b64:$CLIENT81ID" > $CLIENTOUT/groupParticipants
echo "b64:$CLIENT82ID" >> $CLIENTOUT/groupParticipants
-CLIENTCMD="timeout 360s ../bin/client group -s blob80 -l $CLIENTOUT/client80.log $CLIENTGROUPOPTS --create $CLIENTOUT/groupParticipants --message \"80 inviting 81 and 82 to new group\""
+CLIENTCMD="timeout 605s ../bin/client group -s blob80 -l $CLIENTOUT/client80.log $CLIENTGROUPOPTS --create $CLIENTOUT/groupParticipants --message \"80 inviting 81 and 82 to new group\""
eval $CLIENTCMD > $CLIENTOUT/client80.txt 2>&1 || true &
PIDVAL1=$!
echo "$CLIENTCMD -- $PIDVAL1"
@@ -949,7 +949,7 @@ wait $PIDVAL2
wait $PIDVAL3
# Extract group ID -- Note to Jono this probably needs to be fixed!
-GROUPID=$(cat $CLIENTOUT/client80.log | grep -a "NewGroupID\:" | awk -F' ' '{print $5}')
+GROUPID=$(cat $CLIENTOUT/client80.log | grep -a "NewGroupID\:" | awk -F' ' '{print $6}')
echo "Group ID: $GROUPID"
# Print the group list from all users
@@ -1057,10 +1057,6 @@ wait $PIDVAL1
wait $PIDVAL2
wait $PIDVAL3
-sort -b -o "$CLIENTOUT/client80.txt" "$CLIENTOUT/client80.txt"
-sort -b -o "$CLIENTOUT/client81.txt" "$CLIENTOUT/client81.txt"
-sort -b -o "$CLIENTOUT/client82.txt" "$CLIENTOUT/client82.txt"
-
echo "GROUP CHAT FINISHED!"
@@ -1103,7 +1099,7 @@ CLIENTCMD="timeout 360s ../bin/client fileTransfer -s blob110 -l $CLIENTOUT/clie
eval $CLIENTCMD > $CLIENTOUT/client110.txt 2>&1 || true &
PIDVAL1=$!
echo "$CLIENTCMD -- $PIDVAL1"
-CLIENTCMD="timeout 360s ../bin/client fileTransfer -s blob111 -l $CLIENTOUT/client111.log $CLIENTFILETRANSFEROPTS --sendFile $CLIENTOUT/client110-contact.bin --filePath LoremIpsum.txt --filePreviewString \"Lorem ipsum dolor sit amet, consectetur adipiscing elit.\" --maxThroughput 1000 --retry 0"
+CLIENTCMD="timeout 700s ../bin/client fileTransfer -s blob111 -l $CLIENTOUT/client111.log $CLIENTFILETRANSFEROPTS --sendFile $CLIENTOUT/client110-contact.bin --filePath LoremIpsum.txt --filePreviewString \"Lorem ipsum dolor sit amet, consectetur adipiscing elit.\" --maxThroughput 500 --retry 0"
eval $CLIENTCMD > $CLIENTOUT/client111.txt 2>&1 || true &
PIDVAL2=$!
echo "$CLIENTCMD -- $PIDVAL2"
@@ -1122,6 +1118,10 @@ sed -i.bak 's/ERROR.*Signature/Signature/g' $CLIENTCLEAN/client*.txt
sed -i.bak 's/[Aa]uthenticat.*$//g' $CLIENTCLEAN/client*.txt
rm $CLIENTCLEAN/client*.txt.bak
+# sort -b -o "$CLIENTOUT/client80.txt" "$CLIENTCLEAN/client80.txt"
+# sort -b -o "$CLIENTOUT/client81.txt" "$CLIENTCLEAN/client81.txt"
+# sort -b -o "$CLIENTOUT/client82.txt" "$CLIENTCLEAN/client82.txt"
+
for C in $(ls -1 $CLIENTCLEAN | grep -v client11[01]); do
sort -o tmp $CLIENTCLEAN/$C || true
cp tmp $CLIENTCLEAN/$C