Skip to content
Snippets Groups Projects
Commit 6474d409 authored by Jonah Husson's avatar Jonah Husson
Browse files

Add goldoutput, fix broadcast client id nums to not conflict

parent 268303a7
No related branches found
No related tags found
2 merge requests!68Master merge,!27Add broadcast testing
New broadcast channel generated
Asymmetric broadcast message 2/4 received: Hello to asymmetric channel from channel client 123!
Asymmetric broadcast message 4/4 received: Hello to asymmetric channel from channel client 124!
Symmetric broadcast message 1/4 received: Hello to symmetric channel from channel client 124!
Symmetric broadcast message 3/4 received: Hello to symmetric channel from channel client 122!
Sent symmetric broadcast message: Hello to symmetric channel from channel client 122!
Sent asymmetric broadcast message: Hello to asymmetric channel from channel client 123!
Sent symmetric broadcast message: Hello to symmetric channel from channel client 124!Sent asymmetric broadcast message: Hello to asymmetric channel from channel client 124!
...@@ -1111,35 +1111,35 @@ echo "FILE TRANSFER FINISHED..." ...@@ -1111,35 +1111,35 @@ echo "FILE TRANSFER FINISHED..."
echo "TESTING BROADCAST CHANNELS..." echo "TESTING BROADCAST CHANNELS..."
# New broadcast channel... # New broadcast channel...
CLIENTCMD="timeout 240s ../bin/client broadcast --password hello --ndf results/ndf.json --waitTimeout 1800 -l $CLIENTOUT/client120.log -s blob120 --new --name broadcast-test --description \"Integration test channel\" --chanPath results/integration-channel.json --keyPath results/integration-chan-key.pem --receiveCount 0" CLIENTCMD="timeout 240s ../bin/client broadcast --password hello --ndf results/ndf.json --waitTimeout 1800 -l $CLIENTOUT/client130.log -s blob130 --new --name broadcast-test --description \"Integration test channel\" --chanPath results/integration-channel.json --keyPath results/integration-chan-key.pem --receiveCount 0"
eval $CLIENTCMD >> $CLIENTOUT/client120.txt || true & eval $CLIENTCMD >> $CLIENTOUT/client130.txt || true &
PIDVAL1=$! PIDVAL1=$!
echo "$CLIENTCMD -- $PIDVAL1" echo "$CLIENTCMD -- $PIDVAL1"
wait $PIDVAL1 wait $PIDVAL1
# Start client to listen for messages on the channel # Start client to listen for messages on the channel
CLIENTCMD="timeout 480s ../bin/client broadcast --password hello --ndf results/ndf.json --waitTimeout 1800 -l $CLIENTOUT/client121.log -s blob121 --chanPath results/integration-channel.json --receiveCount 4" CLIENTCMD="timeout 480s ../bin/client broadcast --password hello --ndf results/ndf.json --waitTimeout 1800 -l $CLIENTOUT/client131.log -s blob131 --chanPath results/integration-channel.json --receiveCount 4"
eval $CLIENTCMD >> $CLIENTOUT/client121.txt || true & eval $CLIENTCMD >> $CLIENTOUT/client131.txt || true &
PIDVAL1=$! PIDVAL1=$!
echo "$CLIENTCMD -- $PIDVAL1" echo "$CLIENTCMD -- $PIDVAL1"
sleep 10 sleep 10
# Send symmetric broadcast to channel # Send symmetric broadcast to channel
CLIENTCMD="timeout 240s ../bin/client broadcast --password hello --ndf results/ndf.json --waitTimeout 360 -l $CLIENTOUT/client122.log -s blob122 --chanPath results/integration-channel.json --receiveCount 0 --sendDelay 5000 --symmetric \"Hello to symmetric channel from channel client 122!\"" CLIENTCMD="timeout 240s ../bin/client broadcast --password hello --ndf results/ndf.json --waitTimeout 360 -l $CLIENTOUT/client132.log -s blob132 --chanPath results/integration-channel.json --receiveCount 0 --sendDelay 5000 --symmetric \"Hello to symmetric channel from channel client 122!\""
eval $CLIENTCMD >> $CLIENTOUT/client122.txt || true & eval $CLIENTCMD >> $CLIENTOUT/client132.txt || true &
PIDVAL2=$! PIDVAL2=$!
echo "$CLIENTCMD -- $PIDVAL2" echo "$CLIENTCMD -- $PIDVAL2"
# Send asymmetric broadcast to channel # Send asymmetric broadcast to channel
CLIENTCMD="timeout 240s ../bin/client broadcast --password hello --ndf results/ndf.json --waitTimeout 360 -l $CLIENTOUT/client123.log -s blob123 --chanPath results/integration-channel.json --receiveCount 0 --sendDelay 5000 --keyPath results/integration-chan-key.pem --asymmetric \"Hello to asymmetric channel from channel client 123!\"" CLIENTCMD="timeout 240s ../bin/client broadcast --password hello --ndf results/ndf.json --waitTimeout 360 -l $CLIENTOUT/client133.log -s blob133 --chanPath results/integration-channel.json --receiveCount 0 --sendDelay 5000 --keyPath results/integration-chan-key.pem --asymmetric \"Hello to asymmetric channel from channel client 123!\""
eval $CLIENTCMD >> $CLIENTOUT/client123.txt || true & eval $CLIENTCMD >> $CLIENTOUT/client133.txt || true &
PIDVAL3=$! PIDVAL3=$!
echo "$CLIENTCMD -- $PIDVAL3" echo "$CLIENTCMD -- $PIDVAL3"
# Send symmetric & asymmetric broadcasts to channel # Send symmetric & asymmetric broadcasts to channel
CLIENTCMD="timeout 240s ../bin/client broadcast --password hello --ndf results/ndf.json --waitTimeout 360 -l $CLIENTOUT/client124.log -s blob124 --chanPath results/integration-channel.json --receiveCount 0 --sendDelay 5000 --keyPath results/integration-chan-key.pem --asymmetric \"Hello to asymmetric channel from channel client 124!\" --symmetric \"Hello to symmetric channel from channel client 124!\"" CLIENTCMD="timeout 240s ../bin/client broadcast --password hello --ndf results/ndf.json --waitTimeout 360 -l $CLIENTOUT/client134.log -s blob134 --chanPath results/integration-channel.json --receiveCount 0 --sendDelay 5000 --keyPath results/integration-chan-key.pem --asymmetric \"Hello to asymmetric channel from channel client 124!\" --symmetric \"Hello to symmetric channel from channel client 124!\""
eval $CLIENTCMD >> $CLIENTOUT/client124.txt || true & eval $CLIENTCMD >> $CLIENTOUT/client134.txt || true &
PIDVAL4=$! PIDVAL4=$!
echo "$CLIENTCMD -- $PIDVAL4" echo "$CLIENTCMD -- $PIDVAL4"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment