summaryrefslogtreecommitdiff
path: root/docs/TCP_Network.txt
diff options
context:
space:
mode:
authorirungentoo <irungentoo@gmail.com>2014-05-08 18:26:01 -0400
committerirungentoo <irungentoo@gmail.com>2014-05-08 18:26:01 -0400
commita26ced5fcb7a9a8bf6b4795c95b04277c14b84f2 (patch)
tree8a659c2dc15414ff227cf43c793f20ee2a91cbe1 /docs/TCP_Network.txt
parent98f20c76de801d042c695b3034056b2cfbfeaab5 (diff)
parent89022326d3742defd9c7b1111ddcda53688d85be (diff)
Merge branch 'master' into TCP
Diffstat (limited to 'docs/TCP_Network.txt')
-rw-r--r--docs/TCP_Network.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/TCP_Network.txt b/docs/TCP_Network.txt
index 775ccc88..9841329c 100644
--- a/docs/TCP_Network.txt
+++ b/docs/TCP_Network.txt
@@ -81,7 +81,7 @@ received
81client sent the server the public key and the public key we sent to the client, 81client sent the server the public key and the public key we sent to the client,
82the next with base nonce + 1...) 82the next with base nonce + 1...)
83 83
84The connection is set to an unconfirmed state until a packet is recieved and 84The connection is set to an unconfirmed state until a packet is received and
85decrypted correctly using the information in the handshake. 85decrypted correctly using the information in the handshake.
86 86
87each packet sent to/from the server has an id (the first byte of the plain text 87each packet sent to/from the server has an id (the first byte of the plain text
@@ -135,7 +135,7 @@ responses must be sent to the proper client.
135 135
136Ping responses must have the same ping_id as the request. 136Ping responses must have the same ping_id as the request.
137 137
138If the server recieves a ping packet he must respond with a ping response. 138If the server receives a ping packet he must respond with a ping response.
139 139
140The server will send a ping packet to clients every 30 seconds, they have 30 140The server will send a ping packet to clients every 30 seconds, they have 30
141seconds to respond, if they don't the connection is deleted. 141seconds to respond, if they don't the connection is deleted.