Seth Alves
|
8cadd299a2
|
Merge branch 'master' of github.com:highfidelity/hifi into ice-troubles-1
|
2016-09-23 13:16:26 -07:00 |
|
Seth Alves
|
bd2ee56a27
|
fix domain-server command-line arguments
|
2016-09-22 12:45:49 -07:00 |
|
Seth Alves
|
7dc8a48dba
|
Merge branch 'ice-troubles' of github.com:sethalves/hifi into ice-troubles-1
|
2016-09-21 10:08:17 -07:00 |
|
Seth Alves
|
b9ea93de57
|
use qWarning rather than qCritical because qCritical may exit
|
2016-09-21 10:08:02 -07:00 |
|
Seth Alves
|
a3aea774fe
|
tell metaverse ice-server is 0.0.0.0 when domain-server doesn't have one
|
2016-09-21 10:07:12 -07:00 |
|
Seth Alves
|
ba8aa5b50c
|
fix camelcase
|
2016-09-19 16:38:34 -07:00 |
|
Seth Alves
|
571aaac4d7
|
Merge branch 'master' of github.com:highfidelity/hifi into ice-troubles
|
2016-09-19 15:37:53 -07:00 |
|
Seth Alves
|
8108557e10
|
whitespace
|
2016-09-19 15:37:50 -07:00 |
|
Brad Hefta-Gaub
|
fd474f6319
|
add basic support for master vs stable builds
|
2016-09-19 14:14:32 -07:00 |
|
Seth Alves
|
45b48c01bf
|
command-line arguments to control ice-server ip address and domain-server ID
|
2016-09-19 13:39:42 -07:00 |
|
Brad Hefta-Gaub
|
3d54600843
|
Merge pull request #8513 from Atlante45/feat/network-port
Add settings to change local port
|
2016-09-08 18:10:32 -07:00 |
|
SamGondelman
|
9d447d4dcc
|
enabled qnetworkrequest redirects everywhere I could find them
|
2016-09-06 17:35:06 -07:00 |
|
Atlante45
|
eb007b24cd
|
Use invalid port to signal no value passed
|
2016-09-06 11:59:07 -07:00 |
|
Stephen Birarda
|
43b8e01d46
|
don't force auto networking on non metaverse domains
|
2016-08-23 11:21:15 -07:00 |
|
Stephen Birarda
|
d098a1ae28
|
allow temporary domains to use an access token when present
|
2016-08-22 10:50:39 -07:00 |
|
Zander Otavka
|
3df8aa0dba
|
Suppress repeated ice server connection messages
|
2016-08-08 17:01:32 -07:00 |
|
Stephen Birarda
|
f3e30221f0
|
only force a new temp name if already a temp domain-server
|
2016-08-04 09:33:31 -07:00 |
|
Stephen Birarda
|
ba49fd2c61
|
don't heartbeat immediately unless metaverse domain
|
2016-08-04 09:33:31 -07:00 |
|
Stephen Birarda
|
5b04ab6d53
|
add node kick request handling to DS
|
2016-08-02 14:35:11 -07:00 |
|
Seth Alves
|
60d6673950
|
switch data-web urls to point at production server rather than dev one
|
2016-08-01 12:00:08 -07:00 |
|
Seth Alves
|
96fd1cb841
|
Merge branch 'master' of github.com:highfidelity/hifi into groups
|
2016-07-22 11:40:29 -07:00 |
|
Howard Stearns
|
51bc3c51ca
|
less logging, change constant name.
|
2016-07-21 08:35:21 -07:00 |
|
Seth Alves
|
c1b27a9249
|
Merge branch 'master' of github.com:highfidelity/hifi into groups
|
2016-07-20 10:03:22 -07:00 |
|
howard-stearns
|
98f76924c5
|
log hearbeat like we do updates
|
2016-07-18 14:49:56 -07:00 |
|
howard-stearns
|
1a66574adb
|
add protocol version signature to metaverse heartbeat
|
2016-07-18 14:29:49 -07:00 |
|
Seth Alves
|
599b892296
|
refresh cached group information every 15 seconds
|
2016-07-14 11:20:57 -07:00 |
|
Seth Alves
|
0e86be8660
|
use dev metaverse
|
2016-07-13 14:48:23 -07:00 |
|
Seth Alves
|
02ce2468df
|
Merge branch 'master' of github.com:highfidelity/hifi into groups
|
2016-07-12 13:46:29 -07:00 |
|
Clément Brisset
|
2f07f0d24f
|
Revert "Revert "Fix crash in packet list""
|
2016-07-12 11:39:16 -07:00 |
|
Clément Brisset
|
d933238bda
|
Revert "Fix crash in packet list"
|
2016-07-08 18:15:14 -07:00 |
|
Atlante45
|
97da515585
|
Assign random UUID to DS without one.
|
2016-07-08 15:15:58 -07:00 |
|
Seth Alves
|
55d76abf48
|
back-out accidently changed api urls
|
2016-07-06 16:42:31 -07:00 |
|
Seth Alves
|
e6f456f494
|
each rank in a group has its own permissions
|
2016-07-06 16:39:08 -07:00 |
|
Seth Alves
|
aae42e3802
|
updates to track zach's changes to api
|
2016-06-30 16:14:46 -07:00 |
|
Seth Alves
|
408a77dd13
|
merge from upstream
|
2016-06-29 18:49:33 -07:00 |
|
Seth Alves
|
d4cc4bf1e4
|
represent node permissions as a bitfield rather than a list of bools
|
2016-06-27 14:55:13 -07:00 |
|
Brad Hefta-Gaub
|
cea4b27b4d
|
Merge pull request #8128 from zzmp/feat/heartbeat-build-version
add build version to heartbeat
|
2016-06-24 12:20:16 -07:00 |
|
Zach Pomerantz
|
1fcd7aa0c4
|
add build version to heartbeat
|
2016-06-23 19:55:16 -07:00 |
|
Zach Pomerantz
|
b1b378a91f
|
add back access token to domain-server
|
2016-06-23 19:38:41 -07:00 |
|
Zach Pomerantz
|
13310923c4
|
reset to temp domain after logout
|
2016-06-23 19:38:23 -07:00 |
|
Zach Pomerantz
|
4a30d549ad
|
force temp domain reset on 404 too (401 already)
|
2016-06-22 12:04:26 -07:00 |
|
Zach Pomerantz
|
a6115cba6e
|
update temporary domains to use api_key
|
2016-06-22 12:04:26 -07:00 |
|
Zach Pomerantz
|
b6b73af2b4
|
Clean up domain-server setup
|
2016-06-22 12:02:35 -07:00 |
|
Zach Pomerantz
|
25b21dacda
|
clean domain metadata and update acl
|
2016-06-20 13:44:14 -07:00 |
|
Zach Pomerantz
|
1ce9e96cba
|
Send domain metadata for authed domains
|
2016-06-16 13:00:28 -07:00 |
|
Seth Alves
|
4c45d081cd
|
merge from upstream
|
2016-06-10 19:57:46 -07:00 |
|
Stephen Birarda
|
f963adb5dd
|
send connection denial for connect version mismatch
|
2016-06-09 15:53:19 -07:00 |
|
Stephen Birarda
|
4b5a554122
|
remove check in version downgrading from NodeList
|
2016-06-09 15:53:19 -07:00 |
|
Seth Alves
|
441b5a20d8
|
merge from upstream
|
2016-06-09 13:23:41 -07:00 |
|
Zach Pomerantz
|
9926c80917
|
Only check user metadata before sending
|
2016-06-08 18:45:01 -05:00 |
|
Seth Alves
|
0c18df6278
|
don't restart domain-server if the only settings changes where permissions
|
2016-06-06 16:32:18 -07:00 |
|
Seth Alves
|
80eeff5a64
|
bump packet versions. change how domainObject[RESTRICTED_ACCESS_FLAG] is decided
|
2016-06-04 10:32:07 -07:00 |
|
Zach Pomerantz
|
55e5c1f6e0
|
Declare metadata descriptors
|
2016-06-03 15:00:42 -07:00 |
|
Zach Pomerantz
|
5c293646b9
|
Segment metadata users
|
2016-06-02 17:22:39 -07:00 |
|
Zach Pomerantz
|
85055d82bf
|
Regenerate Domain metadata on user (dis)connect
|
2016-06-02 17:05:58 -07:00 |
|
Seth Alves
|
41a8e9fa91
|
missed a protocol change
|
2016-06-02 16:53:52 -07:00 |
|
Zach Pomerantz
|
b13e7a1a8f
|
Encapsulate metadata in DomainMetadata
|
2016-06-02 16:04:27 -07:00 |
|
Seth Alves
|
fc92268641
|
Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid
|
2016-06-02 15:38:24 -07:00 |
|
Zach Pomerantz
|
18696144f1
|
Move metadata generation to DomainMetadata
|
2016-06-02 15:36:29 -07:00 |
|
Zach Pomerantz
|
87e27d9570
|
Factor out metadata generation from heartbeat
|
2016-06-02 15:35:47 -07:00 |
|
Zach Pomerantz
|
bf920c2b80
|
Compact Domain heartbeat JSON
|
2016-06-02 15:34:36 -07:00 |
|
Seth Alves
|
83f2c723eb
|
collect permissions into their own data structure
|
2016-06-02 13:15:30 -07:00 |
|
Zach Pomerantz
|
b280eebd03
|
Only count users against max capacity
|
2016-05-27 15:51:41 -07:00 |
|
Brad Hefta-Gaub
|
2eef07e414
|
cleanup and dead code removal
|
2016-05-24 15:38:08 -07:00 |
|
Brad Hefta-Gaub
|
1d9981e624
|
first cut at support for verifying all protocol version compatibility
|
2016-05-24 13:31:19 -07:00 |
|
Stephen Birarda
|
5ab876114f
|
send hostname to DS with every DS packet to handle changes
|
2016-05-20 11:24:54 -07:00 |
|
Stephen Birarda
|
962066c7d1
|
send user hostname breakdown with heartbeat
|
2016-05-20 11:24:54 -07:00 |
|
Stephen Birarda
|
5884e1eadd
|
rename metaverse heartbeat methods
|
2016-05-20 11:24:54 -07:00 |
|
Ryan Huffman
|
79ce64aa3a
|
Fix compilation error in DomainServer.cpp
|
2016-05-18 15:38:54 -07:00 |
|
Ryan Huffman
|
dd093e3fcd
|
Make AccountManager a DependencyManager singleton
|
2016-05-18 15:38:54 -07:00 |
|
Stephen Birarda
|
84df6cfed0
|
only re-request ice addresses during failure
|
2016-04-14 14:46:08 -07:00 |
|
Stephen Birarda
|
3f0ffc0aff
|
update ice-server address with API, add failed and clear denials
|
2016-04-14 10:33:17 -07:00 |
|
Stephen Birarda
|
55002b8d5e
|
add ice server address to hearbeat if full networking is on
|
2016-04-14 09:27:43 -07:00 |
|
Stephen Birarda
|
ab414f65eb
|
output success on first connection to new ice-server
|
2016-04-12 18:23:51 -07:00 |
|
Stephen Birarda
|
f69f59fa90
|
handle ice fail for no reply heartbeat in DS
|
2016-04-12 18:19:02 -07:00 |
|
Stephen Birarda
|
f1209dc82d
|
fix index randomization for single candidate ice-server
|
2016-04-12 18:04:32 -07:00 |
|
Stephen Birarda
|
f975f480b4
|
use the random device for random number generation
|
2016-04-12 17:46:47 -07:00 |
|
Stephen Birarda
|
b5fe6120aa
|
base randomization of ice-server from ice.highfidelity.com
|
2016-04-12 17:41:47 -07:00 |
|
Stephen Birarda
|
455d2d5048
|
allow for an empty password with a username
|
2016-04-12 09:37:26 -07:00 |
|
Stephen Birarda
|
7cd115f421
|
store and transmit passwords as SHA256 hash
|
2016-04-05 14:11:12 -07:00 |
|
Stephen Birarda
|
5054243655
|
compare HTTP auth password to base 64 settings value
|
2016-04-05 14:11:12 -07:00 |
|
Stephen Birarda
|
078872a6db
|
correct returned OAuth redirect URL
|
2016-03-21 15:26:26 -07:00 |
|
Stephen Birarda
|
7f3761481c
|
don't store UUIDs for cookies on disk
|
2016-03-21 15:22:32 -07:00 |
|
Stephen Birarda
|
510e8e89f2
|
fix a crash in DS with missing cert/key
|
2016-03-21 15:22:05 -07:00 |
|
Stephen Birarda
|
f44cf3903c
|
re-instate verified domain ownership for full automatic networking
This reverts commit 34408c8144 .
|
2016-03-01 13:04:37 -08:00 |
|
Stephen Birarda
|
34408c8144
|
Revert "verified domain ownership for full automatic networking"
|
2016-02-25 17:02:08 -08:00 |
|
Stephen Birarda
|
f1aca57543
|
remove a tab in whitespace only line
|
2016-02-24 16:30:34 -08:00 |
|
Stephen Birarda
|
f8392e62a8
|
some wording tweaks in comments
|
2016-02-23 17:43:01 -08:00 |
|
Stephen Birarda
|
0191d75e86
|
allow temporary domain to upload public key
|
2016-02-23 17:29:15 -08:00 |
|
Stephen Birarda
|
3a800350c9
|
re-set the ice heartbeat packet if keypair changes
|
2016-02-23 15:42:28 -08:00 |
|
Stephen Birarda
|
96ed19100b
|
use ice-server heartbeat denial to trigger keypair re-gen
|
2016-02-23 15:26:13 -08:00 |
|
Stephen Birarda
|
4b4ea25ed6
|
immediately send ice heartbeat once keypair is ready
|
2016-02-23 11:24:26 -08:00 |
|
Stephen Birarda
|
83e8c248bd
|
repairs to failure case for keypair generation
|
2016-02-23 11:20:21 -08:00 |
|
Stephen Birarda
|
e2f02347dd
|
repairs to issues discovered during ID change
|
2016-02-23 10:57:54 -08:00 |
|
Stephen Birarda
|
d510ee0e47
|
complete ice-server signature verification
|
2016-02-22 18:00:05 -08:00 |
|
Stephen Birarda
|
9f9ef8764d
|
add a note about the QDataStream black box
|
2016-02-22 15:32:59 -08:00 |
|
Stephen Birarda
|
11a1bc4488
|
add signed heartbeat sending to domain-server
|
2016-02-22 15:12:02 -08:00 |
|
Stephen Birarda
|
90e9089e85
|
repairs for storage of domain ID in AM accounts file
|
2016-02-22 13:23:01 -08:00 |
|
Stephen Birarda
|
e30b2b7051
|
generate new domain keypair on domain ID change
|
2016-02-22 10:28:32 -08:00 |
|
Stephen Birarda
|
837c4c0810
|
handle upload of domain public key to metaverse API
|
2016-02-19 16:55:12 -08:00 |
|
Stephen Birarda
|
fa5f2571d7
|
cleanup migrations from previous account file system
|
2016-02-19 16:31:31 -08:00 |
|
Stephen Birarda
|
98b06112bd
|
handle persistence of AccountManager info to sep file
|
2016-02-19 15:45:20 -08:00 |
|
Stephen Birarda
|
af181e00b1
|
allow for creation of domain-server keypair in AccountManager
|
2016-02-19 14:34:19 -08:00 |
|
Brad Hefta-Gaub
|
c699c828cd
|
Merge pull request #7092 from birarda/assets-abs-path
add setting to DS for asset path, handle absolute paths
|
2016-02-12 17:43:23 -08:00 |
|
Stephen Birarda
|
0f4467c582
|
cleanup exit codes for queued DS exit
|
2016-02-11 15:17:34 -08:00 |
|
Stephen Birarda
|
aaf8e60de3
|
delay critical quit messages until just prior to quit
|
2016-02-11 15:11:21 -08:00 |
|
Stephen Birarda
|
a089c43fdc
|
don't send ice heartbeat with no ice-server socket
|
2016-02-11 14:07:05 -08:00 |
|
Ryan Huffman
|
811859e46f
|
Update domain server to store temporary AC scripts in memory
|
2016-02-10 15:26:01 -08:00 |
|
Stephen Birarda
|
095f0b9349
|
rename canAdjustLocks to isAllowedEditor for multi-purpose
|
2016-02-01 16:46:11 -08:00 |
|
Atlante45
|
9330c3d4f3
|
Fix DS assignment scripts responses
|
2016-01-22 16:04:38 -08:00 |
|
Atlante45
|
822244ef72
|
Fix DS new assignment feature
|
2016-01-22 13:37:19 -08:00 |
|
Brad Hefta-Gaub
|
58b7708315
|
Merge pull request #6899 from birarda/fix-go-home
repairs to index path behaviour
|
2016-01-21 21:29:24 -08:00 |
|
Stephen Birarda
|
9061e33a1f
|
send path query once connected to domain
|
2016-01-21 18:24:17 -08:00 |
|
Stephen Birarda
|
15c922f4a5
|
always respond with default index path
|
2016-01-21 18:24:16 -08:00 |
|
Atlante45
|
db18d188b8
|
Fix wifi ping spikes
Moves the setting of Qt's bearer poll timeout earlier to be sure
it's caught.
|
2016-01-21 15:05:32 -08:00 |
|
Stephen Birarda
|
0d80e9dc1f
|
setup ice heartbeat if auto networking enabled
|
2016-01-19 16:42:57 -08:00 |
|
Stephen Birarda
|
4cbbd24c7e
|
complete handling of immediate temp name grab
|
2016-01-19 13:04:05 -08:00 |
|
Stephen Birarda
|
a27d35566d
|
stub of temporary name download on DS start
|
2016-01-19 10:49:18 -08:00 |
|
Stephen Birarda
|
0b118a8e98
|
replace ApplicationVersion with BuildInfo
|
2016-01-15 15:41:34 -08:00 |
|
Ryan Huffman
|
a5eb54b1b7
|
Move DomainServer script location to app data directory
|
2016-01-15 10:36:09 -08:00 |
|
Ryan Huffman
|
4851def51c
|
Add status HTTP server to AC Monitor
|
2016-01-08 10:35:04 -08:00 |
|
Ryan Huffman
|
dac491ef41
|
Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message
|
2015-11-24 09:59:22 -08:00 |
|
Clément Brisset
|
5d75fcbfce
|
Merge pull request #6430 from birarda/unique_linked_data
use a unique_ptr for linkedData in Node
|
2015-11-20 15:01:41 -08:00 |
|
Stephen Birarda
|
b34934b849
|
resolve conflicts on merge with upstream/master
|
2015-11-20 11:52:53 -08:00 |
|
Stephen Birarda
|
3b40119992
|
use Agent session UUID to request script
|
2015-11-20 11:35:24 -08:00 |
|
Stephen Birarda
|
271387f96e
|
use a unique_ptr for linkedData in Node
|
2015-11-18 18:03:31 -08:00 |
|
Stephen Birarda
|
3fba1f8445
|
better variable naming for nodeToKill
|
2015-11-18 17:46:32 -08:00 |
|
Stephen Birarda
|
f4cf1c0291
|
only broadcast removed node messages to interested nodes
|
2015-11-18 17:45:18 -08:00 |
|
Ryan Huffman
|
2a416ebc61
|
Merge branch 'master' of https://github.com/highfidelity/hifi into received-message
|
2015-11-18 16:52:23 -08:00 |
|
Brad Hefta-Gaub
|
40e69f6946
|
Merge branch 'master' of https://github.com/highfidelity/hifi into messaging
|
2015-11-16 15:31:06 -08:00 |
|
Brad Hefta-Gaub
|
d42a1a721f
|
first cut at messages-mixer
|
2015-11-16 15:26:17 -08:00 |
|
Stephen Birarda
|
584e35e4ab
|
have killNodeWithUUID return success to avoid double lookup
|
2015-11-16 10:58:11 -08:00 |
|
Stephen Birarda
|
e52e9be44c
|
re-broadcast disconnects from domain-server
|
2015-11-12 17:23:39 -08:00 |
|
Stephen Birarda
|
1c9396d66e
|
handle disconnect request in domain-server
|
2015-11-12 15:43:03 -08:00 |
|
Ryan Huffman
|
9ddcfdf94d
|
Cleanup PacketReceier and ReceivedMessage
|
2015-10-16 09:21:10 -07:00 |
|
Ryan Huffman
|
7682ab00e3
|
Add ReceivedMessage and receive progress
|
2015-10-15 14:09:53 -07:00 |
|
Stephen Birarda
|
7987595dcd
|
set the bearer poll timeout for wlan scan in Qt 5.5
|
2015-10-08 11:32:10 -07:00 |
|
Stephen Birarda
|
e835b5ccf3
|
remove old gnutls code from domain-server
|
2015-10-05 15:30:26 -07:00 |
|
Stephen Birarda
|
030404157e
|
cleanup Assignment grab from iterator
|
2015-09-21 11:54:41 -07:00 |
|
Stephen Birarda
|
e21c1cb67c
|
make sure server/mixers are first in FIFO
|
2015-09-21 11:51:53 -07:00 |
|
Atlante45
|
15f7745bcc
|
JSON stats reliable and ordered
|
2015-09-11 14:21:54 +02:00 |
|
Atlante45
|
5808658958
|
Make NodeJSONStats reliable
|
2015-09-11 14:21:53 +02:00 |
|
Stephen Birarda
|
e3e529c4e5
|
resolve conflicts on merge with origin/protocol
|
2015-08-27 14:52:29 -07:00 |
|
Stephen Birarda
|
80cf7b6c76
|
resolve conflicts on merge with upstream/master
|
2015-08-27 14:50:04 -07:00 |
|
Stephen Birarda
|
352f3543c3
|
resolve conflicts on merge with ds-cleanup
|
2015-08-26 13:33:50 -07:00 |
|
Stephen Birarda
|
c8545c8aeb
|
remove an empty line
|
2015-08-26 12:37:47 -07:00 |
|
Stephen Birarda
|
dc1f726283
|
don't assign the asset-server in domain by default
|
2015-08-26 12:36:48 -07:00 |
|
Ryan Huffman
|
aa7d8678e1
|
Merge branch 'protocol' of github.com:birarda/hifi into atp-server
|
2015-08-26 12:26:11 -07:00 |
|
Atlante45
|
179ee73e26
|
Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol
|
2015-08-26 16:50:33 +02:00 |
|
Ryan Huffman
|
4e3d0758e5
|
Remove UNUSED_2
|
2015-08-25 15:07:07 -07:00 |
|
Stephen Birarda
|
d2acf327dd
|
fix NodeConnectionData discrepancy on request
|
2015-08-24 14:43:49 -07:00 |
|
Stephen Birarda
|
e8772277de
|
de-bloat the domain-server by adding a DomainGatekeeper
|
2015-08-24 14:19:33 -07:00 |
|
Stephen Birarda
|
aac15e52bb
|
add explicit cast to double for uptime
|
2015-08-20 10:19:34 -07:00 |
|
Stephen Birarda
|
74d6e5ba89
|
make sure LNL goes down before domain-server
|
2015-08-20 10:01:12 -07:00 |
|
Stephen Birarda
|
2738f65c10
|
have domain-server report non-skewed uptime
|
2015-08-19 18:23:11 -07:00 |
|
Ryan Huffman
|
63d0205d1e
|
Move domain settings retrieval to UDT
|
2015-08-18 23:11:33 -07:00 |
|
Stephen Birarda
|
0f77ab8611
|
resolve conflicts on merge with upstream/master
|
2015-08-18 11:45:55 -07:00 |
|
Leonardo Murillo
|
7c4813f1cf
|
Another versioning checkpoint + cleanup
|
2015-08-13 16:35:55 -06:00 |
|
Leonardo Murillo
|
cda5b29fd3
|
Another take at versioning details exchange - checkpoint
|
2015-08-13 14:19:13 -06:00 |
|
bwent
|
ffccc9ca96
|
clean up formatting, make connectionUUID const in NodeList
|
2015-08-06 10:11:22 -07:00 |
|
bwent
|
73ea958640
|
add check if user is local user
|
2015-08-06 09:01:25 -07:00 |
|
bwent
|
a8f9f9d746
|
clean-up formatting
|
2015-08-05 17:43:03 -07:00 |
|
bwent
|
45e3eafce3
|
Remove ERR_get_error call
|
2015-08-05 16:00:25 -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
|
fc385d9bc1
|
debugging
|
2015-08-05 10:29:30 -07:00 |
|
bwent
|
b9364a47a1
|
Debug null QUuid being stored in conenctionTokenHash
|
2015-08-04 15:31:26 -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
|
b68c7fd92a
|
first adjustment in NLPacket after type is known
|
2015-07-23 16:59:08 -07:00 |
|
Stephen Birarda
|
9556fecbe2
|
initial changes to make _nodeSocket a udt::Socket
|
2015-07-20 17:10:22 -07:00 |
|
Stephen Birarda
|
0f534b9f7b
|
fixes for new read and NLPacketList
|
2015-07-17 15:43:20 -07:00 |
|
Atlante45
|
d505527e5a
|
Remove setExtendedheader call
|
2015-07-17 15:38:36 -07:00 |
|
Stephen Birarda
|
8ff8a17f02
|
remove TODO added for DS, check sockets
|
2015-07-17 14:17:48 -07:00 |
|
Stephen Birarda
|
2a2eb39066
|
repairs for DS path query and response
|
2015-07-16 17:08:06 -07:00 |
|
Stephen Birarda
|
487969ef7a
|
pack reason size as quint16
|
2015-07-16 16:45:16 -07:00 |
|
Stephen Birarda
|
f31675c4c6
|
fix ice-server packets
|
2015-07-16 14:21:37 -07:00 |
|
Stephen Birarda
|
e90ace6231
|
fix child assignment UUID, adjust for NLPacket after unpack
|
2015-07-15 12:37:30 -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
|
ccc2649d26
|
fix packing of domain list header
|
2015-07-14 21:14:15 -07:00 |
|
Stephen Birarda
|
89c44ded38
|
repairs for domain-server PacketList sending
|
2015-07-14 21:01:26 -07:00 |
|
Stephen Birarda
|
a5ca1f7125
|
fix variable setup in Packet constructor
|
2015-07-14 19:15:18 -07:00 |
|
Atlante45
|
3abde577e2
|
Merge branch 'protocol' of https://github.com/birarda/hifi into protocol
|
2015-07-14 16:58:26 -07:00 |
|
Stephen Birarda
|
15ca129005
|
fix for registration of methods with typedef
|
2015-07-14 16:46:17 -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
|
d8bec3983f
|
Merge branch 'atp' of github.com:birarda/hifi into receive_packets
Conflicts:
domain-server/src/DomainServer.cpp
|
2015-07-14 16:13:54 -07:00 |
|
Stephen Birarda
|
6d6b9b8117
|
pass sending node to processListRequestPacket
|
2015-07-14 16:11:48 -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
|
4d9b28688d
|
Update reinterpret_cast call that should be dynamic_cast
|
2015-07-14 14:49:51 -07:00 |
|
Ryan Huffman
|
84796b20e0
|
Fix call to constructICEPingReplyPacket
|
2015-07-14 14:45:45 -07:00 |
|
Ryan Huffman
|
90407e2720
|
Remove redundant check in if
|
2015-07-14 14:45:32 -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
|
81ad0056c3
|
Fix a few node deref
|
2015-07-13 15:34:37 -07:00 |
|
Atlante45
|
c80df94b06
|
Update includes for moved files
|
2015-07-13 15:28:55 -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
|
3d62162812
|
cleanup octree networking code to use new API
|
2015-07-13 09:40:26 -07:00 |
|
Stephen Birarda
|
d85fbbfb74
|
update NodeList for new packet receive code
|
2015-07-10 17:45:23 -07:00 |
|
Stephen Birarda
|
11a4c20a21
|
fix payloadSize write in DomainServer
|
2015-07-09 12:23:54 -07:00 |
|
Stephen Birarda
|
cafa8b65f5
|
specify the size of the DTLS required packet
|
2015-07-09 12:07:18 -07:00 |
|
Stephen Birarda
|
adf2ce85f1
|
pack the size of the connection denied reason
|
2015-07-09 12:03:15 -07:00 |
|
Stephen Birarda
|
a363f42bb2
|
pass const NLPacket& for all sendUnreliablePacket calls
|
2015-07-09 11:42:18 -07:00 |
|
Stephen Birarda
|
6cf0018914
|
repairs required for domain-server build
|
2015-07-09 11:07:13 -07:00 |
|
Stephen Birarda
|
74940a2132
|
replace lingering PacketTypes in old format
|
2015-07-08 10:18:13 -07:00 |
|
Ryan Huffman
|
60538d4a82
|
Merge branch 'atp' of github.com:birarda/hifi into atp
Conflicts:
libraries/audio-client/src/AudioIOStats.cpp
|
2015-07-07 16:26:22 -07:00 |
|
Ryan Huffman
|
3690ecc28f
|
Add std::move to sendPacket calls
|
2015-07-07 16:24:11 -07:00 |
|
Stephen Birarda
|
1f68ad892a
|
replace PacketList usage with NLPacketList
|
2015-07-07 16:14:57 -07:00 |
|
Stephen Birarda
|
bb15326676
|
repair send of path query packet
|
2015-07-07 16:02:21 -07:00 |
|
Stephen Birarda
|
6064a2d4e2
|
CR fixes for DomainServer
|
2015-07-07 15:21:20 -07:00 |
|
Stephen Birarda
|
ea3f61a0c5
|
remove use of payload in DomainServer
|
2015-07-06 17:17:40 -07:00 |
|
Stephen Birarda
|
3fa785c545
|
fix domain check in packets for new API
|
2015-07-06 17:03:26 -07:00 |
|
Stephen Birarda
|
33a9a04d9e
|
allow a packet to be created with extended header
|
2015-07-06 16:18:49 -07:00 |
|
Stephen Birarda
|
57d76f488c
|
make PacketPayload a QIODevice subclass
|
2015-07-06 11:33:46 -07:00 |
|
Stephen Birarda
|
8dd91b8795
|
don't force source ID on ICE ping packets
|
2015-07-02 17:34:52 -07:00 |
|
Stephen Birarda
|
0d64e82fe2
|
replace PacketType declarations with PacketType::Value
|
2015-07-02 16:38:52 -07:00 |
|
Stephen Birarda
|
e91ee7e7e3
|
only send add packet for nodes in interest set
|
2015-05-29 09:49:54 -07:00 |
|
Stephen Birarda
|
cb7b23f346
|
install DS message handler in DomainServer
|
2015-05-28 17:04:15 -07:00 |
|
Stephen Birarda
|
29d3ca85d9
|
cleanup debug logs for DS/node ping punch
|
2015-05-28 16:53:13 -07:00 |
|
Stephen Birarda
|
493a9da43e
|
make sure DS log handler is cleaned up
|
2015-05-28 16:23:14 -07:00 |
|
Stephen Birarda
|
9d2e1773a0
|
fix memory issues for immediate ice pings
|
2015-05-28 15:31:21 -07:00 |
|
Stephen Birarda
|
e096cbe040
|
have ice-server immediately send peer to DS
|
2015-05-28 14:25:18 -07:00 |
|
Stephen Birarda
|
531ef1fa1c
|
change ice-server heartbeat behaviour
|
2015-05-28 14:05:43 -07:00 |
|
Stephen Birarda
|
5c75863af4
|
immediately send add packet from DS for new node
|
2015-05-28 10:45:03 -07:00 |
|
Stephen Birarda
|
c7c542ef4c
|
decouple STUN from DS check in
|
2015-05-27 14:24:15 -07:00 |
|
Stephen Birarda
|
4475ca4643
|
use new restricting access toggle for DS connection
|
2015-05-20 16:47:10 -07:00 |
|
Stephen Birarda
|
6306b69ec8
|
add a version and handle remapping for restricted access
|
2015-05-20 16:27:53 -07:00 |
|
Stephen Birarda
|
5645fdc8b9
|
send user to token creation page
|
2015-05-14 15:21:33 -07:00 |
|
Stephen Birarda
|
4de006f9b9
|
handle OAuth access token retrieval
|
2015-05-14 12:22:23 -07:00 |
|
Stephen Birarda
|
89cb3d66e4
|
make sure paths are prepended with a slash
|
2015-05-12 15:39:22 -07:00 |
|
Stephen Birarda
|
332601b91c
|
final fixes for path query from DS
|
2015-05-12 14:34:14 -07:00 |
|
Stephen Birarda
|
7330e5255d
|
handle path query response from DS in NL/AM
|
2015-05-12 13:48:41 -07:00 |
|
Stephen Birarda
|
993984134c
|
add the path to DS response for path query
|
2015-05-12 12:48:01 -07:00 |
|
Stephen Birarda
|
0562fee82a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into domain-paths
|
2015-05-12 12:39:05 -07:00 |
|
Stephen Birarda
|
e0ccc986b1
|
add a method to DS to respond to path query
|
2015-05-12 12:29:09 -07:00 |
|
Stephen Birarda
|
c49d73ea35
|
handle root key settings when updating
|
2015-05-12 10:25:11 -07:00 |
|
Stephen Birarda
|
8c6715e4fc
|
resolve conflicts on merge with upstream/master
|
2015-05-11 11:10:22 -07:00 |
|
Stephen Birarda
|
ddb52348bc
|
don't force use of Settings to all QCoreApplication
|
2015-05-08 16:24:39 -07:00 |
|
Stephen Birarda
|
e3acf861ff
|
fix for unverified datagram writes
|
2015-05-07 14:07:14 -07:00 |
|
Stephen Birarda
|
6b3cf1ba4a
|
remove dependency of PacketHeaders on NodeList
|
2015-05-05 12:19:42 -07:00 |
|
Stephen Birarda
|
99bddcc102
|
insert usernames to JSONBreakableMarshal interpolate map
|
2015-05-01 15:45:53 -07:00 |
|
Seth Alves
|
38ba0ab352
|
remove useless added code
|
2015-04-28 09:18:00 -07:00 |
|
Seth Alves
|
32f91a86e7
|
remove some unneeded code
|
2015-04-27 15:43:47 -07:00 |
|
Seth Alves
|
2f36cd0fb0
|
make it so assignment-clients runnings scripts can rez entities
|
2015-04-27 15:30:17 -07:00 |
|
Stephen Birarda
|
f94fcdab7b
|
print if DS is using an access token from env
|
2015-04-17 10:44:18 -07:00 |
|
Stephen Birarda
|
1d5f1807f7
|
Merge pull request #4562 from sethalves/editors-are-rezzers
add a bool value to Node which indicates if it is allowed to rez new ent...
|
2015-03-31 18:53:29 -07:00 |
|
Seth Alves
|
4e83301c65
|
add a bool value to Node which indicates if it is allowed to rez new entities
|
2015-03-31 18:27:46 -07:00 |
|