diff --git a/basice2e/clients.goldoutput/client12.out b/basice2e/clients.goldoutput/client12.out old mode 100755 new mode 100644 index 59c38dccd856485165cb36684b4098884610ad45..a6a89e95dc7bbf5c5607b2a207ab535d2feaf107 --- a/basice2e/clients.goldoutput/client12.out +++ b/basice2e/clients.goldoutput/client12.out @@ -1,4 +1,7 @@ Sending Message to 2, Jim: Hello, 2 +Message from channel 31, #General: Message from 5, Spencer Received: Channel, Hello Message from 4, Rick Received: Hello, 1 Sending Message to 2, Jim: Hello, 2 +Message from channel 31, #General: Message from 5, Spencer Received: Channel, Hello +Message from 4, Rick Received: Hello, 1 Message from 4, Rick Received: Hello, 1 diff --git a/basice2e/clients.goldoutput/client23.out b/basice2e/clients.goldoutput/client23.out old mode 100755 new mode 100644 index f978dc80eb084c2bd1e13615b6ec08783c28639d..4559135deeb854e49293353fc4f71b70e45888bd --- a/basice2e/clients.goldoutput/client23.out +++ b/basice2e/clients.goldoutput/client23.out @@ -1,4 +1,7 @@ Sending Message to 3, Ben: Hello, 3 +Message from channel 31, #General: Message from 5, Spencer Received: Channel, Hello Message from 1, David Received: Hello, 2 Sending Message to 3, Ben: Hello, 3 +Message from channel 31, #General: Message from 5, Spencer Received: Channel, Hello +Message from 1, David Received: Hello, 2 Message from 1, David Received: Hello, 2 diff --git a/basice2e/clients.goldoutput/client34.out b/basice2e/clients.goldoutput/client34.out old mode 100755 new mode 100644 index 535a51fe4ef03ed501f55987dcf6ed99f7d0362e..0a555f1f0ec245457733dc857f506075d1d8d839 --- a/basice2e/clients.goldoutput/client34.out +++ b/basice2e/clients.goldoutput/client34.out @@ -1,4 +1,7 @@ Sending Message to 4, Rick: Hello, 4 +Message from channel 31, #General: Message from 5, Spencer Received: Channel, Hello Message from 2, Jim Received: Hello, 3 Sending Message to 4, Rick: Hello, 4 +Message from channel 31, #General: Message from 5, Spencer Received: Channel, Hello +Message from 2, Jim Received: Hello, 3 Message from 2, Jim Received: Hello, 3 diff --git a/basice2e/clients.goldoutput/client41.out b/basice2e/clients.goldoutput/client41.out old mode 100755 new mode 100644 index df9a4f6bb47388814270f1889e198ecaec6c75fc..1b840c77e8b8bd993fdc8495e4ef834b0e6e2b7d --- a/basice2e/clients.goldoutput/client41.out +++ b/basice2e/clients.goldoutput/client41.out @@ -1,4 +1,7 @@ Sending Message to 1, David: Hello, 1 +Message from channel 31, #General: Message from 5, Spencer Received: Channel, Hello Message from 3, Ben Received: Hello, 4 Sending Message to 1, David: Hello, 1 +Message from channel 31, #General: Message from 5, Spencer Received: Channel, Hello +Message from 3, Ben Received: Hello, 4 Message from 3, Ben Received: Hello, 4 diff --git a/basice2e/clients.goldoutput/client5.out b/basice2e/clients.goldoutput/client5.out index 6bd764af7e86cf2a600e93d6a80213ef2a07b46b..0cd5f3587446c41b934fed8d59bc68cc8d2ee5ce 100644 --- a/basice2e/clients.goldoutput/client5.out +++ b/basice2e/clients.goldoutput/client5.out @@ -1,2 +1,2 @@ Sending Message to 31, #General: Channel, Hello -Message from 31, #General Received: Channel, Hello +Message from channel 31, #General: Message from 5, Spencer Received: Channel, Hello diff --git a/basice2e/clients.goldoutput/client6.out b/basice2e/clients.goldoutput/client6.out deleted file mode 100644 index 70e7545dfcd8365c31ab3ff3f9532709a4795684..0000000000000000000000000000000000000000 --- a/basice2e/clients.goldoutput/client6.out +++ /dev/null @@ -1,8 +0,0 @@ -Sending Message to 13, UDB: PUSHKEY testkeyid 0 PQc4L1rz532d0TM7pjzn76w/VPbnpGM9cQqASqV21iEj5Ioi2E0GbsIY3TNKk92chm8uDplIufqFhWrxYIDMtv8nFY4zcElX8d5MdkIHn9VeoKm1v2O7VfjO2nTHCMSho/2ElHHxsmW3k6lNlTa4jMabnOCWWyRsJkHghZzmpdk= -Message from 13, UDB Received: PUSHKEY ACK NEED 128 -Sending Message to 13, UDB: PUSHKEY testkeyid 128 95EywPjbzEf0k2Zjd9uXk3YrXjnxXKMulznM16YQaEF7pFwKPqmc0UQm+CSXm0JbmeZeOihb1otHvWAI9TbnIlJ8r22Jd1H36nAQ2CgDZD0t8Cy49kC1ACPRJW82sUh2WNhRVPdR9dtH48dDU5OW4ZWb209mBqQ4QPvSEzn/UOk= -Message from 13, UDB Received: PUSHKEY COMPLETE Mb97kxMHVqi4Jx13rsZiiuH/V5TKlCzWKdXbWwKfDVE= -Sending Message to 13, UDB: REGISTER EMAIL jake@privategrity.com Mb97kxMHVqi4Jx13rsZiiuH/V5TKlCzWKdXbWwKfDVE= -Message from 13, UDB Received: REGISTRATION COMPLETE -Sending Message to 13, UDB: SEARCH EMAIL jake@privategrity.com -Message from 13, UDB Received: SEARCH jake@privategrity.com FOUND Mb97kxMHVqi4Jx13rsZiiuH/V5TKlCzWKdXbWwKfDVE= diff --git a/basice2e/run.sh b/basice2e/run.sh index 6daf6cfc531acc6b71a8ffd1db1ebb3ada0d02c4..3fbd70239cf41ef04ffc0782126e49b057279aaf 100755 --- a/basice2e/run.sh +++ b/basice2e/run.sh @@ -101,7 +101,7 @@ echo $PIDVAL >> results/serverpids echo "$UDBCMD -- $PIDVAL" # Start a dummy client -DUMMYCMD="../bin/client -i 35 -d 35 -g $GATEWAY --numnodes 5 -m \"dummy\" --dummyfrequency 0.5 --noratchet -f blobdummy" +DUMMYCMD="../bin/client -i 35 -d 35 -g $GATEWAY --numnodes 5 -m \"dummy\" --dummyfrequency 2 --noratchet -f blobdummy" $DUMMYCMD >> $DUMMYOUT 2>&1 & PIDVAL=$! echo $PIDVAL >> results/serverpids @@ -115,14 +115,14 @@ echo $PIDVAL >> results/serverpids echo "$GATEWAYCMD -- $PIDVAL" # Send a registration command -cat registration-commands.txt | while read LINE -do - CLIENTCMD="timeout 240s ../bin/client -f blob6 --numnodes 5 -g $GATEWAY -i 6 -d 13 -m \"$LINE\" --noratchet" - eval $CLIENTCMD >> $CLIENTOUT/client6.out 2>&1 & - PIDVAL=$! - echo "$CLIENTCMD -- $PIDVAL" - wait $PIDVAL -done +#cat registration-commands.txt | while read LINE +#do +# CLIENTCMD="timeout 240s ../bin/client -f blob6 --numnodes 5 -g $GATEWAY -i 6 -d 13 -m \"$LINE\" --noratchet" +# eval $CLIENTCMD >> $CLIENTOUT/client6.out 2>&1 & +# PIDVAL=$! +# echo "$CLIENTCMD -- $PIDVAL" +# wait $PIDVAL +#done # Send a channel message that all clients will receive CLIENTCMD="timeout 240s ../bin/client -f blob5 --numnodes 5 -g $GATEWAY -i 5 -d 31 -m \"Channel, Hello\" --noratchet"