Commit graph

175 commits

Author SHA1 Message Date
Ryan Huffman
63d0205d1e Move domain settings retrieval to UDT 2015-08-18 23:11:33 -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
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
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
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
7c87ee3a72 type and version fixes after refactor 2015-07-29 17:37:33 -07:00
Stephen Birarda
069dff0793 fix bugs from movement of type/version to NLPacket 2015-07-23 16:40:35 -07:00
Stephen Birarda
9e7fb9ae16 shuffle Packet headers, use static enum for PacketType 2015-07-23 13:56:47 -07:00
Stephen Birarda
2a2eb39066 repairs for DS path query and response 2015-07-16 17:08:06 -07:00
Stephen Birarda
863cc3390a fix send of mixed audio stream packet from AM 2015-07-15 17:41:00 -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
Atlante45
b677f8de28 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-15 13:50:52 -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
a79c8ab193 fix check for writing of packet header 2015-07-15 13:17:32 -07:00
Stephen Birarda
e127c5c06d rename Packet methods for clarity 2015-07-15 10:40:40 -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
0327a8d477 fix bytesAvailable, don't double seek in Packet 2015-07-14 20:47:16 -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
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
3cb4be6c02 fix order of setup at startup 2015-07-14 17:04:45 -07:00
Atlante45
fbb6a94579 Merge branch 'receive_packets' of https://github.com/huffman/hifi into protocol 2015-07-14 16:36:28 -07:00
Ryan Huffman
d36ed9cd0d Fix missing semicolon 2015-07-14 16:12:47 -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
Ryan Huffman
a61fbff018 Add error handling when reading path query response 2015-07-14 15:52:28 -07:00
Stephen Birarda
789235b8c7 make NodeList deleter be deleteLater 2015-07-14 15:28:38 -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
Stephen Birarda
d617b71232 remove SharedNodePointer from some packet callbacks 2015-07-14 14:27:26 -07:00
Stephen Birarda
0637f589b5 add PacketListener to help unregister for packets 2015-07-14 13:52:38 -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
Stephen Birarda
e5d8a39dde update DomainServer to new packet receive API 2015-07-13 11:11:52 -07:00
Stephen Birarda
d85fbbfb74 update NodeList for new packet receive code 2015-07-10 17:45:23 -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
Stephen Birarda
9f4e4f1948 fix templated write/read and various write calls 2015-07-08 16:36:09 -07:00