Skip to content
Snippets Groups Projects
Commit 8a3c06da authored by Spencer Brown's avatar Spencer Brown
Browse files

Correct gateway configuration

parent d28f6349
No related branches found
No related tags found
No related merge requests found
......@@ -2,5 +2,3 @@ Sending Message to 2, Jim: Hello, 2
Message from 31, #General Received: Channel, Hello
Sending Message to 2, Jim: Hello, 2
Message from 4, Rick Received: Hello, 1
Sending Message to 2, Jim: Hello, 2
Message from 4, Rick Received: Hello, 1
Sending Message to 22, : Hello, 22
Message from 24, Received: Hello, 21
Sending Message to 23, : Hello, 23
Message from 21, Received: Hello, 22
......@@ -2,5 +2,3 @@ Sending Message to 3, Ben: Hello, 3
Message from 31, #General Received: Channel, Hello
Sending Message to 3, Ben: Hello, 3
Message from 1, David Received: Hello, 2
Sending Message to 3, Ben: Hello, 3
Message from 1, David Received: Hello, 2
Sending Message to 24, : Hello, 24
Message from 22, Received: Hello, 23
Sending Message to 21, : Hello, 21
Message from 23, Received: Hello, 24
......@@ -2,5 +2,3 @@ Sending Message to 4, Rick: Hello, 4
Message from 31, #General Received: Channel, Hello
Sending Message to 4, Rick: Hello, 4
Message from 2, Jim Received: Hello, 3
Sending Message to 4, Rick: Hello, 4
Message from 2, Jim Received: Hello, 3
......@@ -2,5 +2,3 @@ Sending Message to 1, David: Hello, 1
Message from 31, #General Received: Channel, Hello
Sending Message to 1, David: Hello, 1
Message from 3, Ben Received: Hello, 4
Sending Message to 1, David: Hello, 1
Message from 3, Ben Received: Hello, 4
......@@ -22,7 +22,7 @@ GatewayAddress: "localhost:8443"
# The number of seconds a message should remain in the globals before being
# deleted from the user's message queue
MessageTimeout: 60
MessageTimeout: 1800
### Anything below this line is to be deprecated ###
......
......@@ -88,10 +88,9 @@ runclients() {
export GATEWAY=localhost:8443
runclientsgw() {
echo "Starting clients through gateway..."
CTR=0
for cid in $(seq 1 4)
for cid in $(seq 21 24)
do
# TODO: Change the recipients to send multiple messages. We can't
# run multiple clients with the same user id so we need
......@@ -100,7 +99,7 @@ runclientsgw() {
for nid in 1
do
nid=$((($cid % 4) + 1))
nid=$((($cid % 4) + 21))
eval NICK=\${NICK${cid}}
# Send a regular message
CLIENTCMD="timeout 60s ../bin/client -f blobgw$cid --numnodes 5 -g $GATEWAY -s $LASTNODE -i $cid -d $nid -m \"Hello, $nid\" --noratchet"
......@@ -172,11 +171,9 @@ runclients
echo "RUNNING CLIENTS (2nd time)..."
runclients
# Same function, different blob names
# Same function, different blob names and client IDs
echo "RUNNING CLIENTS THROUGH GATEWAY..."
runclientsgw
echo "RUNNING CLIENTS THROUGH GATEWAY (2nd time)..."
runclientsgw
# HACK HACK HACK: Remove the ratchet warning from client output
for F in $(find results/clients -type f)
......
......@@ -16,3 +16,4 @@ servers:
- localhost:50002
- localhost:50003
- localhost:50004
gatewayAddress: "localhost:8443"
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