Commit graph

204 commits

Author SHA1 Message Date
Ryan Huffman
cf20701275 Update soloNodeOfType to take NodeType_t 2015-07-23 15:14:25 -07:00
Ryan Huffman
9725184b24 Move dataSent signal from PacketReceiver to LimitedNodeList 2015-07-17 11:05:07 -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
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
b4121eb464 Remove unnecessary move 2015-07-16 13:14:17 -07:00
Ryan Huffman
10c69fefe1 Merge branch 'protocol' of github.com:Atlante45/hifi into protocol 2015-07-16 12:14:36 -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
3cba3d0dcd fix packet receiver cleanup 2015-07-15 16:33:12 -07:00
Ryan Huffman
6502359f04 Update NodeList's PacketReceiver to be a pointer 2015-07-15 16:29:15 -07:00
Stephen Birarda
00c1dce3e5 disconnect readyRead in LimitedNodeList dtor 2015-07-15 16:16:26 -07:00
Stephen Birarda
dd4c2eaccd add seek back for ping packet 2015-07-15 16:10:32 -07:00
Atlante45
f065638748 Ping code cleanup 2015-07-15 15:58:14 -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
Stephen Birarda
6c06d4c49e use fromRawData for writeDatagram, correct type for PingReply 2015-07-15 13:59:58 -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
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
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
e127c5c06d rename Packet methods for clarity 2015-07-15 10:40:40 -07:00
Stephen Birarda
89c44ded38 repairs for domain-server PacketList sending 2015-07-14 21:01:26 -07:00
Stephen Birarda
88f419dfd7 repairs to packet sending/receiving 2015-07-14 18:59:33 -07:00
Atlante45
02e1eaf452 Merge fixes 2015-07-14 17:08:36 -07:00
Atlante45
fbb6a94579 Merge branch 'receive_packets' of https://github.com/huffman/hifi into protocol 2015-07-14 16:36:28 -07:00
Atlante45
aca759aa2f Implement brodcastToNodes 2015-07-14 16:03:42 -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
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
fbd287472d make NodeData parseData take only packet 2015-07-14 14:09:00 -07:00
Stephen Birarda
0637f589b5 add PacketListener to help unregister for packets 2015-07-14 13:52:38 -07:00
Atlante45
c80df94b06 Update includes for moved files 2015-07-13 15:28:55 -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
Atlante45
7a160db8dd sendPacketList first implementation 2015-07-13 12:58:26 -07:00