diff --git a/basice2e/clients.goldoutput/client6.out b/basice2e/clients.goldoutput/client6.out new file mode 100644 index 0000000000000000000000000000000000000000..00da34b6554c82e7aff6e1c930d96408c390785c --- /dev/null +++ b/basice2e/clients.goldoutput/client6.out @@ -0,0 +1,6 @@ +Sending Message to 13, : PUSHKEY testkeyid 0 PQc4L1rz532d0TM7pjzn76w/VPbnpGM9cQqASqV21iEj5Ioi2E0GbsIY3TNKk92chm8uDplIufqFhWrxYIDMtv8nFY4zcElX8d5MdkIHn9VeoKm1v2O7VfjO2nTHCMSho/2ElHHxsmW3k6lNlTa4jMabnOCWWyRsJkHghZzmpdk= +Message from 13, Received: PUSHKEY ACK NEED 128 +Sending Message to 13, : PUSHKEY testkeyid 128 95EywPjbzEf0k2Zjd9uXk3YrXjnxXKMulznM16YQaEF7pFwKPqmc0UQm+CSXm0JbmeZeOihb1otHvWAI9TbnIlJ8r22Jd1H36nAQ2CgDZD0t8Cy49kC1ACPRJW82sUh2WNhRVPdR9dtH48dDU5OW4ZWb209mBqQ4QPvSEzn/UOk= +Message from 13, Received: PUSHKEY COMPLETE Mb97kxMHVqi4Jx13rsZiiuH/V5TKlCzWKdXbWwKfDVE= +Sending Message to 13, : REGISTER EMAIL jake@privategrity.com Mb97kxMHVqi4Jx13rsZiiuH/V5TKlCzWKdXbWwKfDVE= +Message from 13, Received: REGISTRATION COMPLETE diff --git a/basice2e/registration-commands.txt b/basice2e/registration-commands.txt new file mode 100644 index 0000000000000000000000000000000000000000..827298f86ff9b13c21b67385e32b9d73d58cb5f9 --- /dev/null +++ b/basice2e/registration-commands.txt @@ -0,0 +1,3 @@ +PUSHKEY testkeyid 0 PQc4L1rz532d0TM7pjzn76w/VPbnpGM9cQqASqV21iEj5Ioi2E0GbsIY3TNKk92chm8uDplIufqFhWrxYIDMtv8nFY4zcElX8d5MdkIHn9VeoKm1v2O7VfjO2nTHCMSho/2ElHHxsmW3k6lNlTa4jMabnOCWWyRsJkHghZzmpdk= +PUSHKEY testkeyid 128 95EywPjbzEf0k2Zjd9uXk3YrXjnxXKMulznM16YQaEF7pFwKPqmc0UQm+CSXm0JbmeZeOihb1otHvWAI9TbnIlJ8r22Jd1H36nAQ2CgDZD0t8Cy49kC1ACPRJW82sUh2WNhRVPdR9dtH48dDU5OW4ZWb209mBqQ4QPvSEzn/UOk= +REGISTER EMAIL jake@privategrity.com Mb97kxMHVqi4Jx13rsZiiuH/V5TKlCzWKdXbWwKfDVE= diff --git a/basice2e/run.sh b/basice2e/run.sh index 78b30d7a5c2cce958613227e5a7bdcbaeca021b8..427a118435cee83e118b497309c9f581b5437034 100755 --- a/basice2e/run.sh +++ b/basice2e/run.sh @@ -91,26 +91,36 @@ runclients() { } # Start a channelbot server -CHANNELCMD="../bin/channelbot -v -i 31 --nick \"#General\" --numnodes 5 -s $LASTNODE -f blobchannel --noratchet" -eval $CHANNELCMD >> $CHANNELOUT 2>&1 & +CHANNELCMD="../bin/channelbot -v -i 31 --nick #General --numnodes 5 -s $LASTNODE -f blobchannel --noratchet" +$CHANNELCMD >> $CHANNELOUT 2>&1 & PIDVAL=$! echo $PIDVAL >> results/serverpids echo "$CHANNELCMD -- $PIDVAL" # Start a user discovery bot server UDBCMD="../bin/udb --config udb.yaml" -eval $UDBCMD >> $UDBOUT 2>&1 & +$UDBCMD >> $UDBOUT 2>&1 & PIDVAL=$! echo $PIDVAL >> results/serverpids echo "$UDBCMD -- $PIDVAL" # Start a dummy client DUMMYCMD="../bin/client -i 35 -d 35 -s $LASTNODE --numnodes 5 -m \"dummy\" --nick \"dummy\" --dummyfrequency 0.5 --noratchet -f blobdummy" -eval $DUMMYCMD >> $DUMMYOUT 2>&1 & +$DUMMYCMD >> $DUMMYOUT 2>&1 & PIDVAL=$! echo $PIDVAL >> results/serverpids echo "$DUMMYCMD -- $PIDVAL" +# Send a registration command +cat registration-commands.txt | while read LINE +do + CLIENTCMD="timeout 60s ../bin/client -f blob6 --numnodes 5 -s $LASTNODE -i 6 -d 13 -m \"$LINE\" --nick Jake --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 60s ../bin/client -f blob5 --numnodes 5 -s $LASTNODE -i 5 -d 31 -m \"Channel, Hello\" --nick Spencer --noratchet" eval $CLIENTCMD >> $CLIENTOUT/client5.out 2>&1 &