30993 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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	d77778790b	Merge branch 'protocol' of github.com:birarda/hifi into upload-task	2015-08-28 11:30:51 -07:00
Clément Brisset	16d082e7c8	Merge pull request #34 from birarda/atp ... fixes for ordered sending via UDT, asset system	2015-08-28 20:30:22 +02: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
Ryan Huffman	2ccf983669	Merge pull request #35 from Atlante45/protocol ... Forward AssetResourceRequest loading errors	2015-08-28 08:46:41 -07:00
Stephen Birarda	cf98d4a8f7	add a control packet type for LightACK	2015-08-28 07:31:44 -07:00
Stephen Birarda	28d9610bd4	add a listen port option to ACs	2015-08-28 07:31:17 -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
Stephen Birarda	0ef459f7a9	Merge pull request #33 from huffman/resource-req-naming ... Resource req naming	2015-08-28 06:30: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
Ryan Huffman	8f8e0f9624	Merge pull request #32 from birarda/atp ... unlock mutexes before calling notify	2015-08-27 22:04:37 -07:00
Stephen Birarda	341e27fecc	unlock mutexes before calling notify	2015-08-27 22:02:08 -07:00
Ryan Huffman	61c31dbe52	Merge pull request #31 from birarda/atp ... use const ref where appropriate for asset classes	2015-08-27 21:36:07 -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	598b9b2819	Merge pull request #29 from birarda/atp ... add an assert that enqueue packet is truly from message	2015-08-27 17:26:36 -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	0c5e97a5c6	Merge pull request #28 from birarda/atp ... fix for return of processable packets	2015-08-27 17:10:41 -07:00
Stephen Birarda	33dc65a00a	fix for return of processable packets	2015-08-27 17:09:47 -07:00
Ryan Huffman	d72aca3239	Merge pull request #27 from birarda/atp ... don't process packets the Connection tells us not to process	2015-08-27 16:56:23 -07:00
Stephen Birarda	8ebcb03b2b	don't process duplicate or pre-handshake packets	2015-08-27 16:55:13 -07:00
Stephen Birarda	458a90d9e1	Merge branch 'protocol' of github.com:birarda/hifi into atp	2015-08-27 16:49:10 -07:00
Stephen Birarda	b56c87bc53	Merge pull request #26 from huffman/cache-limit ... Remove cache limit for atp urls	2015-08-27 16:49:02 -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
Ryan Huffman	0e5027df89	Merge pull request #25 from birarda/atp ... return correct ATP url from upload dialog	2015-08-27 16:08:22 -07:00
Stephen Birarda	a50fd33423	Merge branch 'protocol' of github.com:birarda/hifi into atp	2015-08-27 16:08:12 -07:00
Stephen Birarda	43d2c0653d	return correct ATP url from upload dialog	2015-08-27 16:06:54 -07:00
Ryan Huffman	7d0258fe2c	Merge pull request #24 from birarda/atp ... remove urlAsString from Model	2015-08-27 16:05:46 -07:00
Stephen Birarda	4ed793fffe	Merge pull request #23 from huffman/raw-hash-fix ... Fix issue with raw hash not being converted to hex	2015-08-27 16:02:53 -07:00
Stephen Birarda	8ee27bca2b	remove urlAsString from Model	2015-08-27 16:00:21 -07:00
Ryan Huffman	efef60af04	Rename assetHashHex to hexHash	2015-08-27 15:57:35 -07:00
Ryan Huffman	8452289e00	Fix issue with raw hash not being converted to hex	2015-08-27 15:56:07 -07:00