Commit graph

1828 commits

Author SHA1 Message Date
Stephen Birarda
42105dfc33 replace mutexes with invoked methods in Socket 2015-08-28 16:34:24 -07:00
Stephen Birarda
20d1244db4 use a write lock for sync so it can be recursive 2015-08-28 15:17:44 -07:00
Stephen Birarda
abffc0317b expire the connection if it is 16 timeouts since data 2015-08-28 15:07:07 -07:00
Stephen Birarda
d6310da8c8 consider handshake ACK not received on send queue stop 2015-08-28 15:01:03 -07:00
Stephen Birarda
ee203dbe45 fix check after mutex creation 2015-08-28 14:57:22 -07:00
Stephen Birarda
a30bc79dd5 guard send queue creation with a mutex 2015-08-28 14:55:25 -07:00
Stephen Birarda
1e09321b1a avoid creating multiple send queues from connection 2015-08-28 14:49:27 -07:00
Stephen Birarda
d1386fcb14 Merge branch 'upload-task' into atp 2015-08-28 14:19:30 -07:00
Stephen Birarda
b7d0aa062a repairs to cleanup of send queue 2015-08-28 14:19:20 -07:00
Stephen Birarda
b9d1f39c65 remove include in SendQueue that is unneeded 2015-08-28 12:36:48 -07:00
Stephen Birarda
058a3c422b re-remove the flow window full variable 2015-08-28 11:32:17 -07:00
Stephen Birarda
f2cb85ab09 add missing break to switch for LightACK 2015-08-28 11:16:05 -07:00
Stephen Birarda
3f85e8a2fe add an UploadAssetTask so uploading is on diff thread 2015-08-28 11:12:52 -07:00
Stephen Birarda
9575b47e4e don't unlock double lock outside conditional 2015-08-28 10:38:15 -07:00
Stephen Birarda
54cd430be9 unlock if double lock succeeds but queues not empty 2015-08-28 10:35:29 -07:00
Stephen Birarda
ac3a1d54b1 don't lock in while for maybeResendPacket 2015-08-28 10:07:01 -07:00
Stephen Birarda
d66375bb09 fix queue timeout for empty queue 2015-08-28 09:54:51 -07:00
Stephen Birarda
577b6bf62f correct the check for flow window size 2015-08-28 09:52:33 -07:00
Stephen Birarda
e662209754 use a QMutex instead of QReadWriteMutex 2015-08-28 09:48:55 -07:00
Stephen Birarda
dcd5a4aec2 address comments in code review 2015-08-28 09:47:25 -07:00
Stephen Birarda
21c80e45c2 guard connection addition by a mutex in Socket 2015-08-28 09:42:52 -07:00
Stephen Birarda
539108dd45 repairs for new timeout code 2015-08-28 09:26:32 -07:00
Stephen Birarda
0b712eef55 Merge branch 'protocol' of github.com:birarda/hifi into atp 2015-08-28 09:10:12 -07:00
Stephen Birarda
77aeae7dc0 change to timeout behaviour to re-send unACKed packets 2015-08-28 09:10:06 -07:00
Stephen Birarda
cf98d4a8f7 add a control packet type for LightACK 2015-08-28 07:31:44 -07:00
Atlante45
12fdec232b CR 2015-08-28 16:31:02 +02:00
Atlante45
ea05fcea0c Forward AssetResourceRequest loading errors 2015-08-28 16:03:31 +02:00
Stephen Birarda
d908cd4a53 use NotStarted instead of Unsent, return NotFound for Files 2015-08-28 06:35:02 -07:00
Ryan Huffman
a7294eb0e5 Add AccessDenied error for failure to open File in FileResourceRequest 2015-08-27 22:48:15 -07:00
Ryan Huffman
2a4b25dd76 Update names of ResourceRequest enums 2015-08-27 22:23:06 -07:00
Stephen Birarda
341e27fecc unlock mutexes before calling notify 2015-08-27 22:02:08 -07:00
Stephen Birarda
98888a36a3 use const ref where appropriate for asset classes 2015-08-27 21:33:37 -07:00
Stephen Birarda
111abac0f1 Merge pull request #30 from huffman/cache-limit
Update ResourceCache to only emit failure when not retrying
2015-08-27 21:17:16 -07:00
Ryan Huffman
147fbd4b54 Update ResourceCache to only emit failure when not retrying 2015-08-27 21:11:12 -07:00
Stephen Birarda
5fc09a68a8 add an assert that enqueued packet is part of message 2015-08-27 17:24:57 -07:00
Stephen Birarda
33dc65a00a fix for return of processable packets 2015-08-27 17:09:47 -07:00
Stephen Birarda
8ebcb03b2b don't process duplicate or pre-handshake packets 2015-08-27 16:55:13 -07:00
Ryan Huffman
4bbbd892bd Fix atp scheme checking in ResourceCache 2015-08-27 16:46:33 -07:00
Ryan Huffman
31bdeed396 Remove cache limit for atp urls 2015-08-27 16:43:40 -07:00
Stephen Birarda
413ec718de fix max pairs for timeout NAK 2015-08-27 15:22:53 -07:00
Stephen Birarda
8eeb808572 Merge branch 'protocol' of github.com:birarda/hifi into asset-hash 2015-08-27 15:16:41 -07:00
Stephen Birarda
549c514400 fix upload leak, return error for failed load 2015-08-27 15:12:08 -07:00
Stephen Birarda
e3e529c4e5 resolve conflicts on merge with origin/protocol 2015-08-27 14:52:29 -07:00
Stephen Birarda
80cf7b6c76 resolve conflicts on merge with upstream/master 2015-08-27 14:50:04 -07:00
Stephen Birarda
eae90cbe8a resolve conflicts on merge with origin/protocol 2015-08-27 14:47:35 -07:00
Stephen Birarda
c80c4a9b45 resolve conflicts on merge with origin/protocol 2015-08-27 14:45:22 -07:00
Stephen Birarda
183a2ab996 Merge pull request #18 from Atlante45/protocol
Cleanup connections
2015-08-27 14:41:00 -07:00
Ryan Huffman
dabea21d66 Remove unused variable 2015-08-27 14:30:48 -07:00
Ryan Huffman
5aa5bca8f7 Add path to headers 2015-08-27 14:29:54 -07:00
Stephen Birarda
f238c1b167 include the extension in upload confirmation 2015-08-27 14:29:42 -07:00