Skip to content
Snippets Groups Projects
Commit 5a7b5dc0 authored by Richard T. Carback III's avatar Richard T. Carback III
Browse files

Updates to fix integration

parent ad4f885c
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 14 additions and 32 deletions
basice2e/clients.goldoutput/client18.txt
+ 0
− 1
View file @ 5a7b5dc0
Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network
WARNING: unsafe channel creation enabled WARNING: unsafe channel creation enabled
Adding a Adding a
Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hi 18->9, with E2E Encryption Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hi 18->9, with E2E Encryption
......
basice2e/clients.goldoutput/client18_rekey.txt
+ 0
− 1
View file @ 5a7b5dc0
Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network
Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption
Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption
Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption
......
basice2e/clients.goldoutput/client42.txt
+ 0
− 0
View file @ 5a7b5dc0
No preview for this file type
basice2e/clients.goldoutput/client43.txt
+ 0
− 4
View file @ 5a7b5dc0
Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network
WARNING: unsafe channel creation enabled WARNING: unsafe channel creation enabled
Adding a Adding a
Timed out!
Received 0 Received 0
Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network
Sent: Hello from Ben43, with E2E Encryption Sent: Hello from Ben43, with E2E Encryption
Sent: Hello from Ben43, with E2E Encryption Sent: Hello from Ben43, with E2E Encryption
Sent: Hello from Ben43, with E2E Encryption Sent: Hello from Ben43, with E2E Encryption
...@@ -15,7 +12,6 @@ Message received: Hello from Rick42, with E2E Encryption ...@@ -15,7 +12,6 @@ Message received: Hello from Rick42, with E2E Encryption
Message received: Hello from Rick42, with E2E Encryption Message received: Hello from Rick42, with E2E Encryption
Message received: Hello from Rick42, with E2E Encryption Message received: Hello from Rick42, with E2E Encryption
Received 5 Received 5
Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network
Sent: Hello from Ben43, with E2E Encryption Sent: Hello from Ben43, with E2E Encryption
Sent: Hello from Ben43, with E2E Encryption Sent: Hello from Ben43, with E2E Encryption
Sent: Hello from Ben43, with E2E Encryption Sent: Hello from Ben43, with E2E Encryption
......
basice2e/clients.goldoutput/client45.txt
+ 0
− 2
View file @ 5a7b5dc0
Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network
Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5 Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5 Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5 Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
...@@ -40,7 +39,6 @@ Message received: Hello, 4 ...@@ -40,7 +39,6 @@ Message received: Hello, 4
Message received: Hello, 4 Message received: Hello, 4
Message received: Hello, 4 Message received: Hello, 4
Received 20 Received 20
Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network
Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5 Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5 Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5 Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
......
basice2e/clients.goldoutput/client56.txt
+ 0
− 2
View file @ 5a7b5dc0
Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network
Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6 Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6 Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6 Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
...@@ -40,7 +39,6 @@ Message received: Hello, 5 ...@@ -40,7 +39,6 @@ Message received: Hello, 5
Message received: Hello, 5 Message received: Hello, 5
Message received: Hello, 5 Message received: Hello, 5
Received 20 Received 20
Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network
Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6 Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6 Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6 Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
......
basice2e/clients.goldoutput/client67.txt
+ 0
− 2
View file @ 5a7b5dc0
Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network
Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7 Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7 Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7 Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
...@@ -40,7 +39,6 @@ Message received: Hello, 6 ...@@ -40,7 +39,6 @@ Message received: Hello, 6
Message received: Hello, 6 Message received: Hello, 6
Message received: Hello, 6 Message received: Hello, 6
Received 20 Received 20
Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network
Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7 Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7 Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7 Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
......
basice2e/clients.goldoutput/client74.txt
+ 0
− 2
View file @ 5a7b5dc0
Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network
Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4 Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4 Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4 Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
...@@ -40,7 +39,6 @@ Message received: Hello, 7 ...@@ -40,7 +39,6 @@ Message received: Hello, 7
Message received: Hello, 7 Message received: Hello, 7
Message received: Hello, 7 Message received: Hello, 7
Received 20 Received 20
Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network
Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4 Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4 Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4 Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
......
basice2e/clients.goldoutput/client9.txt
+ 0
− 3
View file @ 5a7b5dc0
Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network
WARNING: unsafe channel creation enabled WARNING: unsafe channel creation enabled
Adding a Adding a
Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hi 9->9, with E2E Encryption Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hi 9->9, with E2E Encryption
...@@ -6,13 +5,11 @@ Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hi 9->9, with E2E Encry ...@@ -6,13 +5,11 @@ Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hi 9->9, with E2E Encry
Message received: Hi 9->9, with E2E Encryption Message received: Hi 9->9, with E2E Encryption
Message received: Hi 9->9, with E2E Encryption Message received: Hi 9->9, with E2E Encryption
Received 2 Received 2
Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network
Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hi 9->9, with E2E Encryption Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hi 9->9, with E2E Encryption
Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hi 9->9, with E2E Encryption Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hi 9->9, with E2E Encryption
Message received: Hi 9->9, with E2E Encryption Message received: Hi 9->9, with E2E Encryption
Message received: Hi 9->9, with E2E Encryption Message received: Hi 9->9, with E2E Encryption
Received 2 Received 2
Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network
WARNING: unsafe channel creation enabled WARNING: unsafe channel creation enabled
Adding a Adding a
Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hi 9->18, with E2E Encryption Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hi 9->18, with E2E Encryption
......
basice2e/clients.goldoutput/client9_rekey.txt
+ 0
− 1
View file @ 5a7b5dc0
Signature verification is curently disabled, if you get this message STOP OPERATION and contact the developers at nodes@xx.network
Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption
Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption
Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption
......
basice2e/run.sh
+ 14
− 14
View file @ 5a7b5dc0
...@@ -22,7 +22,7 @@ DUMMYOUT=results/dummy-console.txt ...@@ -22,7 +22,7 @@ DUMMYOUT=results/dummy-console.txt
UDBOUT=results/udb-console.txt UDBOUT=results/udb-console.txt
CLIENTCLEAN=results/clients-cleaned CLIENTCLEAN=results/clients-cleaned
CLIENTOPTS="--password hello --ndf ndf.json --waitTimeout 70 --unsafe-channel-creation --verbose" CLIENTOPTS="--password hello --ndf ndf.json --waitTimeout 90 --unsafe-channel-creation --verbose"
mkdir -p $SERVERLOGS mkdir -p $SERVERLOGS
mkdir -p $GATEWAYLOGS mkdir -p $GATEWAYLOGS
...@@ -139,7 +139,7 @@ runclients() { ...@@ -139,7 +139,7 @@ runclients() {
eval NICK=\${NICK${cid}} eval NICK=\${NICK${cid}}
# Send a regular message # Send a regular message
mkdir -p blob$cid mkdir -p blob$cid
CLIENTCMD="timeout 120s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client$cid$nid.log -s blob$cid/blob$cid --unsafe --sendid $cid --destid $nid --sendCount 20 --receiveCount 20 -m \"Hello, $nid\"" CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client$cid$nid.log -s blob$cid/blob$cid --unsafe --sendid $cid --destid $nid --sendCount 20 --receiveCount 20 -m \"Hello, $nid\""
eval $CLIENTCMD >> $CLIENTOUT/client$cid$nid.txt 2>&1 & eval $CLIENTCMD >> $CLIENTOUT/client$cid$nid.txt 2>&1 &
PIDVAL=$! PIDVAL=$!
eval CLIENTS${CTR}=$PIDVAL eval CLIENTS${CTR}=$PIDVAL
...@@ -166,23 +166,23 @@ runclients ...@@ -166,23 +166,23 @@ runclients
mkdir -p blob9 mkdir -p blob9
mkdir -p blob18 mkdir -p blob18
echo "TEST E2E WITH PRECANNED USERS..." echo "TEST E2E WITH PRECANNED USERS..."
CLIENTCMD="timeout 120s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client9.log --sendDelay 1000 --sendCount 2 --receiveCount 2 -s blob9/blob9 --sendid 9 --destid 9 -m \"Hi 9->9, with E2E Encryption\"" CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client9.log --sendDelay 1000 --sendCount 2 --receiveCount 2 -s blob9/blob9 --sendid 9 --destid 9 -m \"Hi 9->9, with E2E Encryption\""
eval $CLIENTCMD >> $CLIENTOUT/client9.txt 2>&1 & eval $CLIENTCMD >> $CLIENTOUT/client9.txt 2>&1 &
PIDVAL=$! PIDVAL=$!
echo "$CLIENTCMD -- $PIDVAL" echo "$CLIENTCMD -- $PIDVAL"
wait $PIDVAL wait $PIDVAL
CLIENTCMD="timeout 120s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client9.log --sendDelay 1000 --sendCount 2 --receiveCount 2 -s blob9/blob9 --sendid 9 --destid 9 -m \"Hi 9->9, with E2E Encryption\"" CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client9.log --sendDelay 1000 --sendCount 2 --receiveCount 2 -s blob9/blob9 --sendid 9 --destid 9 -m \"Hi 9->9, with E2E Encryption\""
eval $CLIENTCMD >> $CLIENTOUT/client9.txt 2>&1 & eval $CLIENTCMD >> $CLIENTOUT/client9.txt 2>&1 &
PIDVAL=$! PIDVAL=$!
echo "$CLIENTCMD -- $PIDVAL" echo "$CLIENTCMD -- $PIDVAL"
wait $PIDVAL wait $PIDVAL
# Send E2E messages between two users # Send E2E messages between two users
CLIENTCMD="timeout 120s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client9.log --sendDelay 1000 --sendCount 3 --receiveCount 3 -s blob9/blob9 --sendid 9 --destid 18 -m \"Hi 9->18, with E2E Encryption\"" CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client9.log --sendDelay 1000 --sendCount 3 --receiveCount 3 -s blob9/blob9 --sendid 9 --destid 18 -m \"Hi 9->18, with E2E Encryption\""
eval $CLIENTCMD >> $CLIENTOUT/client9.txt 2>&1 & eval $CLIENTCMD >> $CLIENTOUT/client9.txt 2>&1 &
PIDVAL1=$! PIDVAL1=$!
echo "$CLIENTCMD -- $PIDVAL" echo "$CLIENTCMD -- $PIDVAL"
CLIENTCMD="timeout 120s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client18.log --sendDelay 1000 --sendCount 3 --receiveCount 3 -s blob18/blob18 --sendid 18 --destid 9 -m \"Hi 18->9, with E2E Encryption\"" CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client18.log --sendDelay 1000 --sendCount 3 --receiveCount 3 -s blob18/blob18 --sendid 18 --destid 9 -m \"Hi 18->9, with E2E Encryption\""
eval $CLIENTCMD >> $CLIENTOUT/client18.txt 2>&1 & eval $CLIENTCMD >> $CLIENTOUT/client18.txt 2>&1 &
PIDVAL2=$! PIDVAL2=$!
echo "$CLIENTCMD -- $PIDVAL" echo "$CLIENTCMD -- $PIDVAL"
...@@ -192,11 +192,11 @@ wait $PIDVAL2 ...@@ -192,11 +192,11 @@ wait $PIDVAL2
# Send multiple E2E encrypted messages between users that discovered each other # Send multiple E2E encrypted messages between users that discovered each other
echo "SENDING MESSAGES TO PRECANNED USERS AND FORCING A REKEY..." echo "SENDING MESSAGES TO PRECANNED USERS AND FORCING A REKEY..."
CLIENTCMD="timeout 180s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client18_rekey.log --sendCount 20 --receiveCount 20 --destid 9 -s blob18/blob18 -m \"Hello, 9, with E2E Encryption\"" CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client18_rekey.log --sendCount 20 --receiveCount 20 --destid 9 -s blob18/blob18 -m \"Hello, 9, with E2E Encryption\""
eval $CLIENTCMD >> $CLIENTOUT/client18_rekey.txt 2>&1 || true & eval $CLIENTCMD >> $CLIENTOUT/client18_rekey.txt 2>&1 || true &
PIDVAL=$! PIDVAL=$!
echo "$CLIENTCMD -- $PIDVAL" echo "$CLIENTCMD -- $PIDVAL"
CLIENTCMD="timeout 180s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client9_rekey.log --sendCount 20 --receiveCount 20 --destid 18 -s blob9/blob9 -m \"Hello, 18, with E2E Encryption\"" CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client9_rekey.log --sendCount 20 --receiveCount 20 --destid 18 -s blob9/blob9 -m \"Hello, 18, with E2E Encryption\""
eval $CLIENTCMD >> $CLIENTOUT/client9_rekey.txt 2>&1 || true & eval $CLIENTCMD >> $CLIENTOUT/client9_rekey.txt 2>&1 || true &
PIDVAL=$! PIDVAL=$!
echo "$CLIENTCMD -- $PIDVAL" echo "$CLIENTCMD -- $PIDVAL"
...@@ -205,12 +205,12 @@ wait $PIDVAL || true ...@@ -205,12 +205,12 @@ wait $PIDVAL || true
# Non-precanned E2E user messaging # Non-precanned E2E user messaging
echo "SENDING E2E MESSAGES TO NEW USERS..." echo "SENDING E2E MESSAGES TO NEW USERS..."
CLIENTCMD="timeout 210s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client42.log -s blob42 --writeContact rick42-contact.json --unsafe -m \"Hello from Rick42 to myself, without E2E Encryption\"" CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client42.log -s blob42 --writeContact rick42-contact.json --unsafe -m \"Hello from Rick42 to myself, without E2E Encryption\""
eval $CLIENTCMD >> $CLIENTOUT/client42.txt || true & eval $CLIENTCMD >> $CLIENTOUT/client42.txt || true &
PIDVAL=$! PIDVAL=$!
echo "$CLIENTCMD -- $PIDVAL" echo "$CLIENTCMD -- $PIDVAL"
wait $PIDVAL wait $PIDVAL
CLIENTCMD="timeout 210s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client43.log -s blob43 --writeContact ben43-contact.json --destfile rick42-contact.json --sendCount 0 --receiveCount 0 -m \"Hello from Ben43, with E2E Encryption\"" CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client43.log -s blob43 --writeContact ben43-contact.json --destfile rick42-contact.json --sendCount 0 --receiveCount 0 -m \"Hello from Ben43, with E2E Encryption\""
eval $CLIENTCMD >> $CLIENTOUT/client43.txt || true & eval $CLIENTCMD >> $CLIENTOUT/client43.txt || true &
PIDVAL2=$! PIDVAL2=$!
echo "$CLIENTCMD -- $PIDVAL" echo "$CLIENTCMD -- $PIDVAL"
...@@ -223,21 +223,21 @@ BENID=${TMPID} ...@@ -223,21 +223,21 @@ BENID=${TMPID}
echo "BEN ID: $BENID" echo "BEN ID: $BENID"
# Test destid syntax too, note wait for 11 messages to catch the message from above ^^^ # Test destid syntax too, note wait for 11 messages to catch the message from above ^^^
CLIENTCMD="timeout 210s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client42.log -s blob42 --destid b64:$BENID --sendCount 5 --receiveCount 5 -m \"Hello from Rick42, with E2E Encryption\"" CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client42.log -s blob42 --destid b64:$BENID --sendCount 5 --receiveCount 5 -m \"Hello from Rick42, with E2E Encryption\""
eval $CLIENTCMD >> $CLIENTOUT/client42.txt || true & eval $CLIENTCMD >> $CLIENTOUT/client42.txt || true &
PIDVAL=$! PIDVAL=$!
echo "$CLIENTCMD -- $PIDVAL" echo "$CLIENTCMD -- $PIDVAL"
CLIENTCMD="timeout 210s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client43.log -s blob43 --destid b64:$RICKID --sendCount 5 --receiveCount 5 -m \"Hello from Ben43, with E2E Encryption\"" CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client43.log -s blob43 --destid b64:$RICKID --sendCount 5 --receiveCount 5 -m \"Hello from Ben43, with E2E Encryption\""
eval $CLIENTCMD >> $CLIENTOUT/client43.txt || true & eval $CLIENTCMD >> $CLIENTOUT/client43.txt || true &
PIDVAL2=$! PIDVAL2=$!
echo "$CLIENTCMD -- $PIDVAL" echo "$CLIENTCMD -- $PIDVAL"
wait $PIDVAL wait $PIDVAL
wait $PIDVAL2 wait $PIDVAL2
CLIENTCMD="timeout 210s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client42.log -s blob42 --destid b64:$BENID --sendCount 5 --receiveCount 5 -m \"Hello from Rick42, with E2E Encryption\"" CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client42.log -s blob42 --destid b64:$BENID --sendCount 5 --receiveCount 5 -m \"Hello from Rick42, with E2E Encryption\""
eval $CLIENTCMD >> $CLIENTOUT/client42.txt || true & eval $CLIENTCMD >> $CLIENTOUT/client42.txt || true &
PIDVAL=$! PIDVAL=$!
echo "$CLIENTCMD -- $PIDVAL" echo "$CLIENTCMD -- $PIDVAL"
CLIENTCMD="timeout 210s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client43.log -s blob43 --destid b64:$RICKID --sendCount 5 --receiveCount 5 -m \"Hello from Ben43, with E2E Encryption\"" CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client43.log -s blob43 --destid b64:$RICKID --sendCount 5 --receiveCount 5 -m \"Hello from Ben43, with E2E Encryption\""
eval $CLIENTCMD >> $CLIENTOUT/client43.txt || true & eval $CLIENTCMD >> $CLIENTOUT/client43.txt || true &
PIDVAL2=$! PIDVAL2=$!
echo "$CLIENTCMD -- $PIDVAL" echo "$CLIENTCMD -- $PIDVAL"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment