Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 12:11:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
29138 commits 75 branches 59 tags 1.2 GiB
Commit graph

1292 commits

Author SHA1 Message Date
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
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