30974 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Stephen Birarda	28d9610bd4	add a listen port option to ACs	2015-08-28 07:31:17 -07: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
Ryan Huffman	3fbf31eb6e	Merge pull request #22 from birarda/atp ... fix max pairs for timeout NAK	2015-08-27 15:26:29 -07:00
Stephen Birarda	413ec718de	fix max pairs for timeout NAK	2015-08-27 15:22:53 -07:00
Ryan Huffman	0522bdb9e9	Merge pull request #21 from birarda/asset-hash ... use compact representation of hash on the wire	2015-08-27 15:22:17 -07:00
Stephen Birarda	8eeb808572	Merge branch 'protocol' of github.com:birarda/hifi into asset-hash	2015-08-27 15:16:41 -07:00
Ryan Huffman	db97996319	Merge pull request #20 from birarda/asset-upload ... fix some bugs, add an asset-uploader with copiable URL	2015-08-27 15:16:21 -07:00
Stephen Birarda	549c514400	fix upload leak, return error for failed load	2015-08-27 15:12:08 -07:00
Stephen Birarda	46990184d6	AssetUploadDialogFactory constructor should be private	2015-08-27 15:07:15 -07:00
Stephen Birarda	777e6c3c2d	use existing AssetUploadDialogFactory ref	2015-08-27 15:03:13 -07:00
Stephen Birarda	99d751584c	resolve conflicts after protocol DS file cleanup	2015-08-27 14:59:24 -07:00
Stephen Birarda	0f36385b86	remove version conflict markers accidentally committed	2015-08-27 14:58:22 -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	0807d1bf4d	Merge pull request #16 from birarda/handshake ... add a handshake before UDT connection starts	2015-08-27 14:46:26 -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
Stephen Birarda	fa3cdce46e	Merge pull request #19 from huffman/atp-server ... Asset server	2015-08-27 14:40:52 -07:00
Stephen Birarda	59775e5756	actually add the additional error to the dialog	2015-08-27 14:40:12 -07:00
Stephen Birarda	26757eae7a	immediately show permission denied error if applicable	2015-08-27 14:37:44 -07:00