Commit graph

362 commits

Author SHA1 Message Date
Simon Walton
cfc5892d63 Only clear check-in count on Domain Query related responses 2018-04-30 13:41:56 -07:00
Simon Walton
bfbded7bec Reset pending domain checkins in more locations 2018-04-27 16:57:24 -07:00
Stephen Birarda
779386fbc4 fix setting of domain local ID from domain list 2018-04-23 12:29:02 -07:00
Simon Walton
9f9a68188d Merge remote-tracking branch 'upstream/master' into short-id 2018-04-20 11:10:21 -07:00
John Conklin II
92bf99f436
Merge pull request #12786 from huffman/fix/node-list-connections
Fix avatars not coming back when briefly disconnected from avatar mixer
2018-04-20 09:53:50 -07:00
Clément Brisset
482f8ddbff
Merge pull request #12913 from birarda/bug/login-no-perms
delay NL reset on login until new username is known
2018-04-18 13:31:56 -07:00
Stephen Birarda
898d61fcf7 delay NL reset on login until new username known 2018-04-16 17:45:05 -07:00
Ryan Huffman
e9d2912576 Update variable naming in NodeList from Id to ID 2018-04-16 12:03:58 -07:00
Seth Alves
426d18ed2a code review 2018-04-13 13:20:06 -07:00
Seth Alves
f81836c830 support specification of named landing-points in serverless-domain json files 2018-04-10 14:25:59 -07:00
Ryan Huffman
2546ff91ca Fix nodelist connections not resetting on both ends
This change adds a connection ID to ping packets. Each node keeps a
connection id for each other node that it has connected to. When a node
is removed the connection id is incremented. If a node sees another node
with a higher connection id, it will reset its connection with the new
connection id, ensuring that local state is reset on both ends when
nodes lose contact.
2018-04-04 11:53:05 -07:00
Simon Walton
f823f63211 Add domain local ID to DomainServerList
Also handle domain local ID for 'domain sourced' packets;
bump packet version.
2018-03-28 13:27:43 -07:00
Simon Walton
bed4033554 Local node IDs now working correctly
Move typedef to single location; fixes for replicated packets
(probably still not correct); reserve zero as local ID;
pass domain server's local ID in domain server list;
other tweaks.
2018-03-27 18:18:14 -07:00
Simon Walton
d3464378b7 Short local source IDs - checkpoint
DS assigns 16-bit IDs as well as UUIDs; ACs track mappings;
nodes use short IDs in packets. Initial setup works; then
fails prob. due to DS UUID.
2018-03-27 13:46:58 -07:00
Simon Walton
4ec77e3af6 WIP - assign short IDs to nodes and distribute them. 2018-03-26 14:57:59 -07:00
Seth Alves
a6c3bcd8d8 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-05 08:51:12 -08:00
Atlante45
85b4c3b422 Protect session UUID from concurrent read/writes 2018-03-02 17:34:18 -08:00
Seth Alves
33065fb51c more consistent variable names. rework DomainManager and AddressManager methods to take a url rather than host and port 2018-03-01 11:07:37 -08:00
John Conklin II
d084e58f48
Merge pull request #12328 from Atlante45/fix/misc-bugs
Misc bug fixes
2018-02-12 14:31:38 -08:00
Stephen Birarda
eb9d100fc8 reset count on conn refusal, soft reset DH in Interface on limit reached 2018-02-02 13:47:48 -08:00
Stephen Birarda
e16a3859c2 reset silent check in packet check on domain connection reset 2018-02-02 13:47:48 -08:00
Atlante45
8ebb3e52d8 Misc bug fixes 2018-02-02 13:10:49 -08:00
David Rowe
309e7f7333 Tidying 2018-01-11 14:48:45 +13:00
Stephen Birarda
8978254037 kick logged in by fingerprint/ip if enabled in DS settings 2017-11-27 18:23:14 -08:00
Ken Cooke
cfba6ae819 Implement master avatar gain in the audio-mixer 2017-10-31 11:18:03 -07:00
Ken Cooke
6ba2a83bbe Send and receive Avatar MASTER Gain packets, signaled using null nodeID.
Packet protocol change is not needed (existing audio-mixer will ignore).
2017-10-29 10:47:56 -07:00
Stephen Birarda
10d05ba6c9 only respond to expected ICE peers in DS 2017-10-26 16:34:49 -07:00
Bradley Austin Davis
b93e91b9f3 New android toolchain 2017-09-19 13:45:12 -07:00
Stephen Birarda
2d0c5ff37a remove preloading of allowed user keys since it happens on connect 2017-07-25 11:41:34 -07:00
Clément Brisset
bcc9cf7c60 Merge pull request #10947 from Atlante45/fix/ignore-ac-crash
Fix Avatar/Audio Mixer crash
2017-07-18 09:59:30 -07:00
Stephen Birarda
f6d9a79fb5 Revert "Revert "fix for invisible avatars after radius ignore"" 2017-07-12 10:36:53 -07:00
Atlante45
bf13d0cc80 Send ordered packet lists for ignore feature 2017-07-11 17:12:12 -07:00
Stephen Birarda
420e9233b6 Revert "fix for invisible avatars after radius ignore" 2017-07-07 16:50:28 -07:00
Stephen Birarda
f07ce6d294 Merge pull request #10835 from birarda/bug/invisible-avatars
fix for invisible avatars after radius ignore
2017-07-07 16:06:44 -07:00
Brad Davis
6fc82bb351 Switch to preprocessor macro for blocking invokes to capture function information 2017-06-30 11:36:24 -07:00
Brad Davis
b52dd7b822 Don't use blocking connections on the main thread 2017-06-29 20:45:17 -07:00
Stephen Birarda
be37998b47 remove stray semicolon in NodeList 2017-06-28 10:11:55 -07:00
Stephen Birarda
9e822de196 remove local collection of radius ignored nodes 2017-06-27 17:41:07 -07:00
Stephen Birarda
8b7eaaa23a activate the public socket always for upstream/downstream servers 2017-06-22 13:33:57 -07:00
Stephen Birarda
ea45e341ee send upstream nodes down to avatar/audio 2017-06-22 13:33:57 -07:00
Stephen Birarda
c332244f4f fix race for isUpstream and node hole punch 2017-06-15 17:34:20 -07:00
Stephen Birarda
224a559602 keep downstream nodes around in domain, alive in upstream 2017-06-14 17:17:14 -07:00
Ryan Huffman
785156ad9f Move downstram server adding to DS 2017-06-14 16:54:04 -07:00
Stephen Birarda
63c8273a41 do not send keep alive pings to upstream nodes 2017-06-12 16:29:20 -07:00
Stephen Birarda
880157695a do not attempt to hole punch an upstream node 2017-06-12 16:29:20 -07:00
Stephen Birarda
4042e04946 add isDownstream for cleaner conditionals 2017-06-12 16:29:20 -07:00
Stephen Birarda
88af8b5842 use new downstream/upstream nomeclature 2017-06-12 16:29:20 -07:00
Stephen Birarda
2929573cb0 do not punch to replicant nodes 2017-06-12 16:29:20 -07:00
Ryan Huffman
4851d3b564 Remove superfluous node log 2017-06-12 14:52:02 -07:00
Ryan Huffman
84e1a6f893 Rename isReplicant to isReplicated 2017-06-12 13:38:58 -07:00