Commit graph

1089 commits

Author SHA1 Message Date
Ryan Huffman
2f0c21a603 Temporarily disable packet dispatching in PacketReceiver 2015-07-10 12:24:35 -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
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
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
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