Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-09 01:00:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
62161 commits 74 branches 59 tags 1.2 GiB
Commit graph

3456 commits

Author SHA1 Message Date
Seth Alves
8eef1624cb Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints 2016-01-04 09:27:59 -08:00
Brad Hefta-Gaub
5b177404d5 Merge pull request #6749 from jherico/resource_override 
Allow a script to set a resource override.
 2016-01-04 09:17:38 -08:00
Brad Hefta-Gaub
02835fc960 Merge pull request #6702 from hyperlogic/tony/soft-attachments 
Soft Attachment Support
 2016-01-03 08:46:16 -10:00
Seth Alves
bfa8cc1969 merge from upstream 2016-01-03 06:47:25 -08:00
Seth Alves
fe0a656d54 Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints 2015-12-30 12:45:32 -08:00
Brad Davis
07531353e4 Allow a script to set a resource override. 2015-12-30 09:06:04 -08:00
Andrew Meadows
a5c19c04e5 Merge pull request #6672 from ctrlaltdavid/fix-nodelist-shutdown 
Don't send a domain-server check in when shutting down
 2015-12-30 08:43:19 -08:00
Anthony J. Thibault
c2dd00375d Merge branch 'master' into tony/soft-attachments 2015-12-29 13:21:37 -08:00
Stephen Birarda
a0d6001fa5 actually start domain-server check in timer 2015-12-28 10:54:42 -08:00
Stephen Birarda
2799123b55 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-12-28 10:46:51 -08:00
Seth Alves
83f60d6e97 make entity properties for model-entity joint-states 2015-12-23 15:43:50 -08:00
Seth Alves
5e4a165b4d Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2015-12-22 11:23:09 -08:00
Brad Hefta-Gaub
3dfc48e205 Merge pull request #6687 from jherico/marketplace 
Support the marketplace in QML
 2015-12-21 17:55:55 -08:00
Stephen Birarda
74d1685617 remove an extra space 2015-12-21 16:45:33 -07:00
Stephen Birarda
9e2d06710f fix for connectedToDomain signal signature 2015-12-21 16:37:22 -07:00
Stephen Birarda
49ea560e4e make QTimers in ThreadedAssignment not be raw pointers 2015-12-21 16:33:40 -07:00
Stephen Birarda
8c6449a886 fix for stopping a nullptr QTimer 2015-12-21 16:20:06 -07:00
Brad Davis
6ef77bc46a Support the marketplace in QML 2015-12-21 11:34:03 -08:00
Anthony J. Thibault
1618e0a92f Network, Preferences and UI support for soft attachments 
Added an isSoft field to the AttachmentData which is edited
by the Attachment Dialog Menu, sent over the network via
AvatarData identity packets and saved in the Interface.ini preferences.

AvatarData and AvatarBulkData version number has been bumped.

Changed Avatar attachment collections to use smart pointers to models
instead of raw ones.  Removed _unusedAttachmentModels.
I don't think the caching was worth the added code complexity.
 2015-12-18 13:32:09 -08:00
Seth Alves
a5d37bed60 Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2015-12-18 09:12:57 -08:00
Brad Hefta-Gaub
a7824a06d0 fix Assignment copy constructor warning 2015-12-17 18:51:27 -08:00
Seth Alves
9438015f3a Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2015-12-17 11:48:04 -08:00
Stephen Birarda
06e9731fe4 don't attempt to read an empty or malformed packet 2015-12-17 11:07:36 -08:00
Seth Alves
d34e166b48 Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2015-12-17 07:31:52 -08:00
Atlante45
b4dc3b1b47 Fix windows compile error. 2015-12-16 14:27:26 -08:00
Atlante45
95da71b19c Assignment don't inherit from NodeData 
This is an artefact from an old design that stuck around
 2015-12-16 14:27:26 -08:00
Atlante45
346c28f9e2 Remove OctreeServer's static instance 2015-12-16 14:27:26 -08:00
David Rowe
b25fc5be6c Don't send a domain-server check in when shutting down 2015-12-17 09:52:34 +13:00
Seth Alves
008065ba38 Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2015-12-14 09:15:56 -08:00
Seth Alves
24fb43e8cd first steps toward a puffed-out query-box for child entities 2015-12-12 12:33:14 -08:00
Atlante45
d3224bfde3 More warning fixes 2015-12-11 16:03:44 -08:00
Atlante45
ce51350b65 Fix warnings on windows 64bit 2015-12-11 15:42:15 -08:00
Brad Hefta-Gaub
a7a924153a Merge pull request #6617 from huffman/entity-query-keyhole 
Add keyhole radius to OctreeQuery
 2015-12-11 09:35:46 -08:00
Ryan Huffman
87e30a2157 Remove EntityQuery version and just append new data to end 2015-12-11 09:03:39 -08:00
Ryan Huffman
6acf3603d0 Update naming and number of entity query version 2015-12-10 14:58:08 -08:00
Ryan Huffman
cfcc07da2e Fix current version for EntityQuery 2015-12-10 14:49:28 -08:00
Ryan Huffman
46d645376b Fix misspelling of entities 2015-12-10 14:38:44 -08:00
Ryan Huffman
b6ecd539df Merge branch 'master' of https://github.com/highfidelity/hifi into entity-query-keyhole 2015-12-10 14:36:03 -08:00
Ryan Huffman
b5e3dce376 Add keyhole radius to OctreeQuery 2015-12-10 14:34:28 -08:00
Seth Alves
d243132b5c quiet some logging 2015-12-10 10:28:24 -08:00
Anthony J. Thibault
e9f529bf12 Entities: Removed Start Automatically property from Animation Group 
There is an issue when startAutomatically was set to true and animationPlaying was set to false.
This would cause clients to play the animation when they connected to the entity server, even though the server was not.
 2015-12-09 17:59:56 -08:00
Ryan Huffman
0759462df7 Remove unused variable in PacketReceiver 2015-12-08 09:38:23 -08:00
Ryan Huffman
71c266bc00 Fix order of initializion in ReceivedMessage 2015-12-08 09:22:17 -08:00
Ryan Huffman
44d740ef57 Remove unused variable 'addr' 2015-12-08 09:22:02 -08:00
James B. Pollack
6cf1ad464f Merge pull request #6583 from birarda/extension-ci 
use a case insensitive check for extensions in Application
 2015-12-07 17:33:03 -08:00
Stephen Birarda
7beaf5e235 force asset upload to use a lowercase extension 2015-12-07 15:18:32 -08:00
Leonardo Murillo
25494ec867 Merge pull request #6562 from Atlante45/baseball 
Baseball
 2015-12-07 14:11:21 -08:00
Ryan Huffman
34138f07bd Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message 2015-12-07 08:58:47 -08:00
Atlante45
1d498af76e Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-12-04 15:18:25 -08:00
Stephen Birarda
ad4f818b21 only attempt to stop QTimer if active 2015-12-04 14:12:41 -08:00
Stephen Birarda
d2fdf6a04b Merge branch 'master' of https://github.com/highfidelity/hifi into log-handler-crash 2015-12-04 13:55:57 -08:00
Stephen Birarda
165db97cb2 cleanup double reset debug on assignment-client restart 2015-12-04 11:50:27 -08:00
Brad Hefta-Gaub
84b98c93a1 Merge pull request #6559 from birarda/log-handler-crash 
reset the NodeList on its own thread
 2015-12-04 11:44:06 -08:00
Ryan Huffman
89c412c324 Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message 2015-12-04 11:38:28 -08:00
Stephen Birarda
d5f79b84fc make the NodeList reset a blocking queued connection 2015-12-04 11:20:46 -08:00
Stephen Birarda
918342df5f make sure the NodeList is reset on its own thread 2015-12-04 11:18:46 -08:00
Stephen Birarda
ca84fcd7f4 parent the keepalive timer to the NL thread 2015-12-04 11:01:18 -08:00
Ryan Huffman
d9eddbe738 Remove unnecessary ptr get() in PacketList 2015-12-02 13:32:56 -08:00
Atlante45
70dd8ec19a Remove left/right relative pos/rot from c++ 2015-12-01 11:44:42 -08:00
Atlante45
3bbd20a7bd Merge branch 'master' of https://github.com/highfidelity/hifi into baseball-test 2015-11-30 18:02:34 -08:00
Seth Alves
b7ebe5b92b merge from upstream 2015-11-30 16:59:52 -08:00
Stephen Birarda
f07314f4ef resolve conflicts on merge with huffman/baseball 2015-11-30 13:34:36 -08:00
Stephen Birarda
4573e5c59e resolve conflicts on merge with upstream/master 2015-11-30 13:32:38 -08:00
Ryan Huffman
5849befb3d Add caching back to AssetRequest 2015-11-30 11:53:53 -08:00
Ryan Huffman
304b105dac Add proper message failure handling to Connection 2015-11-30 11:53:08 -08:00
Ryan Huffman
2e76f0e0d8 Update ReceivedMessage progress to only trigger every 100 packets 2015-11-30 11:52:49 -08:00
Ryan Huffman
5e27af5076 Remove old comment in PacketReceiver 2015-11-30 11:52:21 -08:00
Ryan Huffman
242167ebf2 Remove debug messages 2015-11-30 11:52:07 -08:00
Ryan Huffman
bb6bb85d12 Update comment in ReceivedMessage 2015-11-30 09:16:57 -08:00
Ryan Huffman
dc48b9a266 Limit progress signal in ReceivedMessage to once every 50 packets 2015-11-30 09:15:25 -08:00
Ryan Huffman
4220d7a3cc Add atp hash checking back in 2015-11-30 09:13:59 -08:00
Seth Alves
ca75802b9c unmangle merge 2015-11-26 06:43:28 -08:00
Anthony J. Thibault
2a9adafc09 Bumped avatar packet version number 2015-11-25 12:13:40 -08:00
Ryan Huffman
dac491ef41 Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message 2015-11-24 09:59:22 -08:00
samcake
a1668cdc73 Let the AssertClient JS interface use global vars 2015-11-23 22:28:59 -08:00
Seth Alves
f013f95e9b merge from upstream 2015-11-21 08:43:00 -08:00
Clément Brisset
5d75fcbfce Merge pull request #6430 from birarda/unique_linked_data 
use a unique_ptr for linkedData in Node
 2015-11-20 15:01:41 -08:00
Brad Hefta-Gaub
c7673aad4a Merge pull request #6447 from huffman/polyline-texture 
Add texture property to polyline entity type
 2015-11-20 13:31:34 -08:00
Brad Davis
eef01f8a13 Merge pull request #6443 from ZappoMan/assetJS 
fix crash with no asset server
 2015-11-20 12:58:16 -08:00
Stephen Birarda
b34934b849 resolve conflicts on merge with upstream/master 2015-11-20 11:52:53 -08:00
Brad Hefta-Gaub
f1badc017b CR feedback 2015-11-20 11:43:50 -08:00
Brad Hefta-Gaub
caa8b0b5b6 fix unix build 2015-11-20 11:07:01 -08:00
Brad Hefta-Gaub
4bbfcb6092 Merge branch 'master' of https://github.com/highfidelity/hifi into messaging 2015-11-20 10:30:38 -08:00
Ryan Huffman
0d6279da17 Merge remote-tracking branch 'origin/polyline-texture' into baseball 2015-11-20 10:19:30 -08:00
Brad Hefta-Gaub
0e5e33446e handle old protocol case 2015-11-20 09:57:30 -08:00
Brad Hefta-Gaub
abf169ebd9 fix senderID in messages, dry up code 2015-11-20 09:03:21 -08:00
Brad Hefta-Gaub
5c6cd9b06c fix thread safety and crash with no asset server 2015-11-19 18:53:12 -08:00
Brad Hefta-Gaub
f80a765a29 add Assets.uploadData() and Assets.downloadData() 2015-11-19 17:28:20 -08:00
Ryan Huffman
07d21514c5 Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message 2015-11-19 10:47:37 -08:00
Stephen Birarda
271387f96e use a unique_ptr for linkedData in Node 2015-11-18 18:03:31 -08:00
Ryan Huffman
2a416ebc61 Merge branch 'master' of https://github.com/highfidelity/hifi into received-message 2015-11-18 16:52:23 -08:00
Stephen Birarda
08e6b63090 cleanup debug of received domain-server settings 2015-11-18 15:43:31 -08:00
Ryan Huffman
c2648fd6dd Remove _packetListenerMap 2015-11-18 15:30:43 -08:00
Ryan Huffman
f0ad7f85dc Add readHead* to ReceivedMessage 2015-11-18 15:30:30 -08:00
Stephen Birarda
f2ecce6043 use safer domain settings request in audio-mixer 2015-11-18 15:13:29 -08:00
Stephen Birarda
1a066abb26 fix some indentation for UDT_CONNECTION_DEBUG lines 2015-11-18 14:43:56 -08:00
Stephen Birarda
65142a3963 clean up agent comment for domain settings request 2015-11-18 14:20:56 -08:00
Ryan Huffman
3d0afc3c5f Update entities version number for polyline change 2015-11-18 14:00:00 -08:00
Stephen Birarda
c54dffac12 fix entity-server avg ping, remove debug 2015-11-18 10:32:35 -08:00
Stephen Birarda
0e3d3451d7 make keep alive pings the responsibility of NL 2015-11-18 10:24:10 -08:00
Brad Hefta-Gaub
293914b84f added NodeActivated signal to make it easier for users to know when a recently added node has an active socket 2015-11-17 16:31:34 -08:00
Brad Hefta-Gaub
073215d067 handle socketActivated 2015-11-17 15:55:41 -08:00
Brad Hefta-Gaub
9c4286b6ca Merge branch 'master' of https://github.com/highfidelity/hifi into messaging 2015-11-17 15:50:54 -08:00
Stephen Birarda
f5ec458a5e make activeSocket checks more consistent 2015-11-17 15:38:03 -08:00
Stephen Birarda
3906a747b8 fix a couple of bad checks 2015-11-17 15:33:57 -08:00
Stephen Birarda
34b8fca83b add socketActivated signal to NetworkPeer for punch success 2015-11-17 15:04:31 -08:00
Stephen Birarda
7dfdb3c72e protect LNL packet sending without active socket 2015-11-17 15:04:14 -08:00
Brad Hefta-Gaub
3efbcb7062 debug the late connect case 2015-11-17 14:47:59 -08:00
Brad Hefta-Gaub
d8a3927311 debug the late connect case 2015-11-17 14:43:06 -08:00
Brad Hefta-Gaub
85aa3b3f83 handle subscribe when messages mixer is not available 2015-11-17 14:28:51 -08:00
Brad Hefta-Gaub
8112b3b57e add senderUUID to the messageReceived signal 2015-11-17 14:16:22 -08:00
Brad Hefta-Gaub
2d3fe497e4 fix typo 2015-11-17 13:29:28 -08:00
Brad Hefta-Gaub
5b9791d800 add message received signal 2015-11-17 11:50:10 -08:00
Brad Hefta-Gaub
60ae1259fa more cleanup work 2015-11-17 11:06:27 -08:00
Brad Hefta-Gaub
034debc483 cleanup 2015-11-17 10:59:53 -08:00
Brad Hefta-Gaub
f9a674bca5 implement subscribe/unsubscribe in MessagesClient 2015-11-17 10:01:31 -08:00
Brad Hefta-Gaub
6b61ec569c more work on channels 2015-11-17 09:47:50 -08:00
ZappoMan
f712fae4d2 more hacking 2015-11-17 08:56:21 -08:00
Brad Hefta-Gaub
12f206e2f0 more work on messages 2015-11-16 17:00:03 -08:00
Brad Hefta-Gaub
40e69f6946 Merge branch 'master' of https://github.com/highfidelity/hifi into messaging 2015-11-16 15:31:06 -08:00
Brad Hefta-Gaub
d42a1a721f first cut at messages-mixer 2015-11-16 15:26:17 -08:00
Ryan Huffman
5154fbc8c5 Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-16 12:23:26 -08:00
Stephen Birarda
584e35e4ab have killNodeWithUUID return success to avoid double lookup 2015-11-16 10:58:11 -08:00
Stephen Birarda
ea38c4cc49 don't allow domain check-ins while shutting down 2015-11-12 18:04:15 -08:00
Stephen Birarda
6b2987eef8 handle domain server node removal in NodeList 2015-11-12 17:47:51 -08:00
Stephen Birarda
e52e9be44c re-broadcast disconnects from domain-server 2015-11-12 17:23:39 -08:00
Stephen Birarda
1c9396d66e handle disconnect request in domain-server 2015-11-12 15:43:03 -08:00
Stephen Birarda
8bdb81d832 send disconnect packet from node when leaving domain 2015-11-12 15:03:19 -08:00
Stephen Birarda
0a64242160 cleanup string grabbing for PacketType enum 2015-11-12 14:43:25 -08:00
Stephen Birarda
288ee0e9e8 add a NodeDisconnect packet 2015-11-12 11:39:32 -08:00
Atlante45
aca5cb2559 Renamed header version 2015-11-10 14:18:27 -08:00
Atlante45
d79221edd2 AvatarActionHold can ignore IK 2015-11-10 14:06:59 -08:00
Atlante45
6a53021818 Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-09 13:23:31 -08:00
ericrius1
31fe5fa953 Bump version num, use different shader for additive blending effect 2015-11-03 17:15:10 -08:00
Ryan Huffman
7f4a8e9d7d Merge branch 'master' of github.com:Atlante45/hifi into baseball 2015-11-02 12:25:51 -08:00
Seth Alves
3ac0fef1ea merge from upstream 2015-11-01 15:22:57 -08:00
samcake
393f6a4c76 Fixing a bad field ID for keyLight.AmbientURL and bumping the domain version 2015-10-30 11:35:50 -07:00
Clément Brisset
a37c94bd3c Merge pull request #6202 from birarda/asset-parenting 
don't force parenting of AssetUpload/AssetRequest
 2015-10-30 09:45:42 -07:00
Stephen Birarda
06897aa474 don't force parenting of AssetRequest/AssetUpload 2015-10-27 19:29:54 -07:00
Atlante45
5f8c3a6b4b Fix AssetResourceRequest crash 2015-10-27 10:27:37 -07:00
samcake
bc7ad9d3f7 Move the keyLIght properties in their own group and add the ambientURL in 2015-10-26 09:27:06 -07:00
Seth Alves
778dc8dc15 add parentID and parentJointIndex EntityItemProperties 2015-10-22 11:52:56 -07:00
Stephen Birarda
1e39c9359f don't force parenting of AssetRequest/AssetUpload 2015-10-21 11:53:38 -07:00
Ryan Huffman
9ddcfdf94d Cleanup PacketReceier and ReceivedMessage 2015-10-16 09:21:10 -07:00
Ryan Huffman
7682ab00e3 Add ReceivedMessage and receive progress 2015-10-15 14:09:53 -07:00
Brad Hefta-Gaub
b7c40c2df1 fix Queue OUT stat 2015-10-15 11:41:04 -07:00
Stephen Birarda
2caa7f6d64 change getUrl to getATPUrl, use in ATPAssetMigrator 2015-10-13 16:56:20 -07:00
Stephen Birarda
76bfc6218a add back block removed in merge 2015-10-13 16:36:10 -07:00
Stephen Birarda
fc82ea8541 resolve conflicts on merge with upstream/master 2015-10-13 16:12:54 -07:00
Stephen Birarda
c328941b9d Merge pull request #6074 from huffman/fix-empty-hash 
Fix crash when atp url is empty
 2015-10-13 16:02:28 -07:00
Ryan Huffman
c468cabe7e Fix crash when atp url is empty 2015-10-13 15:12:01 -07:00
Stephen Birarda
cf74cfb50e add an ATPAssetMigrator for bulk ATP migration 2015-10-13 10:38:52 -07:00
Atlante45
b7ba99380a Pretty up loading debug 2015-10-12 15:32:44 -07:00
Atlante45
7eadb11404 Remove optional upload caching 2015-10-12 15:09:17 -07:00
Atlante45
0e0a8301eb Collapse line 2015-10-12 15:06:51 -07:00
Atlante45
0cdad78581 Move debug to helper functions 2015-10-12 15:03:37 -07:00
Atlante45
4abac35c72 Cache on upload 2015-10-12 15:03:37 -07:00
Atlante45
51acf07c15 Factor couple methods in AssetUtils 2015-10-12 15:03:37 -07:00
Brad Davis
cd1b758534 PR comments 2015-10-11 00:32:31 -07:00
Brad Davis
e5fc2e5525 Low level support for URL overrides when loading content 2015-10-10 23:00:15 -07:00
Stephen Birarda
b84109a781 Merge pull request #6040 from huffman/fix-null-node 
Fix case where we deref a null pointer in OctreeInboundPacketProcessor
 2015-10-09 14:57:16 -07:00
Clément Brisset
a5f0b75e25 Merge pull request #6043 from huffman/fix-uninitialized-arr 
Fix uninitialized pointer in AssetResourceRequest
 2015-10-09 13:36:58 -07:00
Clément Brisset
aa221741e5 Merge pull request #6041 from birarda/packet-corruption 
fix for re-send timeout in SendQueue
 2015-10-09 13:33:34 -07:00
Ryan Huffman
c02df56ceb Fix uninitialized pointer in AssetResourceRequest 2015-10-09 13:15:13 -07:00
Stephen Birarda
58f9830a94 fix for re-send timeout in SendQueue 2015-10-09 10:04:35 -07:00
Ryan Huffman
36aaffce43 Revert "Fix _packets not being cleaned up in ReceivedPacketProcessor" 
This reverts commit 4dddb508a8.
 2015-10-09 10:01:53 -07:00
Ryan Huffman
21e9d30bbe Move qdeclare/qregister calls to their respective class header 2015-10-09 09:58:32 -07:00
Ryan Huffman
4dddb508a8 Fix _packets not being cleaned up in ReceivedPacketProcessor 2015-10-09 09:21:36 -07:00
Clément Brisset
7caf8755d1 Merge pull request #6039 from birarda/packet-corruption 
hold the sent packets lock while re-sending a packet
 2015-10-08 19:57:08 -07:00
Stephen Birarda
8985427516 maintain sent packets lock while re-sending packet 2015-10-08 19:47:15 -07:00
Clément Brisset
6d694b877d Merge pull request #6036 from birarda/packet-corruption 
fix for registration of meta types in Socket
 2015-10-08 18:29:03 -07:00
Clément Brisset
a2b5748f54 Merge pull request #6027 from birarda/net-crashes 
clean up Nodes via deleteLater on the network thread
 2015-10-08 18:22:40 -07:00
Stephen Birarda
1cd76bb937 fix for registration of meta types in Socket 2015-10-08 18:17:24 -07:00
Stephen Birarda
aa2a8edc6f use _segmentStartIndex before changing its value 2015-10-08 15:44:18 -07:00
Stephen Birarda
0d9421a65e constantize the PacketList write error 2015-10-08 15:40:49 -07:00
Stephen Birarda
519df1565a fix comment format in PacketList 2015-10-08 15:38:41 -07:00
Stephen Birarda
dc4f987a2e fix segmented write logic in PacketList 2015-10-08 15:38:41 -07:00
Stephen Birarda
8ce3ee0d60 have nodes be cleaned up on the NL thread 2015-10-08 13:22:43 -07:00
Brad Hefta-Gaub
a86e34f9f9 Merge pull request #6018 from hyperlogic/tony/avatar-mixer-stats-improvements 
Separated AvatarMixer inbound and outbound bandwidth on stats overlay
 2015-10-07 16:04:13 -07:00
Anthony J. Thibault
00f3b7b1b5 Renamed delt to averageTimeBetweenPackets 2015-10-07 15:46:42 -07:00
Anthony J. Thibault
0cebeb7fe9 Separated AvatarMixer inbound and outbound bandwidth on stats overlay 
Also, small bug fix to BandwidthRecorder. It would incorrectly
calculate outbound pps if the input pps was 0.
 2015-10-07 15:32:10 -07:00
Brad Hefta-Gaub
bfd014203e fix a bunch of warnings 2015-10-07 14:48:42 -07:00
Brad Hefta-Gaub
ef054ffc6d Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings 
Conflicts:
	libraries/networking/src/udt/PacketHeaders.cpp
	libraries/networking/src/udt/PacketHeaders.h
 2015-10-07 11:27:50 -07:00
Stephen Birarda
022c4276b9 Merge pull request #5892 from Atlante45/protocol 
Add channels to UDT
 2015-10-07 11:06:22 -07:00
Ryan Huffman
74c89ad099 Merge pull request #5984 from Atlante45/cleanup_app 
Application cleanup
 2015-10-06 16:58:05 -07:00
Atlante45
3a8deff53e Return if innactive 2015-10-06 16:38:16 -07:00
Atlante45
ca575bee89 Remove unecessary move 2015-10-06 16:15:51 -07:00
Atlante45
5ee966261d Start thread right away 2015-10-06 16:12:50 -07:00
Atlante45
81b88cb096 Renamed MessagePart > MessagePartNumber 2015-10-06 16:12:04 -07:00
Stephen Birarda
fbf6d166b7 add wire size to BasePacket 2015-10-06 14:48:28 -07:00
Stephen Birarda
9079f891e9 repair broken node bandwidth stats 2015-10-06 14:09:21 -07:00
Atlante45
77a7814854 Move sendPingPackets 2015-10-06 13:56:20 -07:00
Atlante45
0f18db886c Remove 4 Application static methods 
- Replace by lambda
- Cleaned up global scope
 2015-10-06 13:56:19 -07:00
Atlante45
f5f349e13a Bumped packet version numbers 2015-10-02 14:20:20 -07:00
Brad Hefta-Gaub
57bf69cc48 Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings 
Conflicts:
	libraries/entities/src/ModelEntityItem.cpp
	libraries/networking/src/udt/PacketHeaders.cpp
 2015-10-02 14:19:15 -07:00
Atlante45
1e56d0c99b Add parenthesis to quiet gcc warning 2015-10-02 14:18:18 -07:00
Atlante45
1f07ba46d0 Fix in-class initialization for windows build 2015-10-02 14:18:18 -07:00
Atlante45
48ff912dd2 Use one channel per packet list 2015-10-02 14:18:18 -07:00
Atlante45
3db99f50e5 Change takeFront name 2015-10-02 14:18:18 -07:00
Atlante45
7007d9f223 Use message part to check recieved packet list 2015-10-02 14:18:17 -07:00
Atlante45
c3fc6f4f79 Add message part to Packet 2015-10-02 14:18:17 -07:00
Atlante45
8cecb95bf2 Use array for stats 2015-10-02 14:16:47 -07:00
Atlante45
f1a9aba704 Magic number 2015-10-02 14:16:46 -07:00
Atlante45
91c779ddd8 Templatized DoubleLock 2015-10-02 14:16:46 -07:00
Atlante45
732ad41080 Introduce PacketQueue 2015-10-02 14:16:46 -07:00
Atlante45
709dab6beb Release send queue before cleanup 2015-10-02 14:16:45 -07:00
Atlante45
290a0e573d House cleaning 2015-10-02 14:16:45 -07:00
Atlante45
b0fe8535fd Release _sendQueue before cleanup 2015-10-02 14:16:45 -07:00
Atlante45
eb8b37309d Use lock_guard when possible 2015-10-02 14:16:44 -07:00
Atlante45
a4d383b384 Check handshake separately 2015-10-02 14:16:44 -07:00
Atlante45
3a61e6b6a3 Coding standart for locks 2015-10-02 14:16:44 -07:00
Atlante45
a34e1d85a5 Close current packet fix 2015-10-02 14:16:44 -07:00
Brad Hefta-Gaub
e6fb587a8c Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings 2015-10-02 13:04:14 -07:00
Anthony J. Thibault
fc7b6dee84 Merge branch 'master' into transmit-joint-translation 2015-10-02 11:40:33 -07:00
Anthony J. Thibault
fa864d29f9 Merge branch 'master' into transmit-joint-translation 2015-10-01 16:55:24 -07:00
Brad Hefta-Gaub
f2e65f5a98 Merge pull request #5936 from birarda/tv-es-lockup 
fix a timer leak, line width in PacketList
 2015-10-01 14:39:40 -07:00
Brad Hefta-Gaub
6aa9ef9910 first cut at migrating animation settings into a property group 2015-09-30 20:51:25 -07:00
Stephen Birarda
5da5bd47af add a missing rename for socket Q_ASSERT_X 2015-09-30 21:45:22 -04:00
Brad Hefta-Gaub
9cf49597a6 fix possible crash from null coming from _sentPackets 2015-09-30 14:16:41 -07:00
Brad Hefta-Gaub
46e1a298c8 Merge pull request #5951 from huffman/cc-rng-fix 
Fix infinite recursion error with CC rng
 2015-09-30 12:36:35 -07:00
Ryan Huffman
1e9593029c Fix infinite recursion error with CC rng 
On some std::random implementations tryin get a range [low, high) where
high < low will cause infinite recursion.
 2015-09-30 11:34:11 -07:00
Stephen Birarda
82ac0b1a27 use a mutable mutex to keep const-ness 2015-09-30 14:23:18 -04:00
Stephen Birarda
f7e7b07441 fix constness of SentPacketHistory in OEPS 2015-09-30 14:15:22 -04:00
Stephen Birarda
cc6b0adb7d guard insert/get in SentPacketHistory 2015-09-30 14:15:04 -04:00
Stephen Birarda
f4bc3f8e38 fix a timer leak, line width in PacketList 2015-09-29 16:35:24 -04:00
Seth Alves
50dd8eba45 Relay joint translations across network. Apply animation's root-joint translation to avatar. 2015-09-26 11:40:39 -07:00
David Rowe
eb01ba9812 Merge branch 'master' into 20681 2015-09-23 09:42:56 -07:00
Brad Hefta-Gaub
efda121619 fix a bunch of warnings on windows 2015-09-22 16:40:17 -07:00
David Rowe
03194437f5 Merge branch 'master' into 20681 
Conflicts:
	examples/entityScripts/sprayPaintCan.js
 2015-09-18 12:04:02 -07:00
Sam Gateau
d0f7ddd3a6 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-09-18 00:03:19 -07:00
David Rowe
12e2cf3ce9 Emit in all directions from a point or the surface of a spheroid 2015-09-17 17:14:35 -07:00
Stephen Birarda
285a6cc738 use erase directly for cleanupConnection 2015-09-17 14:51:48 -07:00
Stephen Birarda
a914ec82c3 more comment correctness for Socket 2015-09-17 14:17:43 -07:00
Stephen Birarda
1f9bb22b9e fix some wording in Socket comment 2015-09-17 14:17:03 -07:00
Stephen Birarda
36e2d4fc76 add check for NotStarted state in PL queue 2015-09-17 14:16:03 -07:00
Stephen Birarda
4758dd2a53 correct locking races in SendQueue/Connection cleanup 2015-09-17 14:13:24 -07:00
David Rowe
d51cab3e3d Replace particle velocity with speed and orientation 2015-09-16 14:51:08 -07:00
Sam Gateau
d45547aa1a Merge and update 2015-09-16 13:46:07 -07:00
Stephen Birarda
cc8ad868b8 don't parent DS timer to object in another thread 2015-09-16 12:27:57 -07:00
Stephen Birarda
500a96ee7c guard perpetual AC domain connection if NL thread locked 2015-09-16 12:25:03 -07:00
Atlante45
88d073b4ac More disk cache debug info 2015-09-16 15:20:48 +02:00
Atlante45
dd0244b15d Added a couple comments 2015-09-16 15:17:15 +02:00
Atlante45
9678e70444 Asset caching 2015-09-16 15:17:15 +02:00
Atlante45
eabee9857a Enum coding standard 2015-09-16 15:17:14 +02:00
Brad Hefta-Gaub
54972515dc make sure timer is owned 2015-09-15 17:04:40 -07:00
Ryan Huffman
8c3d8bc7de Merge pull request #5809 from birarda/phrc 
timing fixes for default time_point on windows
 2015-09-15 15:29:30 -07:00
Stephen Birarda
8454cb916c avoid branching by using %= operator 2015-09-15 15:15:26 -07:00
Stephen Birarda
6756d5364b sensible defaults for other time_point uses 2015-09-15 10:11:05 -07:00
Stephen Birarda
6a186ad1fe ensure a handshake goes out the first time 2015-09-15 09:48:17 -07:00
Brad Hefta-Gaub
54a45f3173 Merge branch 'master' of https://github.com/highfidelity/hifi into scriptEngineCleanup 
Conflicts:
	libraries/entities-renderer/src/EntityTreeRenderer.cpp
	libraries/script-engine/src/ScriptEngine.cpp
	libraries/script-engine/src/ScriptEngine.h
 2015-09-14 21:13:08 -07:00
Stephen Birarda
a27e0e7cc7 remove an unused alias 2015-09-14 17:18:22 -07:00
Stephen Birarda
84ab4fd585 force minimum for p_hrc time_point values 2015-09-14 17:16:42 -07:00
Ryan Huffman
b0ffb50fdf Move assertion in AssetRequest below error checking 
If the request had an error then there is no reason the assertion should
be true.
 2015-09-14 15:48:11 -07:00
Ryan Huffman
15b809bd16 Merge pull request #5795 from birarda/phrc 
fix high resolution timing for VS2012 in networking
 2015-09-14 13:49:20 -07:00
Stephen Birarda
d82fd9a6ed Merge pull request #5797 from huffman/fix-assert 
Fix assert in AssetResourceRequest
 2015-09-14 13:40:13 -07:00
Ryan Huffman
f3b513866a Fix assert in AssetResourceRequest 2015-09-14 13:39:14 -07:00
Stephen Birarda
8308dbf4a3 Merge pull request #5787 from huffman/cleanup-asset-requests-on-node-kill 
DO NOT MERGE: Cleanup asset requests on node kill
 2015-09-14 13:08:01 -07:00
Ryan Huffman
29d26a1f9a Fix namespace issues std:: template specialization 2015-09-14 12:17:36 -07:00
Ryan Huffman
42d21e4dc1 Update AssetClient's node killed handling to check if node is asset server first 2015-09-14 11:56:47 -07:00
Ryan Huffman
e87fcb78cd Add proper cleanup of AssetRequest in AssetResourceRequest 2015-09-14 11:34:51 -07:00
Ryan Huffman
b8c1c279c6 Update AssetRequest::State enum to use camelcase 2015-09-14 11:22:55 -07:00
Ryan Huffman
6468046c68 Update AssetClient callbacks to return whether a response was received 2015-09-14 11:22:34 -07:00
Stephen Birarda
302fd923b8 Merge branch 'master' of https://github.com/highfidelity/hifi into phrc 2015-09-14 11:21:37 -07:00
Stephen Birarda
9b926f6f04 add an hrc with proper resolution for < VC2015 2015-09-14 11:21:08 -07:00
Sam Gateau
3f2609e52a merging 2015-09-14 09:59:04 -07:00
Seth Alves
49ee251238 quiet compiler 2015-09-12 09:59:25 -07:00
Brad Hefta-Gaub
8395fb6eff normalize how ScriptCache::getScript() works relative to ResourceManager 2015-09-11 21:24:39 -07:00
Stephen Birarda
6da388f2af cleanup UDT_CONNECTION_DEBUG, add time for node timeout 2015-09-11 16:38:14 -07:00
Ryan Huffman
a5ba86514c Remove log message 2015-09-11 14:01:08 -07:00
Ryan Huffman
b564ceb76f Add network error to AssetRequest 2015-09-11 14:01:08 -07:00
Ryan Huffman
42b4c7d423 Update AssetClient to handle disconnections from a node 2015-09-11 14:01:08 -07:00
Ryan Huffman
3ae323cb2e Move pending requests in AssetClient to include node sent to 2015-09-11 14:01:08 -07:00
Ryan Huffman
4ed3e36181 Update AssetClient::create* methods to not block on invokeMethod 2015-09-11 14:01:08 -07:00
Sam Gateau
c9ec65fd65 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-09-11 09:51:43 -07:00
Stephen Birarda
a286f4e7d0 Merge pull request #5772 from Atlante45/protocol 
Asset server node JSON stats
 2015-09-11 09:35:39 -07:00
Ryan Huffman
9ab603e9a5 Merge pull request #5773 from birarda/master 
fail asset request if hash does not match
 2015-09-11 09:09:56 -07:00
Atlante45
449d6a04d8 CR 2015-09-11 14:21:56 +02:00
Atlante45
8c1fb67825 Lock nodeHash mutex for node lookup 2015-09-11 14:21:55 +02:00
Atlante45
0037a1f4a7 Win build fix 2015-09-11 14:21:55 +02:00
Atlante45
15f7745bcc JSON stats reliable and ordered 2015-09-11 14:21:54 +02:00
Atlante45
08e0a8d705 AssetServer JSON stats 2015-09-11 14:21:53 +02:00
Atlante45
5808658958 Make NodeJSONStats reliable 2015-09-11 14:21:53 +02:00
Sam Gateau
c37cdce750 Merging back with master 2015-09-10 17:53:50 -07:00
Stephen Birarda
973fd80c1d fail asset request if hash does not match 2015-09-10 15:24:37 -07:00
Anthony J. Thibault
3149baeefc Merge branch 'master' into tony/ik-and-controllers 2015-09-10 11:04:31 -07:00
Brad Hefta-Gaub
626fcb867b CR feedback 2015-09-09 17:27:39 -07:00
Brad Hefta-Gaub
f710afbfd1 CR feedback 2015-09-09 17:26:01 -07:00
Brad Hefta-Gaub
d62945c6bf fix degenerative url scheme case 2015-09-09 17:13:16 -07:00
Stephen Birarda
f06e4eaae9 fix suppression of packet from unknown node 2015-09-09 15:20:35 -07:00
Stephen Birarda
2849d80274 use the exact payload size where possible 2015-09-09 10:39:53 -07:00
Stephen Birarda
e7e1f5fe5c make all of AssetClient packets reliable 2015-09-09 10:35:31 -07:00
Andrew Meadows
b6cef3d1a9 fix Qt includes 2015-09-08 18:19:33 -07:00
Stephen Birarda
a3feff1bd4 put DomainServerConnectionToken back in NON_SOURCED 2015-09-08 16:19:15 -07:00
Stephen Birarda
e1c395f5ea resolve conflicts on merge with upstream/master 2015-09-08 14:56:23 -07:00
Stephen Birarda
e0a8469354 fix for sequence point warning 2015-09-08 13:42:52 -07:00
Stephen Birarda
9878143661 repairs to ShaderCache for Resource changes 2015-09-08 08:58:35 -07:00
David Rowe
cb9468c311 Add colorSpread entity particle property 2015-09-07 16:27:42 -07:00
David Rowe
12b8a5a1d5 Add alpha property support to ParticleEffect entities 
Add at same "level" as color so that it's available for other entity
types to use in the future.
 2015-09-05 10:23:27 -07:00
David Rowe
18bc7befee Merge branch 'master' into 20669 
Conflicts:
	libraries/networking/src/udt/PacketHeaders.cpp
	libraries/networking/src/udt/PacketHeaders.h
 2015-09-04 13:49:46 -07:00
David Rowe
c910da7179 Add radiusStart and radiusFinish entity particle properties 2015-09-04 12:27:18 -07:00
Stephen Birarda
875d10575f add filename rename somehow missed in previous commit 2015-09-04 12:43:43 -06:00
Stephen Birarda
3875a7d881 fix bad copy on merge to FileResourceRequest 2015-09-04 12:39:35 -06:00
Stephen Birarda
ed19987b7d resolve conflicts on merge with upstream/master 2015-09-04 12:31:46 -06:00
David Rowe
45ff118249 Add new radiusSpread entity particle property 2015-09-03 14:55:08 -07:00
Seth Alves
3963035599 Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again 2015-09-01 21:08:23 -07:00
Stephen Birarda
e5a10e3174 resolve conflicts on merge with upstream/master 2015-09-01 17:07:32 -06:00
Stephen Birarda
231ea3b240 fix namespacing for sequence number hasher 2015-09-01 15:35:50 -06:00
Stephen Birarda
f24a267d83 fix hasher for HifiSockAddr on ubuntu 2015-09-01 15:16:02 -06:00
Seth Alves
e32b9191f5 bump AvatarData protocol version 2015-09-01 13:35:58 -07:00
Stephen Birarda
6e7db4e816 Merge pull request #51 from huffman/tiemstamp-on-receive-packet-from-packetlist 
Move lastHeardMicroStamp to be updated when filtering packets
 2015-09-01 14:35:07 -06:00
Clément Brisset
a1db4c37a7 Merge pull request #42 from birarda/control-pair-probe 
send a control packet as bandwidth probe
 2015-09-01 22:33:51 +02:00
Ryan Huffman
639dbea25b Move lastHeardMicroStamp to be updated when filtering packets 2015-09-01 13:32:24 -07:00
Clément Brisset
5a8a95f367 Merge pull request #48 from huffman/win-fixes 
More Windows build fixes
 2015-09-01 21:41:56 +02:00
Ryan Huffman
70c937d37f Replace NO_ERROR with NoError 2015-09-01 12:31:30 -07:00
Ryan Huffman
b73d307210 Move std::placeholders::_1 to where they are used 2015-09-01 12:24:38 -07:00
Ryan Huffman
fb8e822fa8 Fix lines longer than 120 columns 2015-09-01 12:14:58 -07:00
Ryan Huffman
d166e6d8c3 Move UUID.cpp/h to libraries/shared 2015-09-01 12:00:43 -07:00
Ryan Huffman
cb5a49e6e4 Add missing headers needed to build on Windows 2015-09-01 11:59:45 -07:00
Ryan Huffman
019d234ffd Replace std::bind for methods that use std::unique_ptr with a lambda 2015-09-01 11:58:33 -07:00
Stephen Birarda
56d6d95df9 only process cp tail if in the right spot 2015-09-01 12:09:58 -06:00
Clément Brisset
0733ba54c7 Win build fixes 2015-09-01 18:23:44 +01:00
Stephen Birarda
6c9021c288 only send second packet of pair when required 2015-09-01 11:10:19 -06:00
Stephen Birarda
2a8250ced5 Merge branch 'protocol' of github.com:birarda/hifi into control-pair-probe 2015-09-01 11:10:06 -06:00
Clément Brisset
1e8ab09cd4 Merge pull request #46 from huffman/win-fixes 
Windows build fixes
 2015-09-01 18:52:55 +02:00
Ryan Huffman
899b94eab3 Add cstdint include to Asset* files 2015-09-01 09:41:19 -07:00
Ryan Huffman
db92e3155c Update AssetServerError enum to be camelcase 2015-09-01 09:39:30 -07:00
Stephen Birarda
be78d7f3aa fix headers for move of UUID to shared 2015-09-01 10:20:06 -06:00
Stephen Birarda
4824b38465 move UUID back to shared 2015-09-01 10:17:07 -06:00
Ryan Huffman
791652557e Fix friend declaration in Socket from udt::UDTTest to UDTTest 2015-08-31 17:32:00 -07:00
Ryan Huffman
e36c2b8567 Remove extra curly brace 2015-08-31 16:55:35 -07:00
Stephen Birarda
8d3788c2b6 Merge branch 'protocol' of github.com:birarda/hifi into control-pair-probe 2015-08-31 17:33:53 -06:00
Stephen Birarda
adad752860 Merge branch 'protocol' of github.com:birarda/hifi into control-pair-probe 2015-08-31 16:07:27 -06:00
Stephen Birarda
33f1302d1f Merge branch 'atp' of github.com:birarda/hifi into atp 2015-08-31 16:04:58 -06:00
Stephen Birarda
4255220a69 Merge branch 'protocol' of github.com:birarda/hifi into atp 2015-08-31 16:04:44 -06:00
Ryan Huffman
423370dccb Merge pull request #37 from birarda/upload-task 
add a task for upload in asset-server
 2015-08-31 14:55:37 -07:00
Clément Brisset
745f8dfa1b Merge pull request #39 from huffman/ordered-insertion 
Update message handling to use insertion sort
 2015-08-31 23:46:06 +02:00
Atlante45
0de4c02e8d Add time unit in debug 2015-08-31 23:24:14 +02:00
Atlante45
3f5394281b Fix HTTPS timeout issue 2015-08-31 23:20:07 +02:00
Atlante45
8f74935e96 Don't reload on error 2015-08-31 22:34:16 +02:00
Atlante45
9a9c703a78 Some code cleanup 2015-08-31 22:31:24 +02:00
Atlante45
15e9797827 CR 2015-08-31 22:12:42 +02:00
Ryan Huffman
e8fba991fa Update raw loop to use find_if for message packet sorting 2015-08-31 12:35:41 -07:00
Stephen Birarda
04d23f6cc2 Merge branch 'timers-from-thread' into atp 2015-08-31 11:50:35 -07:00
Stephen Birarda
46d90b4f31 make sure syn timer is moved to Socket thread 2015-08-31 11:40:06 -07:00
Stephen Birarda
de2bfd0d0d some QThread cleanup and fix in Socket 2015-08-31 11:30:31 -07:00
Stephen Birarda
181c8a8b65 handle packet probe when no data available 2015-08-31 10:48:45 -07:00
Ryan Huffman
fc80745c08 Update message handling to use insertion sort 2015-08-30 20:03:15 -07:00
Seth Alves
64d0ce47f3 attempting to stitch polyvox entites together 2015-08-30 09:59:33 -07:00
Stephen Birarda
7937101a58 fix define for UDT_CONNECTION_DEBUG 2015-08-29 14:44:18 -07:00
Stephen Birarda
b81f996366 add network logging to SendQueue, fix ctor order 2015-08-29 14:38:07 -07:00
Stephen Birarda
e67a3e8541 use define to hide verbose connection debugging 2015-08-29 14:36:46 -07:00
Stephen Birarda
2b0b883db2 remove debug for writeReliablePacket invoke 2015-08-29 14:28:50 -07:00
Stephen Birarda
71ff855d86 add connection cleanup that respects send/receive 2015-08-29 14:28:24 -07:00
Stephen Birarda
d16894d2c5 Merge branch 'protocol' of github.com:birarda/hifi into atp 2015-08-28 16:41:49 -07:00
Stephen Birarda
441a5d34bf don't go inactive in sync 2015-08-28 16:36:07 -07:00
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
Atlante45
bcf3fceadc Typo 2015-08-28 22:10:54 +02:00
Atlante45
729fd96539 Fix bug where _requestLimit is stuck at 0 2015-08-28 22:10:33 +02:00
Stephen Birarda
b9d1f39c65 remove include in SendQueue that is unneeded 2015-08-28 12:36:48 -07:00
Atlante45
a448eb9109 Fix Asset Upload popup 2015-08-28 20:35:39 +02:00
Atlante45
993217491f Retry to load only on timeout 2015-08-28 20:35:39 +02: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
Ryan Huffman
c6d98f3c67 Update ResourceCache to retry an asset request when the node is unavailable 2015-08-28 10:59:38 -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
Sam Gateau
8ea8eea08d Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-08-28 08:13:10 -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
Stephen Birarda
1da9eeab1f handle double handshake in Connection 2015-08-27 14:27:29 -07:00
Stephen Birarda
86a7a42d24 use compact hash representation for asset-server 2015-08-27 14:22:21 -07:00
Ryan Huffman
4fcfd5b8f8 Fix indentation 2015-08-27 13:58:28 -07:00
Ryan Huffman
b401a62d7f Disable request limiting for ATP requests in ResourceCache 2015-08-27 13:58:17 -07:00
Ryan Huffman
33d6f561eb Reintroduce request limit in ResourceCache 2015-08-27 12:52:11 -07:00
Ryan Huffman
b30a008162 Fix bug with NetworkTexture occasionally breaking on assert 2015-08-27 12:48:55 -07:00
Stephen Birarda
f3797964e2 resolve conflicts on merge with huffman/atp-server 2015-08-27 12:21:15 -07:00
Stephen Birarda
16eee10cab repairs to permission error for asset-server upload 2015-08-27 12:13:20 -07:00
Stephen Birarda
c212ef5734 fix PacketReceiver cleanup, return permission error for upload 2015-08-27 12:01:24 -07:00
Ryan Huffman
a49a1eb0d6 Add extension to atp requests 2015-08-27 11:51:45 -07:00
Stephen Birarda
f92ee597e5 fix width of asset upload dialog to fit ATP url 2015-08-27 11:32:03 -07:00
Brad Hefta-Gaub
7b2f944f48 Merge pull request #5561 from ericrius1/particleExtensions 
Extended Particle entity to allow for more varied effects
 2015-08-27 10:45:03 -07:00
Stephen Birarda
0f4a4b5cc1 resolve conflicts on merge with huffman/atp-server 2015-08-27 10:30:56 -07:00
Ryan Huffman
c6493b1720 Remove extension from hash in AssetResourceRequest 2015-08-27 10:27:12 -07:00
Stephen Birarda
513cae0d40 thread the AssetUpload so it doesn't take over main 2015-08-27 10:23:02 -07:00
Sam Gateau
4f7b857130 Merge 2015-08-27 10:01:39 -07:00
Ryan Huffman
667db200c0 Cleanup BatchLoader 2015-08-27 09:39:12 -07:00
Ryan Huffman
8765329a46 Add ASSET_TOO_LARGE to AssetUtils 2015-08-27 09:32:39 -07:00
Ryan Huffman
92dbe9997c Clean up AssetRequest 2015-08-27 09:31:50 -07:00
Ryan Huffman
15854c6715 Make AssetClient methods private 2015-08-27 09:31:34 -07:00
Ryan Huffman
b72e7e356d Clean up AssertClient 2015-08-27 09:31:17 -07:00
Stephen Birarda
c277584f2e Merge branch 'atp-server' of https://github.com/huffman/hifi into asset-upload 2015-08-27 09:17:25 -07:00
Ryan Huffman
c2fcf5865a Update log message for uploading assets 2015-08-26 16:02:47 -07:00
Ryan Huffman
d66c521200 Move SendAssetTask to separate file 2015-08-26 15:37:23 -07:00
Stephen Birarda
0450e84008 Merge branch 'atp-server' of https://github.com/huffman/hifi into asset-upload 2015-08-26 15:30:25 -07:00
Stephen Birarda
9e286666b5 add UDT to comment for Connection cleanup 2015-08-26 14:55:59 -07:00
Stephen Birarda
c340c34b38 add comments for PacketReceiver TODOs 2015-08-26 14:53:05 -07:00
Stephen Birarda
d3b19f36fd don't use remove_if since it can't be used on associative 2015-08-26 14:43:09 -07:00
Stephen Birarda
4039c2e3e0 fix for asset-server naming, deadlock in timeout/wait 2015-08-26 14:27:12 -07:00
Ryan Huffman
2e585256ff Update asset hash to Sha256 2015-08-26 14:20:24 -07:00
Ryan Huffman
269d5bb6da Resolve bugs with *Cache changes 2015-08-26 14:04:55 -07:00
Stephen Birarda
352f3543c3 resolve conflicts on merge with ds-cleanup 2015-08-26 13:33:50 -07:00
Stephen Birarda
f16e0a63ee add a string for asset-server node type 2015-08-26 13:29:40 -07:00
Stephen Birarda
d039930ca3 resolve conflicts on merge with clement/protocol 2015-08-26 12:50:13 -07:00
Stephen Birarda
413c3a4fd7 Merge branch 'handshake' into asset-upload 2015-08-26 12:45:00 -07:00
Stephen Birarda
dc1f726283 don't assign the asset-server in domain by default 2015-08-26 12:36:48 -07:00
Ryan Huffman
aa7d8678e1 Merge branch 'protocol' of github.com:birarda/hifi into atp-server 2015-08-26 12:26:11 -07:00
Atlante45
5b5dc94335 Make DoubleLock thread-safe but not self-unlocked 2015-08-26 20:03:04 +02:00
Atlante45
b1fa12cc43 Better debug message 2015-08-26 19:38:24 +02:00
Atlante45
cd8d6df287 Use high_resolution_clock instead of clock 2015-08-26 19:36:18 +02:00
Atlante45
7a5ed24485 typo (I can't spell inactive correctly) 2015-08-26 19:31:33 +02:00
Stephen Birarda
3a918eedca resolve conflicts on merge with upstream master 2015-08-26 10:01:24 -07:00
Ryan Huffman
c878eb0cd9 Fix atomics not being initialized in SendQueue 2015-08-26 09:31:03 -07:00
Ryan Huffman
868558b4f0 Add registration of QSharedPointer<NLPacketList> meta type 2015-08-26 09:29:46 -07:00
Ryan Huffman
24faab2089 Add sendPacketList that take Node 2015-08-26 09:29:15 -07:00
Atlante45
3184dee10a Emit queueInnactive when flow window is full for too long 2015-08-26 17:49:17 +02:00
Atlante45
8049819beb Tweak DoubleLock 2015-08-26 17:11:32 +02:00
Atlante45
179ee73e26 Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol 2015-08-26 16:50:33 +02:00
Atlante45
6958a31efe Merge branch 'master' of https://github.com/highfidelity/hifi into protocol 2015-08-26 16:37:45 +02:00
Atlante45
c96632d4b6 Cleanup connection on node kills 2015-08-26 16:07:47 +02:00
Atlante45
373d4b8944 Remove connection from socket when innactive 
If innactive for more than 5 seconds, remove it from hash
 2015-08-26 15:53:49 +02:00
Atlante45
00b224e769 Merge branch 'protocol' of https://github.com/birarda/hifi into protocol 2015-08-26 14:57:31 +02:00
Clément Brisset
2745cc5d12 Merge pull request #15 from birarda/wait-condition 
add a wait condition in SendQueue if there's nothing to do
 2015-08-26 14:57:16 +02:00
Sam Gateau
1e9fce2a61 Drafting the materials for FBXReader 2015-08-25 22:12:51 -07:00
Stephen Birarda
d5e77ba907 clear the pending received messages on handshake receive 2015-08-25 18:26:30 -07:00
Stephen Birarda
54f2dc54f6 add a condition_variable wait_until to not lock for handshake 2015-08-25 18:23:50 -07:00
Stephen Birarda
0ce8e05f19 reset the receiver's state on handshake 2015-08-25 18:01:37 -07:00
Stephen Birarda
82f5e2e04f skip processing of control packets before handshake 2015-08-25 17:26:25 -07:00
Stephen Birarda
83d76084f1 don't process packets in Connection without handshake 2015-08-25 17:14:41 -07:00
Stephen Birarda
cabdee8391 send a handshake before first packet send 2015-08-25 17:12:03 -07:00
Ryan Huffman
0bfa0c4942 Add progress to AssetResourceRequest 2015-08-25 16:35:41 -07:00
Ryan Huffman
0e98b179dd Update Asset gettings and uploading in AssetClient 2015-08-25 16:34:44 -07:00
Ryan Huffman
12b2dfb2f9 Clean up HTTPResourceRequest 2015-08-25 15:45:00 -07:00
Ryan Huffman
3eff605d72 Update asset server number 2015-08-25 15:44:37 -07:00
Ryan Huffman
1e6ff8a1e4 Merge branch 'protocol' of github.com:birarda/hifi into atp-server 2015-08-25 15:25:52 -07:00
Ryan Huffman
3959928bbb Update ResourceRequest::moveData to getData 2015-08-25 15:20:00 -07:00
Ryan Huffman
2efba00e3e Update BasePacket::read to do a copy 2015-08-25 15:19:07 -07:00
Ryan Huffman
6bba2f4cb1 Update Packet to properly copy packet position and message number 2015-08-25 15:18:40 -07:00
Ryan Huffman
c1b9613a30 Update PacketList::writeData() to be non-recursive 2015-08-25 14:58:56 -07:00
Atlante45
1878920ba4 Merge branch 'protocol' of https://github.com/birarda/hifi into protocol 2015-08-25 21:43:37 +02:00
Stephen Birarda
61507bde09 fix order of member initialization in PacketList 2015-08-25 11:24:26 -07:00
Stephen Birarda
9ff7bfd0b5 some header cleanup in UDTTest output 2015-08-25 11:21:04 -07:00
Stephen Birarda
5e5bd77870 add initialization for all atomics in SendQueue 2015-08-25 09:55:21 -07:00
Stephen Birarda
c8ba24817f fix for hash specialization for QUuid 2015-08-24 17:09:52 -07:00
Stephen Birarda
f7799bcf8f add TODO for settings fail, cleanup 2015-08-24 17:02:47 -07:00
Stephen Birarda
e84595af49 add a wait condition for empty queue and loss list 2015-08-24 17:02:40 -07:00
Stephen Birarda
e8772277de de-bloat the domain-server by adding a DomainGatekeeper 2015-08-24 14:19:33 -07:00
Ryan Huffman
4191ccd60d Move *ResourceRequest objects to separate files 2015-08-24 12:16:20 -07:00
ericrius1
13892db866 removed logging 2015-08-24 11:41:03 -07:00
Atlante45
f802f354ca prefer scoped locker to unlocks 2015-08-21 15:36:03 +02:00
Anthony J. Thibault
1b3d7fabc8 ResourceCache, NetworkGeometry and Model refactoring and optimizations. 
* Removed validation logic from Resource class, Qt does this internally and is more
  standards compliant.  This should result in more accurate caching and faster resource
  fetching when cache is stale and validation fails.
* Added loaded and failed slots to Resource class, so it does not have to be polled.

* NetworkGeometry now uses multiple Resource objects to download
  the fst/mapping file and the fbx/obj models.
* NetworkGeometry is no longer a subclass of Resource
* NetworkGeometry now has signals for success and failure, you no longer
  have to poll it to determine when loading is complete (except for textures *sigh*)

Some functionality was removed

* NetworkGeometry no longer has a fallback
* NetworkGeometry no longer loads LODs or has lod logic.
* The number of FBXGeometry copies is greatly reduced.

* Model::setURL no supports fallback URL, delayLoad or retainCurrent option.
  This can result in a pop when switching avatars, and there's no longer a default
  if avatar loading fails.
 2015-08-20 18:59:51 -07:00
Stephen Birarda
1756e60647 complete test for ordered packets in udt-test target 2015-08-20 14:22:05 -07:00
Ryan Huffman
0a290da529 Merge branch 'ordered-sending' into atp-server 2015-08-20 11:50:06 -07:00
Stephen Birarda
74d6e5ba89 make sure LNL goes down before domain-server 2015-08-20 10:01:12 -07:00
Ryan Huffman
bb15811f6b Merge remote-tracking branch 'clement/protocol' into ordered-sending 2015-08-20 09:14:04 -07:00
Atlante45
f6854782a4 Debug/Lock cleanup 2015-08-20 14:57:35 +02:00
Atlante45
62c76d0332 registerListenerForTypes optimisations 2015-08-20 14:56:35 +02:00
Andrew Meadows
5a442bdb30 Merge pull request #5555 from ZappoMan/centerOrigin 
Make domains 8x larger (2x in each dimension), with origin at center of buildable space
 2015-08-19 15:59:04 -07:00
Stephen Birarda
6860f3d126 add readWithoutCopy for clarity in Packet read 2015-08-19 14:32:26 -07:00
Ryan Huffman
5884fcb17b Merge branch 'ordered-sending' into atp-server 2015-08-19 12:23:31 -07:00
Ryan Huffman
7305135125 Update ResourceManager 2015-08-19 12:16:34 -07:00
Ryan Huffman
4827d326f4 Update ResourceCache to allow multiple downloads on the same resource 2015-08-19 12:11:47 -07:00
Ryan Huffman
d18ce5066f Fix error with Assignment::Type not being hashable 2015-08-19 11:55:06 -07:00
Ryan Huffman
121d3a77ad Fix iterator usage in SendQueue 2015-08-19 11:27:31 -07:00
Ryan Huffman
fc29297d87 Update SendQueue::queuePacketList to use splice 2015-08-19 10:55:26 -07:00
Ryan Huffman
df51069305 Rename getAllData to getMessage 2015-08-19 10:39:19 -07:00
Ryan Huffman
ebf112e200 Replace NLPacketList::getSourceID() with const& return 2015-08-19 10:03:52 -07:00
Ryan Huffman
5ba3280975 Remove <list> include in NLPacketList 2015-08-19 10:01:16 -07:00
Ryan Huffman
f2b4c0e269 Merge listener signatures into intializer list in PacketListener 2015-08-19 09:03:31 -07:00
Ryan Huffman
f5aac5f086 Remove unused include 2015-08-19 09:02:17 -07:00
Ryan Huffman
3c5483a008 Fix style issue with const 2015-08-19 08:59:05 -07:00
Ryan Huffman
10cd315a10 Fix QMutexLocker in PacketReceiver 2015-08-19 08:58:53 -07:00
Ryan Huffman
c6a8ccd490 Replace usage of qDebug with qCDebug in PacketReceiver 2015-08-19 08:56:48 -07:00
Ryan Huffman
cda0aaf7cf Update PacketReceiver to use scoped locks 2015-08-19 08:54:24 -07:00
Ryan Huffman
92dadb437c Replace magic number '30' for number of bits in message number 2015-08-18 23:15:47 -07:00
Ryan Huffman
97bb36add4 Add constant for message line size 2015-08-18 23:11:47 -07:00
Ryan Huffman
63d0205d1e Move domain settings retrieval to UDT 2015-08-18 23:11:33 -07:00
Ryan Huffman
62eaaed9e5 Add PacketList support to LimitedNodeList 2015-08-18 23:10:05 -07:00
Ryan Huffman
0b3986ef9b Replace NLPacket unique_ptr ctor with && ctor 2015-08-18 23:09:02 -07:00
Ryan Huffman
9154067cfb Add PacketList interface to PacketReceiver 2015-08-18 23:08:25 -07:00
Ryan Huffman
69a2d0b5b0 Add 32-bit message data to packet header 2015-08-18 23:07:54 -07:00
Ryan Huffman
46d5f73e4e Add support for creating NLPacketList from PacketList 2015-08-18 23:07:08 -07:00
Ryan Huffman
8032f05ed6 Add support for generating PacketList from received data 2015-08-18 23:06:30 -07:00
Ryan Huffman
5cb028cf43 Add support for PacketList to SendQueue 2015-08-18 23:05:07 -07:00
Ryan Huffman
9c65849037 Add ordered sending to Socket and Connection 2015-08-18 23:04:32 -07:00
Stephen Birarda
e4c1de7845 fix variable names for sourced/verified 2015-08-18 17:15:09 -07:00
Stephen Birarda
bd56a5074d inline a curly bracket after template 2015-08-18 12:10:05 -07:00
Stephen Birarda
a58c6b9320 remove CC close given that it is not called 2015-08-18 12:09:28 -07:00
Stephen Birarda
bc7d8d7029 change UDT note comment 2015-08-18 12:06:45 -07:00
Stephen Birarda
23c6e8bd45 fixes for packet version bumps 2015-08-18 12:03:49 -07:00
Stephen Birarda
fd43c48eac resolve conflicts on merge with birarda/protocol 2015-08-18 11:48:36 -07:00
Stephen Birarda
0f77ab8611 resolve conflicts on merge with upstream/master 2015-08-18 11:45:55 -07:00
Stephen Birarda
1c3543febc use string style hashing for IPv6 addresses 2015-08-18 11:39:04 -07:00
Stephen Birarda
bf919f105a add a simple container-test, speed HifiSockAddr hashing 2015-08-18 11:29:07 -07:00
Stephen Birarda
b7d779bb25 put back branching for signed Type 2015-08-18 09:56:00 -07:00
Stephen Birarda
426a8909e1 wait on the SendQueue thread in Connection 2015-08-18 09:40:13 -07:00
Stephen Birarda
4e540828bd use mod in place of branching for SequenceNumber 2015-08-18 09:33:22 -07:00
Stephen Birarda
f039851f13 remove std namespacing from Connection 2015-08-17 16:57:42 -07:00
Stephen Birarda
75e7de3019 remove getConnectionSockAddrs vector move 2015-08-17 16:49:08 -07:00
Stephen Birarda
d9f445d5f6 put custom hashing for UUID in UUIDHasher 2015-08-17 16:45:15 -07:00
Stephen Birarda
abf07dc06d move hasher for UUID to UUID.h 2015-08-17 16:39:52 -07:00
Stephen Birarda
2ec4d8ff3c rename return of HifiSockAddr objects for connections 2015-08-17 16:39:12 -07:00
Stephen Birarda
d89c54112d cleanup indentation in Socket 2015-08-17 16:35:23 -07:00
Stephen Birarda
fe100695f0 rename dest to destination for SendQueue 2015-08-17 16:29:21 -07:00
Stephen Birarda
feddb613e2 add comments, use scoped locker in SendQueue 2015-08-17 16:28:33 -07:00
Stephen Birarda
1c176e55ed add some comments to PacketTimeWindow 2015-08-17 16:13:14 -07:00
Stephen Birarda
71b2d90c64 clarify comment in LossList header 2015-08-17 16:08:34 -07:00
Stephen Birarda
bc6846e08c fix a typo in Connection header 2015-08-17 16:07:55 -07:00
Stephen Birarda
8c22627f32 fix a typo in comment 2015-08-17 16:07:29 -07:00
Stephen Birarda
ec82e65aec comment flow window size changes for light ACK 2015-08-17 16:07:07 -07:00
Stephen Birarda
42b5b37b96 force timeout NAK to fit MTU 2015-08-17 15:47:43 -07:00
ZappoMan
014bf661fa bump packet version 2015-08-17 11:18:25 -07:00
Eric Levin
ec25d7994c bumped protocol number for new particle properties 2015-08-14 21:58:22 -07:00
ZappoMan
44fcf71f07 change domain to be 32k and still have origin centered at 0 2015-08-14 15:26:49 -07:00
ZappoMan
5fdd7304aa Merge branch 'master' of https://github.com/highfidelity/hifi into centerOrigin 2015-08-14 09:33:53 -07:00
Leonardo Murillo
b345d75e4d More cleanup and showing version in ds web gui 2015-08-13 16:44:28 -06:00
Leonardo Murillo
7c4813f1cf Another versioning checkpoint + cleanup 2015-08-13 16:35:55 -06:00
Leonardo Murillo
cda5b29fd3 Another take at versioning details exchange - checkpoint 2015-08-13 14:19:13 -06:00
Howard Stearns
daae750d68 No symbolic names for non-entity contants. 2015-08-12 16:40:00 -07:00
ZappoMan
85603dab29 bump entity packet version 2015-08-11 23:51:07 -07:00
ZappoMan
4fe8f49d4c move origin to center of domain 2015-08-11 23:47:40 -07:00
Howard Stearns
a5d8125aa7 Remove obsolete AvatarMixer wire data. (Was duplicated in joint states that are also sent.) 2015-08-11 17:53:49 -07:00
Seth Alves
7403929323 missed this in the last commit -- bump protocol version 2015-08-10 15:15:54 -07:00
ericrius1
59d5f61af4 incremented protocol number 2015-08-10 14:20:46 -07:00
ericrius1
0f7c21ddd7 rearranged entity props and added check in setNormals to avoid uninitialized binormal values 2015-08-10 11:55:47 -07:00
Stephen Birarda
d9254aa2e9 remove comment that won't come into play until ordering 2015-08-10 10:14:50 -07:00
Stephen Birarda
eb17ddc04f fix capitalization of RTO for CongestionControl 2015-08-10 10:13:53 -07:00
Stephen Birarda
6d9504935d add a comment for onTimeout in CongestionControl 2015-08-10 10:12:24 -07:00
Stephen Birarda
04c1d154ab fix header size for NLPacket writeTypeAndVersion 2015-08-10 10:10:43 -07:00
Stephen Birarda
9ac760aed6 use c++11 number randomization for NAK 2015-08-10 09:59:34 -07:00
Stephen Birarda
5d7dac9b8e do DefaultCC setup in constructor 2015-08-07 17:33:33 -07:00
ericrius1
4fbd6f6337 removed old PacketHeaders.h file, updated udt version 2015-08-07 16:42:10 -07:00
ericrius1
6a4e2728ee deleted old packet headers file 2015-08-07 16:29:57 -07:00
Seth Alves
0a5ed0eb9b Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-07 13:50:22 -07:00
ericrius1
3910cb0d69 Merge branch 'master' into polyLineInProgress 2015-08-07 10:12:02 -07:00
Stephen Birarda
cf277dca33 resolve conflicts on merge with birarda/protocol 2015-08-06 10:23:43 -07:00
bwent
ffccc9ca96 clean up formatting, make connectionUUID const in NodeList 2015-08-06 10:11:22 -07:00
bwent
a8f9f9d746 clean-up formatting 2015-08-05 17:43:03 -07:00
bwent
ab2b54a6b2 Add connection token to sign with username when connecting to domain-server 2015-08-05 15:33:59 -07:00
bwent
8868148c94 Parital fix for padding error using RSA_sign and RSA_verify 2015-08-05 14:07:25 -07:00
Stephen Birarda
052978898e resolve conflicts on merge with upstream master 2015-08-05 11:16:20 -07:00
bwent
60fdc390c5 fix username signature not const 2015-08-05 10:42:10 -07:00
bwent
fc385d9bc1 debugging 2015-08-05 10:29:30 -07:00
Stephen Birarda
7b8ca2c0f2 fix suppression of link saturation messages 2015-08-04 16:29:53 -07:00
Stephen Birarda
23e1ee71cc suppress writeDatagram errors for saturated links 2015-08-04 16:18:12 -07:00
Seth Alves
b318c1122c Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-04 16:00:27 -07:00
Atlante45
01749ad0de TimeoutNAK fixes 2015-08-04 15:07:04 -07:00
Stephen Birarda
925cb4bd56 fix for slow start algo on loss 2015-08-04 12:48:58 -07:00
Stephen Birarda
3d0c71d95c remove a double on arrival time record 2015-08-04 12:29:22 -07:00
bwent
54dd5da64c To debug RSA padding error 2015-08-04 12:02:23 -07:00
bwent
af293ec6dd Fix DomainServerConnectionTOken packet writing/resetting 2015-08-04 12:02:23 -07:00
bwent
244cc016ab Generate session token UUIDs to be signed with username 2015-08-04 12:02:23 -07:00
Stephen Birarda
a10746a448 set the max window size, correct a typo 2015-08-03 19:12:39 -07:00
Atlante45
40520c204f Stats improvement 2015-08-03 17:39:09 -07:00
Atlante45
99fcb08fd1 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-08-03 17:15:12 -07:00
Atlante45
c0852f0eb2 Remove call to has pending datagrams 2015-08-03 17:14:42 -07:00
Ryan Huffman
027adf73bb Merge branch 'master' of github.com:highfidelity/hifi into asset-server 2015-08-03 16:41:24 -07:00
Ryan Huffman
a6665612fc Add GetInfo packets to AssetClient 2015-08-03 16:30:22 -07:00
Ryan Huffman
6b83948849 Add new packet headers 2015-08-03 16:28:04 -07:00
Ryan Huffman
3843e642e5 Move shared Asset code to AssetUtils.h 2015-08-03 16:27:17 -07:00
Ryan Huffman
ccc0000fd0 Update ResourceCache to use ResourceRequest 2015-08-03 16:26:16 -07:00
Ryan Huffman
86c82a2b2d Add generalized ResourceRequest 2015-08-03 16:24:11 -07:00
Ryan Huffman
260404f1fb Add AssetRequest 2015-08-03 16:23:57 -07:00
Stephen Birarda
36a0ef50d4 add assert for BasePacket write, fix time in Connection 2015-08-03 16:21:17 -07:00
Stephen Birarda
acd7a7a732 fix send/process for ACK packets 2015-08-03 16:04:08 -07:00
Stephen Birarda
b5ec02bd01 go back to previous PacketTimeWindow code 2015-08-03 15:36:08 -07:00
Stephen Birarda
d937cf1cc7 set RTT on congestion control in ctor 2015-08-03 15:05:41 -07:00
Atlante45
8704f05812 Added UDTTest server stats 2015-08-03 14:40:18 -07:00
Atlante45
a1bd558d71 Safe locks 2015-08-03 14:39:51 -07:00
Atlante45
7bfc9f7fd1 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-08-03 14:34:54 -07:00
Stephen Birarda
20f33b3b64 fix sendqueue sleep timing to use microseconds 2015-08-03 14:34:12 -07:00
Atlante45
f2b6db584a Fix list insert 2015-08-03 13:36:38 -07:00
Atlante45
efb04fac21 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-08-03 12:12:45 -07:00
Atlante45
00ab4a58f3 Fix LossList::insert 2015-08-03 12:12:21 -07:00
Stephen Birarda
62d4467f41 use a vector for events in ConnectionStats 2015-08-03 12:09:25 -07:00
Atlante45
e182bbbc1b Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-08-03 11:08:22 -07:00
Atlante45
de8f730f78 Fix connection stats error 2015-08-03 11:07:58 -07:00
Atlante45
f513a28953 Added better assert in LossList 2015-08-03 11:06:57 -07:00
Stephen Birarda
ffb5fcee7b use nth element for median in PacketTimeWindow 2015-08-03 10:25:40 -07:00
ericrius1
f50c482451 Merge branch 'master' into polyLineInProgress 2015-08-03 08:46:01 -07:00
ericrius1
47bc8f50ab cleaning 2015-08-03 08:45:14 -07:00
Stephen Birarda
bc5ddd3837 send a light ACK every 64, not each after 64 2015-07-31 20:12:48 -07:00
Stephen Birarda
0c44fc53de fix for process of timeout NAKs 2015-07-31 19:45:43 -07:00
Stephen Birarda
7f8c993bd7 make send rate actually send rate, don't sync as sender 2015-07-31 19:42:27 -07:00
Stephen Birarda
74a2d985eb tell the send queue about ACKs on light ACK 2015-07-31 19:17:02 -07:00
Stephen Birarda
3833623cfe fix assert for control packet type 2015-07-31 18:41:46 -07:00
Atlante45
29b3051aeb Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-31 18:39:52 -07:00
Atlante45
ca342fb3b4 Fix std::find_if 2015-07-31 18:39:24 -07:00
Stephen Birarda
8bc94454b4 pre-increment the _currentACKSubSequenceNumber 2015-07-31 18:39:09 -07:00
Atlante45
8f54cd6f7e Fix find_if_not 2015-07-31 18:19:15 -07:00
Stephen Birarda
e74f47b64c use a list of pairs of pairs for ACK2 2015-07-31 18:13:11 -07:00
Atlante45
9537aea5c0 Fix nak timeout packet size 2015-07-31 17:31:30 -07:00
Stephen Birarda
41c6220731 resolve conflicts on merge with upstream/master 2015-07-31 17:27:23 -07:00
Stephen Birarda
ea5da73683 Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-31 17:19:23 -07:00
Stephen Birarda
df1e97c591 cleanup RTT stats, add assert for CT 2015-07-31 17:19:14 -07:00
Atlante45
2946cb7ed5 Collapse ControlPacket ctors 2015-07-31 17:15:10 -07:00
Stephen Birarda
0e3403833d make capacitySpeedDelta a double 2015-07-31 17:00:53 -07:00
Atlante45
cba51ac63d Fix congestion control 2015-07-31 16:53:43 -07:00
Stephen Birarda
15ce9aabc5 don't assert on moved CC 2015-07-31 16:52:59 -07:00
Stephen Birarda
fa6628e7eb make sure we init CongestionControl 2015-07-31 16:52:09 -07:00
Stephen Birarda
84b8fc9f06 fix casing of onACK method in CC 2015-07-31 16:41:22 -07:00
Stephen Birarda
9b6c8bcf77 update EWMA for delivery rate and bandwidth 2015-07-31 16:37:38 -07:00
Stephen Birarda
2db540ffde fix for double in PacketTimeWindow 2015-07-31 16:35:42 -07:00
Stephen Birarda
681c9afe90 add parens to PacketTimeWindow division 2015-07-31 16:31:42 -07:00
Stephen Birarda
e39611dc1c fix for PacketTimeWindow calculations 2015-07-31 16:31:08 -07:00
Atlante45
f9c8f30083 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-31 16:16:06 -07:00
Atlante45
7083d84372 Fix ack timestamps 2015-07-31 16:15:21 -07:00
Stephen Birarda
d420bca88e fix for ACK2 sending, output prettier stats 2015-07-31 16:14:33 -07:00
Atlante45
c5b92d319f Update stats gathering 2015-07-31 16:14:19 -07:00
Atlante45
ed614521fd Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-31 15:12:15 -07:00
Atlante45
fcec53bdce Fix sequence number crash 2015-07-31 15:09:58 -07:00
Stephen Birarda
ce21204151 add output of connection stats in UDTTest 2015-07-31 15:09:30 -07:00
Stephen Birarda
b0afdb21ad correct the unique_ptr char allocations 2015-07-31 14:29:05 -07:00
Atlante45
06bbb7c4f1 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-31 11:00:22 -07:00
Atlante45
354621b33c Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-31 11:00:04 -07:00
Stephen Birarda
e346dbcfee seqlen fix in SendQueue 2015-07-31 10:59:06 -07:00
Stephen Birarda
ee9ae9ceec fix for vector initialization in PacketTimeWindow 2015-07-31 10:51:17 -07:00
Atlante45
9ef5f87aed Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-31 10:47:10 -07:00
Stephen Birarda
50c0b59ba2 handle priority of re-transmission of loss 2015-07-31 10:46:52 -07:00
Atlante45
b437f3bca9 Made connection hash hold unique ptr 2015-07-31 10:42:43 -07:00
Atlante45
da7a8f6e2f Added new connection stats 2015-07-31 10:41:16 -07:00
Atlante45
4f8f9903c2 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-31 10:18:42 -07:00
Stephen Birarda
98a53cbd72 don't require a sendQueue for control packet sending 2015-07-31 09:56:50 -07:00
Stephen Birarda
f2ab2fb08a start with a congestion window of 16, not 25 grand 2015-07-31 09:36:55 -07:00
Stephen Birarda
c2d39f0f6a make packet send period update respect max bandwidth 2015-07-31 09:02:43 -07:00
Stephen Birarda
0ea1bb578f support max bandwidth in congestion control 2015-07-31 08:57:25 -07:00
Atlante45
d7713d7aec Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-30 18:22:52 -07:00
Stephen Birarda
6c4a36fb7f lock then check size 2015-07-30 18:22:43 -07:00
Atlante45
e81e1c42b0 Add send queue getter 2015-07-30 18:22:27 -07:00
Atlante45
421d3c4123 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-30 18:17:27 -07:00
Stephen Birarda
036cb8859d Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-30 18:14:59 -07:00
Stephen Birarda
98385ce8cd default sequence numbers to 0 2015-07-30 18:14:54 -07:00
Atlante45
a714f8081d Fix a couple networking bugs 2015-07-30 18:10:59 -07:00
Stephen Birarda
a38e7b0431 cleanup SendQueue start and UDTTest bind 2015-07-30 17:59:27 -07:00
Stephen Birarda
8e786cb953 repairs while testing with UDTTest 2015-07-30 17:40:51 -07:00
Stephen Birarda
91355a5396 Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-30 17:20:27 -07:00
Stephen Birarda
367fa7b07b fixes for assert in Connection and ControlPacket create 2015-07-30 17:20:22 -07:00
Stephen Birarda
1724e3c632 fix a couple of bugs in SendQueue 2015-07-30 17:17:03 -07:00
Stephen Birarda
0f1d1a16a7 actually call sendReliablePacket for write of reliable 2015-07-30 17:12:44 -07:00
Stephen Birarda
d340515ab3 complete the initial version of UDTTest 2015-07-30 17:09:25 -07:00
Atlante45
bcff9730f6 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-30 15:58:28 -07:00
Atlante45
e8ffe96232 Remove const_cast 2015-07-30 15:58:05 -07:00
Atlante45
3a9aedea68 Fix packet ctors size param 2015-07-30 15:56:42 -07:00
Stephen Birarda
4529eea5f8 Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-30 15:23:40 -07:00
Atlante45
784cc880a7 Fix Packet ctor 2015-07-30 15:15:51 -07:00
Stephen Birarda
8e55655ec3 call setSystemBufferSizes once bound 2015-07-30 15:07:49 -07:00
Atlante45
9e7644ee78 Change headers/payload size computation 2015-07-30 15:05:51 -07:00
Stephen Birarda
3f0eecc599 actually change the system socket buffer size 2015-07-30 15:04:48 -07:00
Seth Alves
52ee9526ce add 3 new texture-url properties for polyvox 2015-07-30 13:20:19 -07:00
Stephen Birarda
e7f5bec3d0 take out the incorrect attempt to cast for bitwise 2015-07-30 10:30:14 -07:00
Stephen Birarda
57025cff74 fix packet pair sending from SendQueue 2015-07-30 10:20:09 -07:00
Atlante45
3d523552f8 Cast buffer ptr before bitwise op 2015-07-30 01:02:53 -07:00
Atlante45
da480bcaf0 Fix ControlPackets read/write header 2015-07-29 20:05:15 -07:00
Atlante45
db5e5a4f75 Remove Environment Server 2015-07-29 20:04:29 -07:00
Atlante45
fd11e13eaa Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-29 19:54:01 -07:00
Stephen Birarda
38037664ba don't attempt to send stats while not connected 2015-07-29 17:51:50 -07:00
Stephen Birarda
cb703a9d78 repair two calls to adjust payload start and capacity 2015-07-29 17:43:40 -07:00
Stephen Birarda
50b80c3c20 remove debug for isControl 2015-07-29 17:39:16 -07:00
Atlante45
04ece4459c Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-29 17:37:53 -07:00
Stephen Birarda
7c87ee3a72 type and version fixes after refactor 2015-07-29 17:37:33 -07:00
Atlante45
fe48bfdf95 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-29 17:29:36 -07:00
Atlante45
b8085086c6 HifiSockAddr have object names 2015-07-29 17:28:37 -07:00
Stephen Birarda
66c308b436 actually process control and sequence numbers from Socket 2015-07-29 16:48:14 -07:00
Atlante45
116ff17fcf SendQueue auto thread cleanup 2015-07-29 16:38:37 -07:00
Atlante45
313fcea9fb Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-29 16:25:26 -07:00
Atlante45
ce1fc4baa9 Send light acks based on CC member 2015-07-29 16:24:58 -07:00
Stephen Birarda
35f00f9ba1 rename the CC and send queue updater 2015-07-29 16:12:50 -07:00
Stephen Birarda
5fc3e7dbf1 add an updater that takes a lambda for CC update 2015-07-29 16:12:00 -07:00
Atlante45
96dc033de1 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-29 16:04:23 -07:00
Atlante45
f7f7ff385f Code cleanup 2015-07-29 16:04:13 -07:00
Stephen Birarda
4907418587 update the flow window size for the send queue 2015-07-29 15:53:44 -07:00
Atlante45
8a3c51ef61 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-29 15:45:24 -07:00
Atlante45
785d14f835 Cleanup sendACK 2015-07-29 15:43:44 -07:00
Stephen Birarda
55555cf13e setup default for RTT, RTT variance, _synInterval 2015-07-29 15:28:20 -07:00
Atlante45
5236abe561 Connetion record stats/factored send for control packets 2015-07-29 15:18:42 -07:00
Atlante45
05421aaf8a Added ConnectionStats object for monitoring 2015-07-29 15:17:34 -07:00
Stephen Birarda
85156b9d0f add a constants file for UDT 2015-07-29 15:11:12 -07:00
Atlante45
bb62231ebc Code cleanup 2015-07-29 14:14:28 -07:00
Stephen Birarda
7602c352d6 finish cleanup in CongestionControl 2015-07-29 13:57:05 -07:00
Stephen Birarda
613968f813 remove setACKTimer from CongestionControl 2015-07-29 12:38:54 -07:00
Stephen Birarda
94fd7b428d add some comments to CongestionControl 2015-07-29 12:37:36 -07:00
Atlante45
7bc5e04dac Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-29 12:32:43 -07:00
Atlante45
236c097853 Bit of code cleanup 2015-07-29 12:30:55 -07:00
Stephen Birarda
c35fa6eaae some more cleanup in congestion control 2015-07-29 11:48:00 -07:00
Atlante45
abfe434b30 Synchronise SendQueue and CongestionControl 2015-07-29 11:39:33 -07:00
Atlante45
3704740227 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-29 11:37:30 -07:00
Stephen Birarda
169cb97db5 fix bandwidth and receive rate EWMA in Connection 2015-07-29 11:35:06 -07:00
Atlante45
2031fb86f3 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-29 11:24:50 -07:00
Stephen Birarda
f65472cbc7 use a double USECS_PER_SECOND in CongestionControl 2015-07-29 11:14:03 -07:00
Stephen Birarda
89e32e4a6b some initial cleanup in CongestionControl 2015-07-29 11:11:06 -07:00
Atlante45
2cdaea4e73 Remove LossList::read method and add clear 2015-07-29 11:09:39 -07:00
Stephen Birarda
d344ba5743 add a comment for Connection processTimeoutNAK 2015-07-29 10:56:38 -07:00
Stephen Birarda
94db77155e fix for RTT numerator calculations 2015-07-29 10:55:22 -07:00
Stephen Birarda
7084c12434 make the CongestionControl object take a range for loss 2015-07-29 10:28:59 -07:00
Atlante45
18795321d7 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-28 19:28:03 -07:00
Atlante45
7b3761f07a Implement NAK timeout packets read/write 2015-07-28 19:27:29 -07:00
Stephen Birarda
99f9a4a712 add TODOs for onLoss, handle ACK from packet count 2015-07-28 19:23:38 -07:00
Atlante45
123491ea0b Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-28 18:27:24 -07:00
Atlante45
065353eb6b Fix LossList::insert 2015-07-28 18:27:02 -07:00
Stephen Birarda
b7d80ca435 remove a TODO that is actually done 2015-07-28 18:22:33 -07:00
Stephen Birarda
43e81420bd add a TODO for processTimeoutNAK 2015-07-28 18:21:32 -07:00
Stephen Birarda
3b7d0ab62a make TODO a TODO 2015-07-28 18:21:00 -07:00
Stephen Birarda
e69cc2aae8 pass const ref LossList to CongestionControl 2015-07-28 18:20:37 -07:00
Atlante45
d31c237cc3 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-28 18:13:10 -07:00
Atlante45
b10396a169 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-28 18:13:02 -07:00
Stephen Birarda
dc65a2fe1a use user defined RTO for timeout (if defined) 2015-07-28 18:11:21 -07:00
Atlante45
b5b7fa8504 SendQueue uses LossList 2015-07-28 18:08:02 -07:00
Stephen Birarda
b9b4245dfe NAK interval is in microseconds 2015-07-28 18:05:42 -07:00
Stephen Birarda
cb134f4685 remove onPacketSent and onPacketReceived from CC, use setRTT 2015-07-28 18:04:18 -07:00
Stephen Birarda
0e0968f748 initial support to get CongestionControl down to Connection 2015-07-28 17:58:49 -07:00
Atlante45
5d1c0f6935 Added pop to loss list 2015-07-28 17:56:11 -07:00
Atlante45
1df657c359 Added insert function to LossList 2015-07-28 17:39:05 -07:00
Stephen Birarda
988bd226ca change SendQueue timing to use usleep and std::chrono 2015-07-28 17:16:20 -07:00
Stephen Birarda
05d9845077 add counting of total control packets sent/received 2015-07-28 17:01:13 -07:00
Stephen Birarda
74b0fa7e87 use microseconds for intervals, setup timeout NAKs 2015-07-28 16:43:21 -07:00
Stephen Birarda
09a497a59b add default interval values for PacketTimeWindow 2015-07-28 16:23:10 -07:00
Atlante45
64e1281d47 Restore const, make helper memebers mutable 2015-07-28 16:02:33 -07:00
Stephen Birarda
13568d3d69 add constants for RTT estimation calculations 2015-07-28 15:59:13 -07:00
Stephen Birarda
a49ad92d87 use a constant for the bounds for median filtering 2015-07-28 15:55:18 -07:00
Stephen Birarda
cfba300786 send an unreliable sequence number from Socket 2015-07-28 15:51:50 -07:00
Atlante45
8ebdb6d154 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-28 15:48:55 -07:00
Stephen Birarda
ba226d168d remove SeqNum since it is replaced by SequenceNumber 2015-07-28 15:48:37 -07:00
Atlante45
747f2b0c07 Remove seqcmp declaration 2015-07-28 15:48:35 -07:00
Stephen Birarda
65fa4c4e6d add the periodic rate control packet sending 2015-07-28 15:47:36 -07:00
Atlante45
c2c188c5dd Remove TODO 2015-07-28 15:46:26 -07:00
Atlante45
ffdd54d41f Make sendUnreliable take a non const 2015-07-28 15:42:53 -07:00
Atlante45
121b9738a1 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-28 15:33:42 -07:00
Atlante45
24520c5856 LNL send cleanup / Added connection hash 2015-07-28 15:32:00 -07:00
Stephen Birarda
b0147144cb fix for comment for PacketTimeWindow 2015-07-28 15:25:08 -07:00
Stephen Birarda
cf30426636 add a PacketTimeWindow to estimate bandwidth and report speed 2015-07-28 15:21:17 -07:00
Stephen Birarda
937e46abf2 add path to header for LossList 2015-07-28 14:28:19 -07:00
Stephen Birarda
e3e8219c11 add some comments to help understand the RTT calculation 2015-07-28 14:20:51 -07:00
Atlante45
f53637f19e Added SendQueue::getNextSeqNum 2015-07-28 14:16:09 -07:00
Stephen Birarda
b6bdcadd33 make updateRTT take an int 2015-07-28 14:02:13 -07:00
Atlante45
8a474ac20a Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-28 14:01:21 -07:00
Atlante45
ca99699674 Implement Packet::setSequenceNumber 2015-07-28 14:00:59 -07:00
Stephen Birarda
c17f4b8991 add a missing bracket, comment for processACK 2015-07-28 13:58:21 -07:00
Atlante45
71004ef519 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-28 13:50:15 -07:00
Stephen Birarda
f885fbad8c remove sequence numbers from _naks in SendQueue 2015-07-28 13:49:11 -07:00
Atlante45
f0bb71b519 Change Packet read/write fcts 2015-07-28 13:48:20 -07:00
Stephen Birarda
00fdcf3133 fix a comment that reference SequenceNumber 2015-07-28 13:44:26 -07:00
Stephen Birarda
f45b36c9ec resolve conflicts on merge with clement/protocol 2015-07-28 13:40:50 -07:00
Stephen Birarda
606356cdcf rename SeqNum to SequenceNumber 2015-07-28 13:39:19 -07:00
Stephen Birarda
45f6a984af add a comment to SendQueue ack 2015-07-28 13:28:58 -07:00
Stephen Birarda
a8371cc3ed send the actual sequence number being ACKed 2015-07-28 13:28:01 -07:00
Stephen Birarda
0b8feed327 add a map of sentACKs for ACK2 processing 2015-07-28 13:01:35 -07:00
Stephen Birarda
155d339c2f remove RTT variance that isn't handled 2015-07-28 11:53:40 -07:00
Stephen Birarda
c7ae4d5e59 implement more of processACK in Connection 2015-07-28 11:47:57 -07:00
Atlante45
c3995a6e23 Fix LossList length not cumputed 2015-07-28 11:30:50 -07:00
Atlante45
cc4347ef6e Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-28 10:37:53 -07:00
Atlante45
b25d860be4 Remove seqcmp 2015-07-28 10:36:19 -07:00
Atlante45
8b71462dc1 Remove unnecessary headers 2015-07-28 10:36:00 -07:00
Stephen Birarda
c32c95c707 complete implementation of processLightACK 2015-07-28 10:33:07 -07:00
Stephen Birarda
1c6b14d17c add file path to clement's header 2015-07-28 10:24:56 -07:00
Stephen Birarda
17d8085ab5 add process methods for control packet types 2015-07-28 10:01:38 -07:00
Stephen Birarda
c14fee2ee8 remove initialization of rtt and rttVariance 2015-07-28 09:56:31 -07:00
Stephen Birarda
3efd1be3d6 resolve conflicts for removal of ACK2 process 2015-07-28 09:54:46 -07:00
Atlante45
6577845d3f Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-27 20:45:47 -07:00
Atlante45
89a53886cb Read ACK, NAK control packet 2015-07-27 20:44:12 -07:00
Atlante45
5833cea29d Send out NAK packets 2015-07-27 18:51:17 -07:00
Stephen Birarda
f176c45a61 return an ACK2 from processControl 2015-07-27 17:48:38 -07:00
Atlante45
2ecb445ce9 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-27 17:45:31 -07:00
Atlante45
c4f88a0f53 Added loss list to connections 2015-07-27 17:41:15 -07:00
Stephen Birarda
75765d02e4 correct sizeof ACK_PACKET_PAYLOAD_BYTES in Connection 2015-07-27 17:40:32 -07:00
Stephen Birarda
d2c5e79ac2 add writing of control bit and type to ControlPacket 2015-07-27 17:38:10 -07:00
Stephen Birarda
52411bb8ba pack ACK sub sequence number manually for control 2015-07-27 17:23:39 -07:00
Stephen Birarda
f6fb421bf2 write out more packing of ACK packet in Connection 2015-07-27 17:15:26 -07:00
Stephen Birarda
145f0e1f32 Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-27 16:45:43 -07:00
Stephen Birarda
90d2515674 add methods to send ACKs from Connection 2015-07-27 16:43:49 -07:00
Stephen Birarda
75a722f63c remove a couple of unused variables 2015-07-27 16:12:14 -07:00
Stephen Birarda
d787e08632 fix for rate control sync in Socket 2015-07-27 16:10:52 -07:00
Atlante45
d6487dcb81 Comparaison operators for seq nums 2015-07-27 16:01:07 -07:00
Stephen Birarda
10d6520098 add a TODO message to Socket::rateControlSync 2015-07-27 16:00:00 -07:00
Stephen Birarda
7966dee4fe Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-27 15:59:19 -07:00
Stephen Birarda
50a7ef7c20 remove the ControlSender and perform sync in Socket 2015-07-27 15:59:04 -07:00
Atlante45
2b29f5c130 More work on Connnections 2015-07-27 15:57:41 -07:00
Atlante45
41a0f6b980 Added +/- operator to SeqNum 2015-07-27 14:18:18 -07:00
Stephen Birarda
a31053d450 small spacing change 2015-07-27 13:02:11 -07:00
Stephen Birarda
594b4f4814 fix the shutdown of the ControlSender 2015-07-27 12:25:46 -07:00
Stephen Birarda
b0e7c208ac initial version of the sleeping ControlSender 2015-07-27 12:21:27 -07:00
Atlante45
f520caa5fe Connection class draft 2015-07-27 12:06:27 -07:00
Stephen Birarda
507592b088 add paths to CongestionControl files 2015-07-27 11:40:05 -07:00
Atlante45
6db401f6d3 Foreward declare SeqNum 2015-07-27 11:38:49 -07:00
Stephen Birarda
d0c3274b5f include Packet for udt::Socket 2015-07-27 11:36:09 -07:00
Stephen Birarda
3e8bb371d6 declare BasePacket in Socket 2015-07-27 11:32:17 -07:00
Atlante45
1e766faa88 Remove unecessary headers 2015-07-27 11:29:15 -07:00
Atlante45
f4a9f21869 Use udt instead declaring namespace in cpp 2015-07-27 11:28:48 -07:00
Atlante45
5261d7b4d1 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-27 11:27:49 -07:00
Stephen Birarda
b0d96cdb88 use BasePacket::totalHeadersSize in ControlPacket 2015-07-24 16:43:19 -07:00
Stephen Birarda
65ec50b01f remove an extra space 2015-07-24 16:42:07 -07:00
Stephen Birarda
2cf4a1f3e1 move MAX_PACKET_HEADER_SIZE to NLPacket 2015-07-24 16:29:44 -07:00
Stephen Birarda
f50154551b fix comment for sequence number write 2015-07-24 16:23:35 -07:00
Stephen Birarda
b3d33bc59f copy the ControlPacket type when moving ControlPacket 2015-07-24 16:20:49 -07:00
Stephen Birarda
78688ebaca add construction of QIODevice for BasePacket copy 2015-07-24 16:18:58 -07:00
Stephen Birarda
ff3cca1c20 fix indentation in BasePacket 2015-07-24 16:17:49 -07:00
Stephen Birarda
47a05bd3ec repairs for dead listener checks 2015-07-24 16:17:06 -07:00
Stephen Birarda
f4ade0ee8e remove lastSequenceNumbers from Node 2015-07-24 16:13:05 -07:00
Stephen Birarda
49a18be24b use totalHeadersSize from Packet in NLPacket 2015-07-24 16:11:25 -07:00
Stephen Birarda
ffb1b9cc93 add a message for PacketHeaders 2015-07-24 16:06:05 -07:00
Stephen Birarda
5b0495db8e remove unused methods in PacketHeaders 2015-07-24 16:02:28 -07:00
Stephen Birarda
9c792f00df resolve conflicts on merge with birarda/protocol 2015-07-24 15:57:20 -07:00
Stephen Birarda
d23e5a3970 resolve conflicts on merge with upstream/master 2015-07-24 15:56:17 -07:00
Atlante45
65e15a4dc3 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-24 15:54:59 -07:00
Stephen Birarda
82def6e15f resolve conflicts on merge with upstream/master 2015-07-24 15:40:35 -07:00
Atlante45
f06d21691d Added ACKs removal from sent list 2015-07-24 15:33:42 -07:00
Atlante45
e330727e36 Added NAK resend 2015-07-24 15:24:40 -07:00
Atlante45
da93301ac6 More work on SendQueue (Threading) 2015-07-24 14:33:40 -07:00
Atlante45
797f74f3d9 Use SeqNum 2015-07-24 12:27:40 -07:00
Atlante45
d4504ae6c8 Make SeqNum hash friendly 2015-07-24 12:21:20 -07:00
Stephen Birarda
aea2fed449 add a static to create a packet pair 2015-07-24 11:46:11 -07:00
Stephen Birarda
6dba431084 initial version of the control packet class 2015-07-24 11:38:51 -07:00
Atlante45
beba45c8c5 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-24 10:58:55 -07:00
Stephen Birarda
71557a1846 only output no listener for type message one time 2015-07-24 09:36:27 -07:00
Stephen Birarda
d938f31fab fix for write of sourceID and verificationHash 2015-07-23 17:10:40 -07:00
Stephen Birarda
b68c7fd92a first adjustment in NLPacket after type is known 2015-07-23 16:59:08 -07:00
Stephen Birarda
069dff0793 fix bugs from movement of type/version to NLPacket 2015-07-23 16:40:35 -07:00
Stephen Birarda
2f03075750 repairs to type/version header write 2015-07-23 15:57:31 -07:00
Stephen Birarda
862c788aec move payload adjustments to Packet 2015-07-23 15:27:32 -07:00
Stephen Birarda
df47f1dd0b add a BasePacket class for headerless packets 2015-07-23 15:20:37 -07:00
Ryan Huffman
cf20701275 Update soloNodeOfType to take NodeType_t 2015-07-23 15:14:25 -07:00
Ryan Huffman
0b2e896ea4 Add Asset-related types and packets 2015-07-23 15:13:56 -07:00
Ryan Huffman
ee5a1028f7 Add AssetClient 2015-07-23 15:08:38 -07:00
Atlante45
9a51aef712 Added congestion control base classes 2015-07-23 15:02:34 -07:00
Atlante45
c5901c3f6b Sequence Numbers helper class 2015-07-23 15:00:32 -07:00
Stephen Birarda
e5955e39b7 fix QDebug signature for Node 2015-07-23 14:06:40 -07:00
Stephen Birarda
19d0bf403c change NLPacket create signature for new headers 2015-07-23 14:06:10 -07:00
Stephen Birarda
9e7fb9ae16 shuffle Packet headers, use static enum for PacketType 2015-07-23 13:56:47 -07:00
Stephen Birarda
aa08bee69f initial work to make sequence # and bitfield lead all packets 2015-07-23 11:59:37 -07:00
Atlante45
dce1fc6855 SendQueue first draft 2015-07-23 11:18:52 -07:00
Stephen Birarda
5bed3502ef fix order of ctors and assignment operators 2015-07-22 14:15:17 -07:00
Stephen Birarda
023f3b8134 fix sequence number read in PacketReceiver 2015-07-22 11:34:30 -07:00
Stephen Birarda
4a11bdc22e indentation and spacing fixes 2015-07-22 11:26:28 -07:00
Stephen Birarda
12e684bea1 fix identation for NLPacket move ctor 2015-07-22 11:21:31 -07:00
Stephen Birarda
3fbda89f1d copy version in Packet move ctor/assignment 2015-07-22 11:17:50 -07:00
Stephen Birarda
8bf507dd24 add a sanity check for data NLPacket ctor 2015-07-22 11:06:13 -07:00
Stephen Birarda
1386aa57da repair to NLPacket creation from Packet and char* 2015-07-22 11:02:45 -07:00
Stephen Birarda
fb7130120a another rename to Socket callbacks 2015-07-22 10:16:26 -07:00
Stephen Birarda
7f53eda0d9 naming changes to udt::Socket handlers 2015-07-22 10:01:24 -07:00
Stephen Birarda
240f53ddd2 bunch up the NLPacket constructors 2015-07-22 09:51:13 -07:00
Stephen Birarda
30225ba3c1 fix spacing for multi-line QDebug in PacketReceiver 2015-07-21 13:05:38 -07:00
Stephen Birarda
086e4efe44 verify packet versions at ice-server 2015-07-21 13:03:39 -07:00
Stephen Birarda
4604bc5a3a leverage udt::Socket in ice-server 2015-07-21 12:27:27 -07:00
Stephen Birarda
da761d4c95 fix static methods to handle header read/write 2015-07-21 12:12:15 -07:00
Stephen Birarda
a61c04aa92 allow socket owner to specify unfiltered packets 2015-07-21 12:00:16 -07:00
Stephen Birarda
ed6867e1a0 add a method to LNL to verify packets 2015-07-21 11:47:06 -07:00
Stephen Birarda
3901dbae33 fix for broken move in NLPacket/Packet 2015-07-21 11:06:25 -07:00
Stephen Birarda
a8618ab3d5 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2015-07-21 10:19:12 -07:00
Brad Davis
9016f437a8 Merge pull request #5371 from Atlante45/smart_pointers 
Smart pointers fixes
 2015-07-21 08:52:29 -07:00
Stephen Birarda
cea8e01a01 add a verify packet operator to verify packets 2015-07-20 17:35:16 -07:00
Stephen Birarda
796dfee687 udt namespace fixes and NLPacket operator fixes 2015-07-20 17:28:04 -07:00
Stephen Birarda
9556fecbe2 initial changes to make _nodeSocket a udt::Socket 2015-07-20 17:10:22 -07:00
Stephen Birarda
74193b3dac bump packet versions after fix 2015-07-20 15:20:14 -07:00
Stephen Birarda
0dc62dd858 Merge branch 'protocol' of https://github.com/Atlante45/hifi into protocol 2015-07-20 15:14:40 -07:00
Atlante45
bca8d8181d fix entity data packet type value 2015-07-20 15:14:16 -07:00
Stephen Birarda
5f592df610 don't seek in Packet before open 2015-07-20 15:14:07 -07:00
Atlante45
8d6ff2d9f9 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-20 14:50:44 -07:00
Atlante45
640171d5bd Restore AccountManager setup 2015-07-17 18:22:35 -07:00
Atlante45
052c3c987b Fix some more smart pointer 2015-07-17 18:10:34 -07:00
Atlante45
256c786e28 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-17 17:59:19 -07:00
Stephen Birarda
4661bd0075 resolve conflicts on merge with clement/protocol 2015-07-17 16:58:57 -07:00
Atlante45
c6e471256d Fix atomic construction 2015-07-17 16:55:45 -07:00
Stephen Birarda
6419e49f4b call QIODevice constructor from Packet copy 2015-07-17 16:35:26 -07:00
Stephen Birarda
c846efb203 fix type in Packet constructor 2015-07-17 16:24:25 -07:00
Stephen Birarda
1a1c2d6bbe prepend module to QIODevice include 2015-07-17 16:20:53 -07:00
Stephen Birarda
30ee80313e add memory include for PacketList 2015-07-17 16:18:58 -07:00
Stephen Birarda
487f9dc45d add atomic include for NetworkPeer 2015-07-17 16:17:10 -07:00
Stephen Birarda
b71678dfdb repair constructor that takes QByteArray in PacketList 2015-07-17 15:47:37 -07:00
Stephen Birarda
9c9c3d5120 remove extra debug in PacketList 2015-07-17 15:44:17 -07:00
Stephen Birarda
0f534b9f7b fixes for new read and NLPacketList 2015-07-17 15:43:20 -07:00
Stephen Birarda
59e14dfd65 Merge branch 'protocol' of https://github.com/huffman/hifi into atp 2015-07-17 15:32:09 -07:00
Stephen Birarda
9a4cc1308d fix packet list segment break 2015-07-17 15:27:57 -07:00
Ryan Huffman
1e7691941c Add raw data read to Packet 2015-07-17 15:27:29 -07:00
ericrius1
a44e5f949c Merge branch 'master' into polyLineInProgress 2015-07-17 15:01:40 -07:00
Stephen Birarda
08bd2adb51 remove dead listeners from set of directly connected objects 2015-07-17 13:58:14 -07:00
Stephen Birarda
eb80922325 Merge branch 'protocol' of https://github.com/huffman/hifi into atp 2015-07-17 11:07:10 -07:00
Ryan Huffman
9725184b24 Move dataSent signal from PacketReceiver to LimitedNodeList 2015-07-17 11:05:07 -07:00
Stephen Birarda
0811553c41 add a direct registration for EntityEditPacketSender 2015-07-17 10:49:24 -07:00
Stephen Birarda
9466d5eca5 add the stop node packet to list of non sourced 2015-07-17 09:29:59 -07:00
Stephen Birarda
97312f9898 remove dead listener from map right before invoke 2015-07-17 09:21:10 -07:00
Stephen Birarda
7d60b86f52 kill the PacketLister (AKA Huffman 1 : PacketListener 0) 2015-07-17 09:07:39 -07:00
Stephen Birarda
ce6585ccc8 fix AC monitor and AM double register 2015-07-16 17:44:43 -07:00
Stephen Birarda
e8de73427b fix suppression of hash mismatch messages 2015-07-16 17:25:55 -07:00
Stephen Birarda
b257daaef1 fix supression of repeated messages for version mismatch 2015-07-16 17:23:00 -07:00
Stephen Birarda
2a2eb39066 repairs for DS path query and response 2015-07-16 17:08:06 -07:00
Stephen Birarda
14e92ceeea remove environment data from packet headers 2015-07-16 16:25:13 -07:00
Stephen Birarda
b1be617481 add back MAX_PACKET_HEADER_BYTES 2015-07-16 16:12:01 -07:00
Stephen Birarda
1a85e95f71 remove implementation of packetTypeForPacket 2015-07-16 16:09:48 -07:00
Stephen Birarda
846506901a more removals from PacketHeaders 2015-07-16 16:06:56 -07:00
Stephen Birarda
1bb3e1789a remove more PacketHeader methods 2015-07-16 16:05:27 -07:00
Stephen Birarda
61653bd88d remove old PacketHeader methods 2015-07-16 16:04:12 -07:00
Stephen Birarda
648f9868f0 add back space in PacketHeaders 2015-07-16 15:58:34 -07:00
Stephen Birarda
83f98a3e57 remove line number comment for enum 2015-07-16 15:58:18 -07:00
Stephen Birarda
eb5fdd7214 clear unused types and push version to 10 2015-07-16 15:57:19 -07:00
Atlante45
7cb4afd718 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-16 14:22:40 -07:00
Stephen Birarda
f31675c4c6 fix ice-server packets 2015-07-16 14:21:37 -07:00
Atlante45
60f44d8e6e Merge branch 'protocol' of https://github.com/huffman/hifi into protocol 2015-07-16 14:03:45 -07:00
Atlante45
a7754ad085 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-16 13:52:32 -07:00
Stephen Birarda
ed928e8a6b actual fix for AddressManager address with port 2015-07-16 13:52:18 -07:00
Atlante45
246b39a18a Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-16 13:42:08 -07:00
Stephen Birarda
5d84d2ec30 add port to current address if not default 2015-07-16 13:39:14 -07:00
Stephen Birarda
76d47eb4e7 mark the DataServerConfirm packet unused 2015-07-16 13:22:18 -07:00
Atlante45
b4121eb464 Remove unnecessary move 2015-07-16 13:14:17 -07:00
Ryan Huffman
87f891288f Merge branch 'atp' of github.com:birarda/hifi into protocol 2015-07-16 12:14:46 -07:00
Ryan Huffman
10c69fefe1 Merge branch 'protocol' of github.com:Atlante45/hifi into protocol 2015-07-16 12:14:36 -07:00
Stephen Birarda
7a48463f4e Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-16 12:09:55 -07:00
Stephen Birarda
336967e580 fix edit packet sending from client 2015-07-16 11:17:49 -07:00
Atlante45
bf637f8f18 Fix broadcast to nodes 2015-07-16 10:50:05 -07:00
Atlante45
ae8e79750b Stop ping timer in handle node kill 2015-07-16 10:00:54 -07:00
Atlante45
8424e91ae1 Added sequence number to packets 2015-07-16 10:00:01 -07:00
Ryan Huffman
6f112f38c3 Merge branch 'atp' of github.com:birarda/hifi into protocol 2015-07-16 07:57:18 -07:00
Stephen Birarda
039ef0750c set jurisdiction listener object name for thread identification 2015-07-15 18:52:59 -07:00
Stephen Birarda
6fa17dafff open packets for write with ReadWrite 2015-07-15 18:27:43 -07:00
Stephen Birarda
000232a55d fix copied packet buffer creation 2015-07-15 17:59:37 -07:00
Stephen Birarda
863cc3390a fix send of mixed audio stream packet from AM 2015-07-15 17:41:00 -07:00
Stephen Birarda
765e8cbb87 Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-15 17:37:51 -07:00
Stephen Birarda
333cd77d9c cleanup call to parseAudioData 2015-07-15 17:20:02 -07:00
Atlante45
43e2961810 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-15 16:33:24 -07:00
Stephen Birarda
3cba3d0dcd fix packet receiver cleanup 2015-07-15 16:33:12 -07:00
Atlante45
ce5bcb8de1 Check ptr 2015-07-15 16:33:04 -07:00
Ryan Huffman
6502359f04 Update NodeList's PacketReceiver to be a pointer 2015-07-15 16:29:15 -07:00
Atlante45
cb64b0353e Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-15 16:26:11 -07:00
Stephen Birarda
8f8845d78d remove accidentally re-added PacketHeaders 2015-07-15 16:25:04 -07:00
Atlante45
a2644752a4 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-15 16:20:11 -07:00
Stephen Birarda
05dde9d8f5 resolve conflicts on merge with upstream/master 2015-07-15 16:18:47 -07:00
Stephen Birarda
00c1dce3e5 disconnect readyRead in LimitedNodeList dtor 2015-07-15 16:16:26 -07:00
Atlante45
2b27918953 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-15 16:10:51 -07:00
Stephen Birarda
dd4c2eaccd add seek back for ping packet 2015-07-15 16:10:32 -07:00
Atlante45
644545b965 Seek to start of ping packet 2015-07-15 16:10:08 -07:00
Atlante45
4db2a77f9f Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-15 15:58:28 -07:00
Atlante45
f065638748 Ping code cleanup 2015-07-15 15:58:14 -07:00
Stephen Birarda
85a5d7059c fix naming of variable in timePingReply 2015-07-15 15:56:31 -07:00
Ryan Huffman
c6b14ec9fb Merge branch 'atp' of github.com:birarda/hifi into protocol 2015-07-15 15:51:56 -07:00
Atlante45
725383e43a Check ptr, not addr 2015-07-15 15:30:54 -07:00
Atlante45
85391cefbb Bug fixes 2015-07-15 15:26:22 -07:00
Ryan Huffman
9a3ba20f11 Merge branch 'atp' of github.com:birarda/hifi into protocol 2015-07-15 15:02:17 -07:00
Ryan Huffman
07e3cf1348 Add COMPARE_DATA to QTestExtensions 2015-07-15 15:01:56 -07:00
Ryan Huffman
ad61c3db41 Fix bytesLeftToRead 2015-07-15 15:01:27 -07:00
Ryan Huffman
2d86e807b0 Move PACKET_WRITE_ERROR to Packet class 2015-07-15 15:00:59 -07:00
Stephen Birarda
3d02cfc6ad only print no listener for packet one time 2015-07-15 14:06:19 -07:00
Stephen Birarda
6c06d4c49e use fromRawData for writeDatagram, correct type for PingReply 2015-07-15 13:59:58 -07:00
Stephen Birarda
7207bdfe2b Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-15 13:50:40 -07:00
Stephen Birarda
7dfbb74d67 ping packets are verified packets 2015-07-15 13:49:34 -07:00
Atlante45
43c6fba94a Register DomainServerAddedNode 2015-07-15 13:49:06 -07:00
Stephen Birarda
d4680ee1dd fix for no current packet in PacketList 2015-07-15 13:41:28 -07:00
Stephen Birarda
312780a2f6 fix offset for source UUID and verification hash 2015-07-15 13:31:36 -07:00
Stephen Birarda
6b05b7ef31 Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-15 13:17:38 -07:00
Stephen Birarda
a79c8ab193 fix check for writing of packet header 2015-07-15 13:17:32 -07:00
Atlante45
2730201a3e erge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-15 13:14:21 -07:00
Atlante45
f3800cacda Don't unregister packet listeners when no nodelist 2015-07-15 13:10:16 -07:00
Stephen Birarda
e90ace6231 fix child assignment UUID, adjust for NLPacket after unpack 2015-07-15 12:37:30 -07:00
Stephen Birarda
c4a97de985 fix verification of source but unverified packets 2015-07-15 12:12:04 -07:00
Atlante45
e744e08577 Missed one connection secret 2015-07-15 11:56:01 -07:00
Stephen Birarda
432048addf use macro for AvatarMixer, show type for unknown 2015-07-15 11:55:50 -07:00
Atlante45
edc14ec6eb Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-15 11:53:11 -07:00
Atlante45
cee1734006 Remove helper function 2015-07-15 11:48:30 -07:00
Stephen Birarda
0b700d690a fix bad assert for payload size 2015-07-15 11:48:27 -07:00
Stephen Birarda
7631af99e0 fix compile for new data size method 2015-07-15 11:46:31 -07:00
Stephen Birarda
4a90e0f14f resolve conflicts on merge with clement/protcol 2015-07-15 11:45:17 -07:00
Atlante45
0b32a5d935 Write session uuid and connection hash in packet header 2015-07-15 11:42:35 -07:00
Stephen Birarda
ca3285b0e4 add a comment for getPayloadCapacity() 2015-07-15 11:02:42 -07:00
Stephen Birarda
95f401fa0f add comments to Packet methods 2015-07-15 11:00:33 -07:00
Stephen Birarda
b115bd1a55 resolve conflicts on merge with huffman/receive_packets 2015-07-15 10:52:07 -07:00
Ryan Huffman
44c99ef89a Replace bytesAvailable with bytesLefToRead 2015-07-15 10:44:51 -07:00
Stephen Birarda
e127c5c06d rename Packet methods for clarity 2015-07-15 10:40:40 -07:00
Stephen Birarda
7d313c4a2b remove extra debugs in PacketReceiver 2015-07-15 10:13:57 -07:00
Stephen Birarda
9204f004c0 remove an extra line 2015-07-14 21:15:39 -07:00
Stephen Birarda
e00dc8bfaa remove an Xcode vim accidentalism 2015-07-14 21:15:22 -07:00
Stephen Birarda
89c44ded38 repairs for domain-server PacketList sending 2015-07-14 21:01:26 -07:00
Stephen Birarda
0327a8d477 fix bytesAvailable, don't double seek in Packet 2015-07-14 20:47:16 -07:00
Stephen Birarda
c210b0db1c don't double seek in Packet::writeData 2015-07-14 20:18:28 -07:00
Stephen Birarda
a5ca1f7125 fix variable setup in Packet constructor 2015-07-14 19:15:18 -07:00
Stephen Birarda
88f419dfd7 repairs to packet sending/receiving 2015-07-14 18:59:33 -07:00
Stephen Birarda
3858e6933f open packets for reading and writing 2015-07-14 17:30:01 -07:00
Stephen Birarda
c154e6cc74 Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-14 17:16:42 -07:00
Stephen Birarda
5163354dd7 more cleanup for PacketReceiver error message 2015-07-14 17:15:18 -07:00
Stephen Birarda
aa696ca8d3 fix listener for AudioStreamStats, more verbose debug 2015-07-14 17:14:27 -07:00
Atlante45
02e1eaf452 Merge fixes 2015-07-14 17:08:36 -07:00
Atlante45
bfb9166b8e Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-14 17:07:47 -07:00
Stephen Birarda
bc309e5b59 put back Q_ASSERT instead of assert 2015-07-14 17:06:13 -07:00
Stephen Birarda
3cb4be6c02 fix order of setup at startup 2015-07-14 17:04:45 -07:00
Atlante45
3abde577e2 Merge branch 'protocol' of https://github.com/birarda/hifi into protocol 2015-07-14 16:58:26 -07:00
ZappoMan
bc251de43c delete dead code 2015-07-14 16:49:22 -07:00
Stephen Birarda
251387159a go back to Q_ASSERT for methodIndex 2015-07-14 16:48:55 -07:00
Stephen Birarda
15ca129005 fix for registration of methods with typedef 2015-07-14 16:46:17 -07:00
Atlante45
f0a2e921b7 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-14 16:45:01 -07:00
Atlante45
fbb6a94579 Merge branch 'receive_packets' of https://github.com/huffman/hifi into protocol 2015-07-14 16:36:28 -07:00
Stephen Birarda
b1650c0d8c fix ::get<NodeList> in DS code, make processSTUNResponse a slot 2015-07-14 16:36:05 -07:00
Ryan Huffman
d36ed9cd0d Fix missing semicolon 2015-07-14 16:12:47 -07:00
Atlante45
aca759aa2f Implement brodcastToNodes 2015-07-14 16:03:42 -07:00
Ryan Huffman
bd345cdccd Merge branch 'atp' of github.com:birarda/hifi into receive_packets 
Conflicts:
	libraries/networking/src/PacketReceiver.cpp
 2015-07-14 15:59:16 -07:00
Stephen Birarda
5edb809cd1 remove header packet methods from LimitedNodeList 2015-07-14 15:54:23 -07:00
Ryan Huffman
a61fbff018 Add error handling when reading path query response 2015-07-14 15:52:28 -07:00
Stephen Birarda
b4d01c4644 fix variable name for coding standard 2015-07-14 15:52:16 -07:00
Stephen Birarda
fb7cb7ff53 add the option for PacketReceiver to drop packets 2015-07-14 15:49:54 -07:00
Stephen Birarda
b7b2cb73ef remove check for shutting down 2015-07-14 15:43:10 -07:00
Stephen Birarda
55eb24e69e call right method from packetReceiver 2015-07-14 15:41:31 -07:00
Philip Rosedale
221a92eeee Merge pull request #5322 from ctrlaltdavid/fix-eye-direction 
Fix eye directions so that they're correct when avatar leans backwards
 2015-07-14 15:38:56 -07:00
Atlante45
774a0626b3 Bump all packet version 2015-07-14 15:36:56 -07:00
Stephen Birarda
e749b9727f have threaded assignment de-register for packets in finished 2015-07-14 15:33:05 -07:00
Atlante45
fd1648c0d7 Code cleanup 2015-07-14 15:30:41 -07:00
Atlante45
c05105e2f9 Added takeFront method to PacketList 2015-07-14 15:29:49 -07:00
Stephen Birarda
19c1ce2d6f remove the QUDPSocket readyRead hack 2015-07-14 15:29:41 -07:00
Stephen Birarda
789235b8c7 make NodeList deleter be deleteLater 2015-07-14 15:28:38 -07:00
Ryan Huffman
ef7a91af8f Make NLPacket read SourceID/VerificaitionHash methods protected 2015-07-14 15:27:38 -07:00
Ryan Huffman
96bd650b55 Fix NLPacket::localHeaderSize 2015-07-14 15:22:35 -07:00
Ryan Huffman
7bd10afbf2 Remove packetVersionMatch from LimitedNodeList 2015-07-14 15:22:16 -07:00
Ryan Huffman
86e4d5f631 Remove PacketReceiverListener 2015-07-14 15:12:32 -07:00
Ryan Huffman
0c02933e66 Remove LimitedNodeList::processKillNode(const QByteArray& datagram) 2015-07-14 15:09:45 -07:00
Ryan Huffman
56b5c9acff Merge branch 'atp' of github.com:birarda/hifi into receive_packets 
Conflicts:
	assignment-client/src/entities/EntityServer.cpp
	domain-server/src/DomainServer.cpp
 2015-07-14 14:53:45 -07:00
Ryan Huffman
d49c71d132 Update a shared ptr NLPacket parameter to use NLPacket& 2015-07-14 14:42:03 -07:00
Ryan Huffman
027d131b2a Move sequence number updating to PacketReceiver 2015-07-14 14:40:39 -07:00
Stephen Birarda
d617b71232 remove SharedNodePointer from some packet callbacks 2015-07-14 14:27:26 -07:00
Ryan Huffman
64bed72ae6 Add Packet::peekPrimitive 2015-07-14 14:23:10 -07:00
Stephen Birarda
fbd287472d make NodeData parseData take only packet 2015-07-14 14:09:00 -07:00
David Rowe
bfad3ee02a Fix eye directions so that they're correct when avatar leans backwards 2015-07-14 14:07:32 -07:00
Stephen Birarda
0637f589b5 add PacketListener to help unregister for packets 2015-07-14 13:52:38 -07:00
Stephen Birarda
c63d714400 remove variables for out in PacketReceiver 2015-07-14 12:54:43 -07:00
Atlante45
7bf45308b6 Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart 2015-07-14 12:31:37 -07:00
Ryan Huffman
0edc909818 Merge branch 'protocol' of github.com:birarda/hifi into receive_packets 
Conflicts:
	assignment-client/src/audio/AudioMixer.cpp
	interface/src/Application.cpp
	libraries/networking/src/Packet.cpp
 2015-07-14 10:21:31 -07:00
Stephen Birarda
8d38cd5670 use a specific packet type for AC child status 2015-07-13 15:58:44 -07:00
Stephen Birarda
9d4f9aa21e final fixes to get ACs building again 2015-07-13 15:38:45 -07:00
Atlante45
eb56999077 Make PacketList class NLPacketList inherits from 2015-07-13 15:30:41 -07:00
Atlante45
44c5d4a2bf Couple fixes SharedNodePointer > Node& 2015-07-13 15:29:41 -07:00
Atlante45
c80df94b06 Update includes for moved files 2015-07-13 15:28:55 -07:00
Atlante45
4a22f18add Setup udt namespace/move relevant files 2015-07-13 15:25:25 -07:00
Stephen Birarda
f06636d45e repairs for other ThreadedAssignment subclasses 2015-07-13 15:16:55 -07:00
Stephen Birarda
26be492475 use same listener for many packets in AudioMixer 2015-07-13 14:46:56 -07:00
Stephen Birarda
775c1b7310 Merge branch 'receive_packets' of https://github.com/huffman/hifi into atp 2015-07-13 14:26:23 -07:00
Stephen Birarda
ede39515d8 update parseData for new network API 2015-07-13 14:26:10 -07:00
Stephen Birarda
859122db5d update signature of callbacks for avatar packets 2015-07-13 13:32:46 -07:00
Atlante45
7a160db8dd sendPacketList first implementation 2015-07-13 12:58:26 -07:00
Ryan Huffman
2efa2877da Update LimitedNodeList::processKillNode to work with NLPacket 2015-07-13 12:07:21 -07:00
Atlante45
77bff0c4f2 First draft at sendPacket type method impl 2015-07-13 11:57:56 -07:00
Atlante45
957e6394a9 sendPacket function take Node& not a pointer 2015-07-13 11:57:20 -07:00
Stephen Birarda
e5d8a39dde update DomainServer to new packet receive API 2015-07-13 11:11:52 -07:00
Stephen Birarda
1dccc144e7 fix compile errors after PacketReceiver changes 2015-07-13 10:10:22 -07:00
Stephen Birarda
c23899aec2 repairs to packet listener registration 2015-07-13 10:02:53 -07:00
ericrius1
0ce6737b34 merged and normals flipping 2015-07-13 09:43:15 -07:00
Stephen Birarda
3d62162812 cleanup octree networking code to use new API 2015-07-13 09:40:26 -07:00
Brad Davis
29333d0cad Qt5.5 fixes 2015-07-12 18:52:15 -07:00
Atlante45
80fe090a94 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-10 20:20:03 -07:00
Stephen Birarda
d85fbbfb74 update NodeList for new packet receive code 2015-07-10 17:45:23 -07:00
Stephen Birarda
4442bb55d6 resolve conflicts on merge with huffman/receive_packets 2015-07-10 16:47:27 -07:00
Stephen Birarda
990f7b7332 changes for new packet receive API 2015-07-10 16:45:44 -07:00
Ryan Huffman
fe5b17f061 Remove readPendingDatagrams from ThreadedAssignment 2015-07-10 16:15:05 -07:00
Stephen Birarda
2d1c3e27da fix parameter matching in PacketReceiver 2015-07-10 12:27:44 -07:00
Ryan Huffman
972c465bdb Remove PacketReceiver copy ctor and = operator 2015-07-10 12:25:01 -07:00
Ryan Huffman
2f0c21a603 Temporarily disable packet dispatching in PacketReceiver 2015-07-10 12:24:35 -07:00
Stephen Birarda
528fac6b84 rework of PacketReceiver registration API, HifiSockAddr packet getter 2015-07-10 12:22:25 -07:00
Atlante45
6c591131ba Made Animations safe for resource reload 2015-07-10 12:01:51 -07:00
Ryan Huffman
83dedd0a15 Add todo to move PacketReceiver to its own thread 2015-07-10 09:37:43 -07:00
Ryan Huffman
d009bf826e Update PacketReceiver to use QSharedPointer<NLPacket> 2015-07-10 08:46:21 -07:00
Atlante45
90edf055f7 Clear unused resources before refresh 2015-07-09 18:00:07 -07:00
Ryan Huffman
976d14736d Update PacketReceiver to pass NLPacket as NLPacket& 2015-07-09 16:06:21 -07:00
Ryan Huffman
f8b4c84903 Add missing header in SentPacketHistory 2015-07-09 15:34:20 -07:00
Ryan Huffman
b7fe91ccc6 Fix errors PacketReceiver 2015-07-09 15:34:02 -07:00
Atlante45
aaafa7acd2 Copy _type in assignment operators 2015-07-09 14:20:04 -07:00
Atlante45
a2a60f253c Fail with packet size in constructor 2015-07-09 14:19:47 -07:00
Ryan Huffman
dd9dea7a97 Merge remote-tracking branch 'birarda/protocol' into receive_packets 
Conflicts:
	interface/src/DatagramProcessor.cpp
	interface/src/octree/OctreePacketProcessor.cpp
	libraries/entities/src/EntityEditPacketSender.cpp
	libraries/networking/src/LimitedNodeList.h
	libraries/networking/src/NLPacket.h
 2015-07-09 14:08:35 -07:00
Atlante45
a9cfcf241d Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-09 13:22:45 -07:00
Atlante45
7e4999b717 int64_t to qint64 for consistency 2015-07-09 13:12:48 -07:00
Atlante45
01f1a6e2b9 Fix NLPacket::create 2015-07-09 13:12:21 -07:00
Atlante45
f90f3a05be Fail in Packet::create if size is invalid 2015-07-09 13:11:43 -07:00
Stephen Birarda
6f2e9f4899 cleanup return in SentPacketHistory 2015-07-09 13:06:34 -07:00
Stephen Birarda
f68845e806 remove hash and sequence number replacement in PacketHeaders 2015-07-09 12:33:34 -07:00
Stephen Birarda
3da1a81363 remove packet header population from PacketHeaders 2015-07-09 12:32:52 -07:00
Stephen Birarda
6dc7745826 remove two lines from PacketHeaders 2015-07-09 12:29:21 -07:00
Stephen Birarda
bcea400ee4 delete the old methods to get closer to an even PR 2015-07-09 12:23:12 -07:00
Stephen Birarda
01d1a17231 fix indentation in LimitedNodeList 2015-07-09 12:20:28 -07:00
Stephen Birarda
4c8f32ce7b add an assert for an NLPacketList segment that is oversized 2015-07-09 12:13:15 -07:00
Stephen Birarda
a363f42bb2 pass const NLPacket& for all sendUnreliablePacket calls 2015-07-09 11:42:18 -07:00
Stephen Birarda
c903d284bb fix for arguments that are now const NLPacket& 2015-07-09 11:32:00 -07:00
Stephen Birarda
6d2fea4426 make NLPacket copy take const, fix get in SPH 2015-07-09 11:24:58 -07:00
Stephen Birarda
bd9b42bd4c change createCopy in packet to take const & 2015-07-09 11:23:44 -07:00
Stephen Birarda
659f6742c6 Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-09 11:21:36 -07:00
Stephen Birarda
922d6413d5 change some const unique_ptr to const NLPacket 2015-07-09 11:21:27 -07:00
Atlante45
f2e0524817 Add send unreliable takes const ref 2015-07-09 11:20:01 -07:00
Ryan Huffman
7f771122ee Remove old packet handling from PacketReceiver 2015-07-09 09:25:12 -07:00
Stephen Birarda
f2a198dfdd add O_OBJECT macros to appropriate classes, fix PacketList errors 2015-07-08 22:46:43 -07:00
Stephen Birarda
302e502d84 remove NLPacket forward declare 2015-07-08 20:17:23 -07:00
Stephen Birarda
8935baf3aa add missing return of new packet 2015-07-08 20:11:08 -07:00
Stephen Birarda
d3e48e1293 fix a missing templated type in PacketList 2015-07-08 20:08:25 -07:00
Atlante45
cb49d89369 Fix link errors 2015-07-08 19:56:07 -07:00
Stephen Birarda
46e6f9cf4f add a type for templated return 2015-07-08 19:15:40 -07:00
Stephen Birarda
0d1c4a4177 add classes to templated methods 2015-07-08 19:14:32 -07:00
Stephen Birarda
b08c0d3817 Merge remote-tracking branch 'clement/protocol' into atp 2015-07-08 19:13:27 -07:00
Atlante45
263e737137 Move template func body outside of class 2015-07-08 19:13:01 -07:00
Stephen Birarda
8c188d6478 move templates below class in PacketList 2015-07-08 19:12:56 -07:00
Stephen Birarda
04e7b8cd02 fix static assert error message 2015-07-08 19:10:13 -07:00
Stephen Birarda
f6fbc14f5a put Packet templates in header 2015-07-08 19:07:45 -07:00
Stephen Birarda
cf7ae5fbf5 fix templated write/read in PacketList 2015-07-08 19:06:42 -07:00
Stephen Birarda
8f900d22ca prefer typename to class for templates 2015-07-08 18:58:35 -07:00
Stephen Birarda
86a218ad20 fix for templated read/write in PacketList 2015-07-08 18:52:15 -07:00
Stephen Birarda
b0b8dd2e7d add back readDatagram to get to build 2015-07-08 18:46:06 -07:00
Stephen Birarda
da3502eb6c resolve conflicts on merge with upstream/master 2015-07-08 18:41:48 -07:00
Stephen Birarda
791c7e2de1 re-expose readDatagram to get back to build for writes 2015-07-08 18:25:56 -07:00
Atlante45
ee3a8b1b6e Clear resource caches instead of restarting 2015-07-08 18:23:16 -07:00
Stephen Birarda
5dc09692b4 more packet creation fixes for entitites 2015-07-08 18:13:06 -07:00
Stephen Birarda
9f4e4f1948 fix templated write/read and various write calls 2015-07-08 16:36:09 -07:00
Ryan Huffman
1b5d526444 Add new packet processing to AvatarManager 2015-07-08 15:06:50 -07:00
Atlante45
3e84d4f1ed Quiet an unused variable warning 2015-07-08 14:35:56 -07:00
Stephen Birarda
59484fc3cf rename setType implementation in Packet 2015-07-08 14:33:08 -07:00
Stephen Birarda
822dd46228 use getType instead of readType in OctreeEditPacketSender 2015-07-08 14:32:20 -07:00
Stephen Birarda
4fe6102a7c change readPacketType and readPacketTypeVersion 2015-07-08 14:25:14 -07:00
Stephen Birarda
d8b03189e3 fixes for writes with new API 2015-07-08 14:21:26 -07:00
Stephen Birarda
1081e627fa Merge remote-tracking branch 'clement/protocol' into atp 2015-07-08 14:12:50 -07:00
Atlante45
7329ad6334 Templated read/write in Packet 2015-07-08 13:45:12 -07:00
Stephen Birarda
d9e10db011 use of new API in OctreeEditPacketSender 2015-07-08 13:43:37 -07:00
Stephen Birarda
e13360b1b6 initial changes to OctreeEditPacketSender for new API 2015-07-08 12:18:38 -07:00
Ryan Huffman
f1bf52602f Fix Packet::Type (PacketType::Value) 2015-07-08 11:54:50 -07:00
Ryan Huffman
8a415b2adb Register for packet types in NodeList 2015-07-08 11:15:00 -07:00
Ryan Huffman
9d0bffaa19 Add PacketReceiver to LimitedNodeList 2015-07-08 11:14:43 -07:00
Ryan Huffman
5940aee0e7 Rename PacketProcessor files 2015-07-08 10:50:26 -07:00
Ryan Huffman
44c34ac566 Rename PacketProcessor to PacketReceiver 2015-07-08 10:49:30 -07:00
Ryan Huffman
92462db4e1 Rename DatagramProcessor and add packet listener mutex 2015-07-08 10:49:00 -07:00
Stephen Birarda
78bc0979cc move the symmetric ping packet 2015-07-08 10:47:54 -07:00
Atlante45
7713219718 Compile fixes 2015-07-08 10:40:35 -07:00
Ryan Huffman
9d25612ff8 Move DatagramProcessor to PacketProcessor 2015-07-08 10:24:30 -07:00
Stephen Birarda
74940a2132 replace lingering PacketTypes in old format 2015-07-08 10:18:13 -07:00
Stephen Birarda
a489c3558d move the assignment packet 2015-07-07 18:24:14 -07:00
Stephen Birarda
11fd43a094 fix for packet types in send assignment 2015-07-07 18:23:03 -07:00
Stephen Birarda
643e565170 resolve conflicts on merge with Atlante45/protocol 2015-07-07 18:20:41 -07:00
Stephen Birarda
07fe6f4699 more compile error fixes for broken NodeList 2015-07-07 18:19:21 -07:00
Atlante45
5d95a5c117 Compile fixes 2015-07-07 18:17:28 -07:00
Stephen Birarda
ca45c3f44d fix packet initialization in sendDomainServerCheckIn 2015-07-07 18:15:44 -07:00
Stephen Birarda
4131adc92b add API to send a packet to override sock addr 2015-07-07 18:15:00 -07:00
Stephen Birarda
c4da2d46c6 more compile fixes in NodeList 2015-07-07 18:11:56 -07:00
Stephen Birarda
c814fbbc93 fix packet list sending of JSON stats 2015-07-07 18:10:52 -07:00
Stephen Birarda
674d43864c add ICE packets to non sourced packets 2015-07-07 18:08:37 -07:00
Stephen Birarda
acd8b610a6 move icePacket before send to ice server 2015-07-07 18:05:29 -07:00
Stephen Birarda
e6f1fef6e4 remove numBytesForPacketHeader from sendStats 2015-07-07 18:02:08 -07:00
Stephen Birarda
e7e489af61 use new networking in sendPacketToIceServer 2015-07-07 18:01:17 -07:00
Stephen Birarda
402f7dc075 correct PingType_t pack and PacketList readData 2015-07-07 17:56:05 -07:00
Stephen Birarda
61960c80c8 fix PingType_t cast for icePingPacket 2015-07-07 17:53:08 -07:00
Stephen Birarda
e0aea7f955 fix QDataStream creations in LimitedNodeList 2015-07-07 17:52:33 -07:00
Stephen Birarda
7a9dbd7f2f repairs for NetworkPacket removal 2015-07-07 17:50:32 -07:00
Stephen Birarda
1cfa65a3df fix reference to NodePacketPair packet in PacketSender 2015-07-07 17:40:15 -07:00
Stephen Birarda
bf625f5af1 move JSON stats sending to a packet list 2015-07-07 17:39:58 -07:00
Stephen Birarda
88f8f692fb fix QDataStream creation with NLPacket 2015-07-07 17:31:14 -07:00
Stephen Birarda
ccb632cd39 Merge remote-tracking branch 'clement/protocol' into atp 2015-07-07 16:58:45 -07:00
Stephen Birarda
cc045c2a30 fix using for NodePacketPair typedef 2015-07-07 16:57:41 -07:00
Stephen Birarda
6c6143f21e remove NetworkPacket and replace with NodePacketPair 2015-07-07 16:56:05 -07:00
Stephen Birarda
30840422ad use NLPacket::createCopy in NetworkPacket 2015-07-07 16:35:59 -07:00
Atlante45
ac9e3b0326 More compile fixes 2015-07-07 16:34:52 -07:00
Atlante45
ac89571a79 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-07 16:28:21 -07:00
Atlante45
fcd11461c2 Added NLPacket::createCopy 2015-07-07 16:27:48 -07:00
Ryan Huffman
60538d4a82 Merge branch 'atp' of github.com:birarda/hifi into atp 
Conflicts:
	libraries/audio-client/src/AudioIOStats.cpp
 2015-07-07 16:26:22 -07:00
Atlante45
e0119e8767 Fix a couple packet types names 2015-07-07 16:26:20 -07:00
Atlante45
833f36e88e Comment deprecated methods 2015-07-07 16:25:39 -07:00
Ryan Huffman
3690ecc28f Add std::move to sendPacket calls 2015-07-07 16:24:11 -07:00
Stephen Birarda
20b0f4f3d1 force the unordered PacketList 2015-07-07 16:15:59 -07:00
Stephen Birarda
191ede4675 Merge remote-tracking branch 'huffman/atp' into atp 2015-07-07 16:15:03 -07:00
Stephen Birarda
6d502405ef resolve conflicts on merge with Atlante45/protocol 2015-07-07 16:12:07 -07:00
Stephen Birarda
018831e230 Merge remote-tracking branch 'huffman/protocol' into atp 2015-07-07 16:10:07 -07:00
Stephen Birarda
71e8c0f5cf use getPayload instead of constData in PacketList 2015-07-07 16:07:54 -07:00
Stephen Birarda
b5eb4945ab fix packet segmentation in PacketList 2015-07-07 16:06:09 -07:00
Stephen Birarda
bb15326676 repair send of path query packet 2015-07-07 16:02:21 -07:00
Stephen Birarda
05be8199c8 make broadcastToNodes take NLPacket unique ptr 2015-07-07 15:55:33 -07:00
Stephen Birarda
5728cf5056 fix ping methods in LNL 2015-07-07 15:54:18 -07:00
Atlante45
d496b33ae6 Compile fixes 2015-07-07 15:51:29 -07:00
Atlante45
1932703fec Merge branch 'protocol' of https://github.com/huffman/hifi into protocol 2015-07-07 15:49:45 -07:00
Atlante45
79d1a9f6c8 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-07 15:45:12 -07:00
Ryan Huffman
b502239cca Disable isOrdered = true in PacketList 2015-07-07 15:44:03 -07:00
Ryan Huffman
57b69d1501 Add PacketList::getNumPackets 2015-07-07 15:43:21 -07:00
Atlante45
b4ab6828bb Added setPacketType to Packet class 2015-07-07 15:43:16 -07:00
Stephen Birarda
c90c5900ce make unreliable packet take unique ptr ref 2015-07-07 15:42:02 -07:00
Stephen Birarda
03b17cc5dc fix methods for packet pointers in LNL 2015-07-07 15:38:52 -07:00
Stephen Birarda
45b549398d use PacketList for application nack packets 2015-07-07 15:31:58 -07:00
Stephen Birarda
089cb8a39e fix signature for packet send calls 2015-07-07 15:24:48 -07:00
Stephen Birarda
6064a2d4e2 CR fixes for DomainServer 2015-07-07 15:21:20 -07:00
Ryan Huffman
399b749033 Fix method and const names in NetworkPacket 2015-07-07 15:17:16 -07:00
Stephen Birarda
c8a03ebff8 cleanup NAK packets in OctreeInboundPacketProcessor 2015-07-07 15:14:27 -07:00
Atlante45
11c58ebc9e Added Packet::createCopy and getData 2015-07-07 15:07:14 -07:00
Stephen Birarda
ffa6edc904 fix spaces created by xcode find/replace 2015-07-07 15:01:19 -07:00
Stephen Birarda
f879ea2f35 Merge remote-tracking branch 'huffman/protocol' into atp 2015-07-07 13:47:39 -07:00
Stephen Birarda
f5dad95184 Merge remote-tracking branch 'clement/protocol' into atp 2015-07-07 13:47:21 -07:00
Atlante45
422bef4e18 Merge branch 'protocol' of https://github.com/highfidelity/hifi into protocol 2015-07-07 12:54:54 -07:00
Atlante45
e2bd9532b7 Implement move ctor/assignment 2015-07-07 12:47:23 -07:00
Ryan Huffman
419eec4ca7 Merge pull request #5267 from huffman/protocol 
Protocol
 2015-07-07 12:43:43 -07:00
Ryan Huffman
d8b1cc0aa9 Update NetworkPacket to correctly use move semantics 2015-07-07 12:38:58 -07:00
Stephen Birarda
01b1c46237 more networking API changes in octree classes 2015-07-07 12:31:22 -07:00
Atlante45
9889dcdd64 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-07 12:29:00 -07:00
Atlante45
712b35c4dc Couple changes to packets header size computation 2015-07-07 12:26:35 -07:00
Ryan Huffman
308335ff69 Update PacketSender to use NLPacket 2015-07-07 12:16:30 -07:00
Ryan Huffman
ebd223ecba Update NetworkPacket to use NLPacket 2015-07-07 12:15:44 -07:00
Stephen Birarda
fca23cc69b make SentPacketHistory use NLPacket 2015-07-07 12:14:40 -07:00
Stephen Birarda
74924bc5f1 initial changes to OctreeQueryNode for new APIs 2015-07-07 12:08:01 -07:00
Atlante45
7eddcf383c Merge Packet and PacketPayload 2015-07-07 11:33:33 -07:00
Stephen Birarda
edf7a96b58 update audio client packet send to NLPacket 2015-07-07 10:53:55 -07:00
Atlante45
a07a24788d Cast type to int before arithmetique packing 2015-07-07 10:36:15 -07:00
Atlante45
c23e3c0ec2 Change Packet.h header to NLPacket 2015-07-07 10:35:11 -07:00
Atlante45
8e7580d58d Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-07 10:32:54 -07:00
Atlante45
8e5b040627 Packet setters 2015-07-07 10:32:31 -07:00
Atlante45
91496d37c7 Move NLPacket to its own file 2015-07-07 10:31:54 -07:00
Stephen Birarda
e1c098233a use sendUnreliablePacket for repeated send in AI 2015-07-06 18:03:41 -07:00
Stephen Birarda
ac6c8c9c3a add stubs for new send methods in LNL 2015-07-06 17:40:53 -07:00
Stephen Birarda
76fb120f67 remove call to NodeListPacket in NodeList 2015-07-06 17:23:48 -07:00
Stephen Birarda
453f8605c0 finish cleanup of NodeListPacket in LimitedNodeList 2015-07-06 17:22:55 -07:00
Stephen Birarda
c0d1953df3 use NLPacket in LimitedNodeList 2015-07-06 17:21:05 -07:00
Stephen Birarda
d64d49d004 remove PacketByteArray from networking 2015-07-06 17:15:27 -07:00
Atlante45
d87679f115 Partially fill packet header on construction 2015-07-06 17:13:03 -07:00
Stephen Birarda
f8e6344678 have PacketList use Packet instead of PacketPayload 2015-07-06 17:10:55 -07:00
Stephen Birarda
02f97702d3 switch path query packets to new networking API 2015-07-06 17:08:12 -07:00
Stephen Birarda
3fa785c545 fix domain check in packets for new API 2015-07-06 17:03:26 -07:00
Atlante45
12edec7bea Packet class polishing 2015-07-06 17:02:55 -07:00
Atlante45
0c7dc1e28f Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-06 16:40:47 -07:00
Stephen Birarda
922dd5a739 keep track of size used in PacketPayload 2015-07-06 16:35:29 -07:00
Stephen Birarda
6187cff766 add a constData method to PacketPayload 2015-07-06 16:20:56 -07:00
Stephen Birarda
33a9a04d9e allow a packet to be created with extended header 2015-07-06 16:18:49 -07:00
ZappoMan
05f28064bf add stats for PPS for inbound from network into OctreePacketProcessor and processing out of OctreePacketProcessor 2015-07-06 16:03:42 -07:00
Stephen Birarda
3ae8ba2922 add segment calls to PacketList 2015-07-06 15:53:26 -07:00
Stephen Birarda
2ab2888260 add the complicated writeData method for PacketList 2015-07-06 15:50:54 -07:00
Atlante45
43354c3b28 More Packet class work + NLPacket shell 2015-07-06 15:03:00 -07:00
Stephen Birarda
25e82d4b92 initial version of PacketList QIODevice subclass 2015-07-06 14:29:24 -07:00
Stephen Birarda
cbba8263cd fix writeData and readData for PacketPayload 2015-07-06 14:27:20 -07:00
Stephen Birarda
93ac2704e8 fix header guard comment in PacketPayload 2015-07-06 12:38:49 -07:00
Stephen Birarda
1867f259d6 keep track of max written in PacketPayload 2015-07-06 11:55:49 -07:00
Stephen Birarda
b660c80988 leverage QIODevice for much of PacketPayload functionality 2015-07-06 11:51:20 -07:00
Stephen Birarda
57d76f488c make PacketPayload a QIODevice subclass 2015-07-06 11:33:46 -07:00
Stephen Birarda
8dc385bd62 initial setup for a PacketByteArray 2015-07-06 11:08:51 -07:00
Stephen Birarda
a9420d4212 replace controlled broadcast to nodes in Application 2015-07-02 17:55:26 -07:00
Stephen Birarda
8dd91b8795 don't force source ID on ICE ping packets 2015-07-02 17:34:52 -07:00
Stephen Birarda
b3c3e5a6c8 more PacketType to PacketType::Value replacements 2015-07-02 16:49:19 -07:00
Stephen Birarda
1c20aa47c3 remove replacement of namespace itself 2015-07-02 16:41:07 -07:00
Stephen Birarda
0d64e82fe2 replace PacketType declarations with PacketType::Value 2015-07-02 16:38:52 -07:00
Stephen Birarda
5ed332ea2c missed changes in PacketHeaders, comment old header calls 2015-07-02 16:35:17 -07:00
Stephen Birarda
1dfa592a13 use new enum across PacketHeaders 2015-07-02 16:31:33 -07:00
Stephen Birarda
f057be0982 Merge remote-tracking branch 'clement/protocol' into atp 2015-07-02 16:19:07 -07:00
Stephen Birarda
3a5701e02e first changes for new network API 2015-07-02 16:18:44 -07:00
Atlante45
3edc29bd4b Packet class squeleton 2015-07-02 16:15:20 -07:00
Brad Hefta-Gaub
2a03f62bf2 Merge pull request #5232 from sethalves/actions-over-wire-and-sim-ownership 
Actions over wire and improved simulation ownership
 2015-07-02 14:57:27 -07:00
ericrius1
ad97b28734 fixed merge conflicts 2015-07-02 11:01:40 -07:00
Atlante45
7b5a5a339a Use make_shared/create to make shared pointers 2015-07-01 19:46:06 -07:00
Brad Davis
1d16d80c0c Comments from CR 2015-07-01 14:55:24 -07:00
Brad Davis
1e1f199fdb Undoing unwisdom 2015-07-01 14:54:26 -07:00
Brad Davis
4c200d75bc Tweaking packet processing locking 2015-07-01 14:53:08 -07:00
Seth Alves
5e2f7204b4 responses to code review 2015-07-01 10:29:42 -07:00
Brad Davis
d4d6f8f5d5 Eliminate per-packet locking for processing 2015-07-01 10:06:04 -07:00
ericrius1
ff77c3e0d8 added stroke width entity 2015-06-30 18:38:40 -07:00
ericrius1
9fd30581d1 support for painting with quads, including per-vertex normals and colors 2015-06-29 15:56:40 -07:00
Seth Alves
1d122060a6 merge andrew's sim-ownership branch 2015-06-29 09:50:38 -07:00
Andrew Meadows
f274958beb fix bad merge during rebase 2015-06-26 22:13:06 -07:00
Andrew Meadows
12fc18092b SimulationOwner as one property 2015-06-26 21:58:03 -07:00
Andrew Meadows
8afd9a5e1d add EntityItem::_simulatorPriority as uint8_t 2015-06-26 21:57:04 -07:00
Seth Alves
5ecc39b811 Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-26 20:06:10 -07:00
Stephen Birarda
8fd309027f add a forced failover for hanging STUN dns lookup 2015-06-26 17:35:14 -07:00
Seth Alves
70aa762f61 merge from upstream 2015-06-26 15:34:10 -07:00
Stephen Birarda
ff33922716 handle conflicts on merge with upstream master 2015-06-26 15:33:35 -07:00
ZappoMan
ccbc048f64 repair bad ordering of PROP_SCRIPT_TIMESTAMP 2015-06-26 14:59:40 -07:00
Stephen Birarda
9b84eabd18 Merge branch 'master' of https://github.com/highfidelity/hifi into hyperlink-photo 2015-06-26 14:40:01 -07:00
Seth Alves
bc7271769c merge from master 2015-06-26 14:29:40 -07:00
Stephen Birarda
18e2b62ecc initial image replacement for hyperlink preview 2015-06-26 14:12:26 -07:00
David Rowe
1898c6bd55 Merge branch 'master' into 20547 
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
	libraries/networking/src/PacketHeaders.h
 2015-06-26 13:05:51 -07:00
Seth Alves
9e8113a63c bump protocol version 2015-06-26 12:36:10 -07:00
Seth Alves
005bd8bda5 merge from upstream 2015-06-26 12:33:35 -07:00
Brad Hefta-Gaub
2c30711229 Merge pull request #5210 from bwent/faceCameraProp 
Added faceCamera property for text entities
 2015-06-26 12:29:25 -07:00
bwent
aa865680ab Added faceCamera property to Text Entities 
…and removed from base
 2015-06-25 15:38:38 -07:00
bwent
99cd9bada1 Added Billboard entity property and enabled billboarding for text entities 2015-06-23 16:22:34 -07:00
Seth Alves
f75506bf1b Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-22 15:37:10 -07:00
Stephen Birarda
a9eccb687a fix for double store on index path lookup 2015-06-22 11:26:17 -07:00
Seth Alves
77cb3c0caa quiet valgrind 2015-06-21 18:13:13 -07:00
Seth Alves
717c8ed3ad formatting 2015-06-21 18:12:24 -07:00
Niraj Venkat
482f12be8c Returning ref to stack to view controller 2015-06-19 16:05:45 -07:00
Niraj Venkat
1494aa4faa Adding new icon and getters 2015-06-19 11:18:16 -07:00
Seth Alves
b258aeaa3d merge from master 2015-06-18 10:04:14 -07:00
David Rowe
6623d0c552 Add "Reload" button associated with entity editor's script URL field 
The Reload button re-downloads the script for both the editor and for
everyone in the vicinity.
 2015-06-17 16:11:32 -07:00
Stephen Birarda
bc20ea6ed2 fix for path handling on return of place info 2015-06-17 11:18:43 -07:00
Stephen Birarda
dc4ae082f8 make goToUser public again 2015-06-17 10:13:53 -07:00
Seth Alves
508ae276c6 enable -Wdouble-promotion 2015-06-16 18:23:10 -07:00
Stephen Birarda
e9bdf7e73a add missing bools to handleViewpoint call 2015-06-16 13:39:11 -07:00
Stephen Birarda
1af4b1c54c cleanup handleUrl call, add disabling of Menu items 2015-06-16 13:17:13 -07:00
Stephen Birarda
ef62f7e9f0 fix relative path lookup effect on history 2015-06-16 08:46:04 -07:00
Stephen Birarda
8e46043f14 add fixed back/forward, buttons to menu 2015-06-16 08:41:21 -07:00
Stephen Birarda
1112841586 fix indentation in AddressManager 2015-06-09 19:01:03 -07:00
Stephen Birarda
8b67710022 store an in-memory history of the last addresses 2015-06-09 18:59:58 -07:00
Seth Alves
983ae5b2f0 quiet compiler, fix some whitespace 2015-06-08 21:19:37 -07:00
Niraj Venkat
141ff70a60 Some changes to constants 2015-06-05 15:36:42 -07:00
Niraj Venkat
a3f19e9d4c Fixing title bar update on teleport 2015-06-05 13:33:14 -07:00
Niraj Venkat
a2165e3a8a Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-05 10:42:20 -07:00
Niraj Venkat
c8236f867b Address manager changes to support domain ID 2015-06-05 10:40:17 -07:00
Eric Levin
e7c5a24e3d fixed packet number increment logic 2015-06-02 09:38:45 -07:00
Eric Levin
f51ad6b8da merged master 2015-06-01 15:39:05 -07:00
Stephen Birarda
33fde7c66d remove extra debug 2015-05-29 13:21:24 -07:00
Stephen Birarda
2207bfaf40 Merge branch 'master' of https://github.com/highfidelity/hifi into domain-dtls 2015-05-29 12:06:12 -07:00
Stephen Birarda
e253687dcd fix fail case for DS pings 2015-05-29 12:06:07 -07:00
Seth Alves
b0f6826d17 Merge pull request #4995 from birarda/domain-dtls 
speed up initial connection to domains
 2015-05-29 10:50:01 -07:00
Stephen Birarda
e91ee7e7e3 only send add packet for nodes in interest set 2015-05-29 09:49:54 -07:00
Stephen Birarda
046828ee5d make the LNL the parent of any Nodes it adds 2015-05-28 16:58:58 -07:00
Stephen Birarda
29d3ca85d9 cleanup debug logs for DS/node ping punch 2015-05-28 16:53:13 -07:00
Stephen Birarda
265e0f3da6 remove NetworkPeer dtor debug, fix ICE socket 2015-05-28 16:44:34 -07:00
Stephen Birarda
493a9da43e make sure DS log handler is cleaned up 2015-05-28 16:23:14 -07:00
Stephen Birarda
9d2e1773a0 fix memory issues for immediate ice pings 2015-05-28 15:31:21 -07:00
Stephen Birarda
da0c9fbc31 fix send of existing peer to querier 2015-05-28 14:37:16 -07:00
Stephen Birarda
e096cbe040 have ice-server immediately send peer to DS 2015-05-28 14:25:18 -07:00
Stephen Birarda
531ef1fa1c change ice-server heartbeat behaviour 2015-05-28 14:05:43 -07:00
Stephen Birarda
eb6b80133b immediately ping the ICE DS every 25ms 2015-05-28 13:17:48 -07:00
Stephen Birarda
81c23e9ca0 output if pinged node cannot be reached 2015-05-28 11:22:27 -07:00
Stephen Birarda
cee058c4ce handle immediate add packets in NodeList 2015-05-28 11:02:45 -07:00
Stephen Birarda
5c75863af4 immediately send add packet from DS for new node 2015-05-28 10:45:03 -07:00
Stephen Birarda
667df66963 add packet type for DS node add 2015-05-27 18:25:38 -07:00
Stephen Birarda
0cb67cce2c add ping timer tied to NetworkPeer 2015-05-27 18:22:23 -07:00
Stephen Birarda
757d02a600 fix reset on address lookup 2015-05-27 16:00:56 -07:00
Stephen Birarda
e6e2c4b95d look for connection steps in LimitedNodeList 2015-05-27 15:54:39 -07:00
Stephen Birarda
734798a365 fix move of connection steps to LNL 2015-05-27 15:50:31 -07:00
Stephen Birarda
c7c542ef4c decouple STUN from DS check in 2015-05-27 14:24:15 -07:00
David Rowe
a2272d3f42 Fix Windows C4351 build warning 
VS2013 warns about default initialization of arrays because it behaved
differently in previous versions. Default initialization is what we expect
now that we're using VS2013 so we can disable this warning globally.
 2015-05-27 11:49:00 -07:00
Stephen Birarda
4b6b34836d repair anomalies in timing table 2015-05-27 10:30:45 -07:00
Stephen Birarda
9cb6ccaa46 thread safe timing of domain connection 2015-05-26 16:49:18 -07:00
Stephen Birarda
d1489c50fe add connection times getter to NodeList 2015-05-26 14:18:58 -07:00