Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-18 07:40:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
30674 commits 72 branches 59 tags 1.2 GiB
Commit graph

500 commits

Author SHA1 Message Date
Stephen Birarda
d9e0c91e02 remove a peer in domain-server after max connection attempts 2014-10-03 09:45:44 -07:00
Stephen Birarda
720f8ecae8 handle case where access_token is empty 2014-10-03 09:08:27 -07:00
Stephen Birarda
1a1ae43bc7 send back to the network peer on established sock addr if it exists 2014-10-03 09:02:18 -07:00
Stephen Birarda
49d081088a mode nodes to connected hash upon ping reply receipt 2014-10-03 08:58:03 -07:00
Stephen Birarda
15cc08da97 initial handling of ping replies in domain-server 2014-10-02 17:21:11 -07:00
Stephen Birarda
0d4ef4aaca ping connecting ICE peers from domain-server 2014-10-02 17:18:05 -07:00
Stephen Birarda
63877b0756 handle domain connection via ICE from NodeList 2014-10-02 16:51:12 -07:00
Stephen Birarda
c7aaf0ce4a handle ping out from node requiring ice connection to domain 2014-10-02 16:24:46 -07:00
Stephen Birarda
6425276eb0 have domain-server using full networking heartbeat with ice-server 2014-10-02 14:33:39 -07:00
Stephen Birarda
9baf983d07 Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-02 10:47:54 -07:00
Stephen Birarda
4749fdb0ba allow calls to HTTPManager to skip the subHandler and ask for direct processing 2014-10-02 10:38:46 -07:00
Stephen Birarda
157fdf6afa cleanup debug for script path 2014-10-02 10:17:31 -07:00
Stephen Birarda
89907136fa one more debug line for script redirect 2014-10-02 10:15:12 -07:00
Stephen Birarda
b6e0b08a29 add debug to domain server if script not saved 2014-10-02 10:07:02 -07:00
Stephen Birarda
e88b3311ad Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-02 09:20:08 -07:00
Stephen Birarda
d6572c3e2e handle automatic networking changes with data-server 2014-10-01 16:38:44 -07:00
Stephen Birarda
15156519b3 Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-01 16:19:16 -07:00
Stephen Birarda
3292808342 update domain network address updating for IP auto networking 2014-10-01 16:19:10 -07:00
Stephen Birarda
d5b0904d7a handle new automatic networking option in domain-server 2014-10-01 12:08:19 -07:00
Stephen Birarda
a0487e0a57 send public and local sockets to data-server in new format 2014-10-01 10:42:14 -07:00
Stephen Birarda
0174a985ee add a domain-server scripts folder that is ignored for clean symlink 2014-10-01 09:56:13 -07:00
Stephen Birarda
fed7dad2b6 use an auto_ptr to be able to reset the AccountManager 2014-09-30 14:36:32 -07:00
Stephen Birarda
3969c8bfe0 don't allow a username and password for domain auth, require access token 2014-09-30 12:23:04 -07:00
Stephen Birarda
68a70cc914 don't use dashes in settings JSON keys 2014-09-30 09:40:54 -07:00
Stephen Birarda
bd4a32551b fix for settings save without organization 2014-09-29 10:09:33 -07:00
Stephen Birarda
5e2870ac5f require a distinction between master config and user config 2014-09-29 09:30:08 -07:00
Stephen Birarda
ae542419d1 fix for static assignments from queue 2014-09-26 16:36:18 -07:00
Stephen Birarda
9e02a36d3d fix for domain-server allowed roles 2014-09-26 16:23:57 -07:00
Stephen Birarda
d389f13e1b fix for role lookup in domain-server 2014-09-26 16:21:12 -07:00
Stephen Birarda
e8c3fa3cf1 use ID from new domain settings, don't disable save button 2014-09-26 14:39:50 -07:00
Stephen Birarda
21809cc9df fix http username with no password 2014-09-26 12:09:29 -07:00
Stephen Birarda
3c71d4d96e add ability for domain-server to restart after setting save 2014-09-26 11:26:21 -07:00
Stephen Birarda
954fbc2017 use DomainServerSettingsManager to handle simulation settings and config 2014-09-26 11:06:05 -07:00
Stephen Birarda
cc79254a41 have domain server make sure access token is present before IP update 2014-09-17 09:40:48 -07:00
Stephen Birarda
885030a10c handle receipt of new public socket and propogation to data-server 2014-09-16 12:37:22 -07:00
Stephen Birarda
47137c72a5 groundwork for repeated dynamic IP address updating in domain-server 2014-09-16 12:09:24 -07:00
Stephen Birarda
ee6a90dd54 allow domain to pass down its ID from config 2014-09-10 15:13:02 -07:00
Ryan Huffman
38a14c3864 Reapply "Update assignment client to close on WM_CLOSE message on Windows" 
This reverts commit a603453cf2.
 2014-09-05 11:19:36 -07:00
Leonardo Murillo
a603453cf2 Revert "Update assignment client to close on WM_CLOSE message on Windows" 2014-09-05 11:36:56 -06:00
AndrewMeadows
9036954d38 Merge pull request #3311 from huffman/fix-wm-close 
Update assignment client to close on WM_CLOSE message on Windows
 2014-09-03 16:43:12 -07:00
Ryan Huffman
f3efbb35f4 Remove nativeEventFilter from DomainServer 2014-09-03 07:08:51 -07:00
Ryan Huffman
76bede04aa Move stdout/err disabling to a library class 2014-09-03 07:06:08 -07:00
Ryan Huffman
c27bee2c06 Move wm_close handling to a shared library 2014-09-03 07:05:24 -07:00
Ryan Huffman
444a974bd6 Merge branch 'master' of github.com:highfidelity/hifi into fix-wm-close 
Conflicts:
	assignment-client/src/AssignmentClient.cpp
 2014-08-28 06:52:16 -07:00
Ryan Huffman
4c485a26ed Merge branch 'fix-wm-close' of github.com:huffman/hifi into fix-wm-close 2014-08-22 15:10:23 -07:00
Ryan Huffman
fa7b2a87bf Add WM_CLOSE support to domain server 2014-08-22 15:09:55 -07:00
Ryan Huffman
b75c3a4976 Disable stdout/err buffering on Windows for assignment client and domain server 2014-08-22 15:08:57 -07:00
ZappoMan
027b1d58cc Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	interface/src/Application.h
	interface/src/entities/EntityTreeRenderer.h
	interface/src/models/ModelTreeRenderer.cpp
	libraries/models/src/ModelItem.h
	libraries/models/src/ModelTree.h
 2014-08-08 14:26:56 -07:00
Stephen Birarda
10c94023f1 handle basic authentication for domain-server admin 2014-08-04 15:25:14 -07:00
ZappoMan
3a8c5018ee Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	interface/src/Application.h
	libraries/entities/src/EntityTreeElement.h
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelItem.h
	libraries/models/src/ModelTree.cpp
	libraries/models/src/ModelTree.h
	libraries/models/src/ModelTreeElement.cpp
	libraries/networking/src/PacketHeaders.h
	libraries/octree/src/OctreeEditPacketSender.cpp
	libraries/octree/src/OctreeEditPacketSender.h
 2014-08-04 12:01:23 -07:00
Stephen Birarda
e846fd24f7 fix an order mistake in DS handling HTTP requests 2014-07-31 15:23:15 -07:00
Stephen Birarda
f0e7bf0462 allow assignments to pull script without session cookie 2014-07-31 15:13:33 -07:00
Stephen Birarda
dbf41c8a42 allow domain-server to serve settings publicly, fix retry in DomainHandler 2014-07-28 14:56:26 -07:00
Stephen Birarda
005a3c7c12 persist and recall domain-server web sessions from ini settings 2014-07-24 17:17:57 -07:00
Stephen Birarda
2e5dc2320d don't flip order on node socket, HifiSockAddr is handling 2014-07-24 11:09:09 -07:00
Stephen Birarda
8082e2f88b allow a user to be let into domain-server based on role 2014-07-21 17:41:22 -07:00
Stephen Birarda
f78a1f7033 hook domain-server to user DomainServerWebSessionData class 2014-07-21 17:32:38 -07:00
Stephen Birarda
f45a509508 initial hook-in of OAuth authentication for DS web pages 2014-07-21 16:54:27 -07:00
Stephen Birarda
d007079617 associate username with agent nodes in domain-server 2014-07-21 10:30:11 -07:00
ZappoMan
ec0c350f60 Merge branch 'master' of https://github.com/worklist/hifi into virtualEntities 
Conflicts:
	interface/src/Application.cpp
	interface/src/DatagramProcessor.cpp
	libraries/script-engine/src/ScriptEngine.cpp
 2014-07-03 14:20:40 -07:00
Atlante45
36fb530594 Switched DomainServer to NetworkAccessManager 2014-07-02 10:26:38 -07:00
ZappoMan
865566414c Merge branch 'master' of https://github.com/worklist/hifi into renameModelsToEntities 
Conflicts:
	interface/src/entities/EntityTreeRenderer.cpp
	libraries/entities/src/EntityItem.h
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelTree.cpp
	libraries/models/src/ModelTreeElement.cpp
	libraries/models/src/ModelsScriptingInterface.cpp
	tests/octree/CMakeLists.txt
	tests/octree/src/ModelTests.cpp
 2014-07-01 16:32:47 -07:00
Stephen Birarda
8edc4bf9d1 add HTTPS request debugged to domain-server 2014-06-27 10:38:39 -07:00
ZappoMan
ccc9eabd33 first cut at renaming Models to Entities 2014-06-26 16:39:52 -07:00
Stephen Birarda
4188a4eab1 change unattenuated zone placeholder and offer method to grab JSON settings 2014-06-25 14:16:24 -07:00
Stephen Birarda
f8dccad6ec enable persisting of posted settings to a JSON file 2014-06-25 11:20:09 -07:00
Stephen Birarda
afe2e57701 add a settings page to DS that uses handlebars template library 2014-06-24 12:33:40 -07:00
Andrew Meadows
3f36325642 remove warnings about signed/unsigned comparison 2014-06-17 11:59:37 -07:00
John Grosen
47a88a2713 Updated AssignmentClient to use HifiConfigVariantMap... 
...and also updated DomainServer to appropriately use boolean options
 2014-06-12 17:08:23 -07:00
Stephen Birarda
ce485c48b8 make scripted assignments passed in DS config static 2014-05-27 15:23:10 -07:00
Stephen Birarda
714e29c887 fix credit amount in window title 2014-05-23 17:37:36 -07:00
Stephen Birarda
45ab8145a4 fix another implicit float cast 2014-05-23 16:22:08 -07:00
Stephen Birarda
831b0faa20 fix a mistyped constant 2014-05-23 16:15:11 -07:00
Stephen Birarda
1b00cda068 don't use powf for credit conversions 2014-05-23 16:12:34 -07:00
Stephen Birarda
15a8272286 fix domain-server pending credits to actually be in credits 2014-05-23 15:43:02 -07:00
Stephen Birarda
e7e19e8714 fix a comment in script handling 2014-05-23 12:37:27 -07:00
Stephen Birarda
7e78fc788a fix double return false 2014-05-23 12:35:16 -07:00
Stephen Birarda
f4292fd29c handle serving of scripts at temp unique UUIDs 2014-05-23 12:33:39 -07:00
Stephen Birarda
6d500d64d1 fix floats that aren't actually floats 2014-05-22 17:12:22 -07:00
Stephen Birarda
fc9d850c40 output when pay-for-assignments is on 2014-05-22 15:33:06 -07:00
Stephen Birarda
40c59a3589 fix rate of payment for assignments 2014-05-22 15:10:41 -07:00
Stephen Birarda
e3ac7c5eec rename assignment payment method for clarity 2014-05-21 12:07:23 -07:00
Stephen Birarda
98d1146e90 rename the pay for assignments option 2014-05-21 11:04:00 -07:00
Stephen Birarda
b7727f0b16 require a flag to enable payment to assigned nodes 2014-05-21 11:02:02 -07:00
Stephen Birarda
1dddabb691 send and confirm transactions to assigned nodes from DS 2014-05-21 10:58:41 -07:00
Stephen Birarda
908eb5cc4f use OAuth provider URL for transaction login 2014-05-21 10:04:48 -07:00
Stephen Birarda
981f9df6b3 add option to pass data server username and password to DS 2014-05-21 09:53:09 -07:00
Stephen Birarda
ee67c64b76 stub sending of transactions to server 2014-05-21 09:26:17 -07:00
Stephen Birarda
99a3fde8fa accumulate credits to pay nodes, return in assignments JSON 2014-05-20 16:57:19 -07:00
Stephen Birarda
8fb85110ac add a timer to initiate payment to assigned nodes 2014-05-20 15:59:00 -07:00
Stephen Birarda
072343ce79 associate assignment wallet UUID with node via DomainServerNodeData 2014-05-20 15:50:09 -07:00
Stephen Birarda
b42e005cdb add pending assignment purgatory for assignees 2014-05-20 15:28:45 -07:00
Stephen Birarda
8a1fdf3486 pass wallet UUID from AC to DS, cleanup noisy timer 2014-05-20 14:38:51 -07:00
Stephen Birarda
f22aaf21d2 remove GnuTLS include across repo 2014-05-20 10:56:34 -07:00
Stephen Birarda
e3dd6509d8 remove dependency on GnuTLS for later replacement with OpenSSL 2014-05-20 10:47:11 -07:00
Stephen Birarda
72dd26acbe only require OAuth authentication with a list of allowed roles 2014-05-02 10:47:59 -07:00
Stephen Birarda
aa2931d9bb resolve conflicts on merge with upstream/master 2014-05-02 10:39:17 -07:00
Stephen Birarda
709bcdb148 handle interface client connection to DS with user roles 2014-05-01 16:18:07 -07:00
Stephen Birarda
b14d543701 retreive user profile and enumerate roles 2014-05-01 15:46:09 -07:00
Stephen Birarda
a49668031d send a request for an access token after receiving auth code 2014-05-01 14:49:58 -07:00
Stephen Birarda
a826f3817b fix assignment json for fulfilled assignments 2014-05-01 13:56:45 -07:00
Stephen Birarda
7a1aa7ec89 keep track of all assignments to stop double agents 2014-05-01 13:50:39 -07:00
Stephen Birarda
d942054015 cleanup re-display of OAuthWebView 2014-05-01 12:44:42 -07:00
Stephen Birarda
56c24ce8b7 present QWebView for OAuth authorization in interface 2014-05-01 11:09:35 -07:00
Stephen Birarda
2f0e311a99 return OAuth URL to interface clients when OAuth enabled 2014-05-01 10:19:05 -07:00
ZappoMan
aac42058ac first cut at modelserver 2014-04-30 09:25:52 -07:00
Stephen Birarda
1c2032790a allow passing of OAuth client secret to DS on command-line 2014-04-25 17:02:19 -07:00
Stephen Birarda
86f3cf2a75 allow passing of oauth info to DS 2014-04-25 16:39:45 -07:00
Stephen Birarda
c26fc7a838 pull OAuth code from URL in domain-server 2014-04-24 15:05:41 -07:00
Stephen Birarda
4a68c2e9c4 allow DS to handle incoming HTTPS requests 2014-04-24 14:58:08 -07:00
Stephen Birarda
96de0c1af1 setup the domain-server HTTPS server 2014-04-24 14:13:17 -07:00
Stephen Birarda
260966915a add HTTPS versions of webserver classes 2014-04-24 14:06:24 -07:00
Andrew Meadows
da5ac3d664 remove warning about signed/unsigned comparison 2014-04-23 08:47:25 -07:00
Stephen Birarda
07387a132e fix broken DS build 2014-04-21 09:31:21 -07:00
Stephen Birarda
cc7d986398 don't make scripts statically assigned 2014-04-21 09:29:08 -07:00
Stephen Birarda
419e092858 rename matching static method in DS 2014-04-21 08:48:29 -07:00
Stephen Birarda
c9b0444310 correct re-assignment of static assignments 2014-04-21 08:47:14 -07:00
Stephen Birarda
c64ae35374 remove an extra bracket 2014-04-21 01:01:38 -07:00
Stephen Birarda
36b58b178c have scripted assignments added via config be static 2014-04-21 01:00:56 -07:00
Stephen Birarda
e9768ca4fc add missing pool handling to DS 2014-04-18 13:34:30 -07:00
Stephen Birarda
142932bed0 allow passing of scripted assignments to DS via parameters 2014-04-17 10:14:11 -07:00
Stephen Birarda
a25ef58247 move DTLS socket changes to LimitedNodeList 2014-04-16 11:25:35 -07:00
Stephen Birarda
55d540a0eb fix a typo in DomainServer.cpp 2014-04-16 11:24:26 -07:00
Stephen Birarda
97e45e8fe5 re-instate connect behavior in DS so killed nodes re-connect, amend #2675 2014-04-16 10:56:33 -07:00
Stephen Birarda
1c861fbecb resolve conflicts on merge with upstream master 2014-04-09 15:36:15 -07:00
Stephen Birarda
684c6b5372 run regex header replacement on all cpp files 2014-04-09 09:35:42 -07:00
Stephen Birarda
ea61ccff7f add some more debugging when reading X509 cert files for DTLS 2014-04-08 14:10:04 -07:00
Stephen Birarda
e417e7670b cleanup DomainServer debug during config parsing 2014-04-08 14:07:31 -07:00
Stephen Birarda
9ca864bb50 don't parse excluded types from config variant map 2014-04-08 14:05:26 -07:00
Stephen Birarda
9a9939c11a repairs for assignment parsing from command line and JSON 2014-04-08 14:03:42 -07:00
Stephen Birarda
c2ff438182 add a CL + JSON settings reader 2014-04-08 13:37:07 -07:00
Stephen Birarda
080b0d7221 Merge branch 'master' of https://github.com/highfidelity/hifi into authentication 2014-04-08 10:28:14 -07:00
Stephen Birarda
86a0b715f3 verify DTLS certificate to ensure trust before handshaking 2014-04-07 11:36:32 -07:00
Stephen Birarda
a6641aa95b respect the DTLS MTU for domain server list sending 2014-04-07 10:48:58 -07:00
Stephen Birarda
5adcf68752 sort nodes on DS page by their uptime 2014-04-07 09:08:51 -07:00
Stephen Birarda
45d796e8f3 allow re-handshake in NodeList after domain refresh 2014-04-04 15:56:02 -07:00
Stephen Birarda
c015fdd212 leverage a DummyDTLSSession to not require cleanup of DTLSSession for cookies 2014-04-04 11:42:14 -07:00
Stephen Birarda
b40dd6a31a say bye and de-init DTLS session from DomainServer 2014-04-04 11:17:50 -07:00
Stephen Birarda
fd8e32190e perform cleanup of GnuTLS structures across targets 2014-04-04 11:08:53 -07:00
Stephen Birarda
e2224e0f0c cleanup node silence timing and use for DTLS timeouts 2014-04-04 10:56:04 -07:00
Stephen Birarda
efd176f93c complete check in and heartbeat via DTLS 2014-04-04 09:56:57 -07:00
Stephen Birarda
7b6ce77690 add processing of DTLS datagrams to domain-server 2014-04-04 09:20:40 -07:00
Stephen Birarda
62de84315e detect handshake completion in DS and client 2014-04-02 17:56:04 -07:00
Stephen Birarda
e1cae6d295 initial handshaking for DTLS sessions between DS and clients 2014-04-02 17:29:14 -07:00
Stephen Birarda
b5b4edc999 add notion of server and client DTLSSessions 2014-04-01 16:47:45 -07:00
Stephen Birarda
ce6f845681 remove some gnutls handshake debugging 2014-04-01 14:47:30 -07:00
Stephen Birarda
0be2eb57bf repairs to NodeList and LimitedNodeList 2014-04-01 13:56:33 -07:00
Stephen Birarda
45c6ae44a6 use a LimitedNodeList in domain-server 2014-04-01 13:33:30 -07:00
Stephen Birarda
caf2473df8 add a DTLSSession object to handle GnuTLS DTLS sessions 2014-04-01 13:08:00 -07:00
Stephen Birarda
62da4d622d don't require an MD5 hash in non-verified packets 2014-03-31 15:36:32 -07:00
Stephen Birarda
6c08e2a407 add option for domain-server to enforce DTLS 2014-03-31 15:06:58 -07:00
Stephen Birarda
da30d21f6e complete inital DTLS setup in domain-server 2014-03-31 14:02:11 -07:00
Stephen Birarda
dc38b27485 using GnuTLS read self-signed key and cert on DS load 2014-03-31 12:31:34 -07:00
Stephen Birarda
9ae06913a0 remove QCA which only supports DTLS v1 2014-03-31 09:45:19 -07:00
Stephen Birarda
44860a5f5a put servers alphabetically first in node list 2014-03-28 12:01:37 -07:00
Stephen Birarda
cb617c9e17 add a button on DS admin page to kill all nodes 2014-03-26 11:37:30 -07:00
Stephen Birarda
364df16a9f pretty up the stats table 2014-03-24 16:34:00 -07:00
Stephen Birarda
f8279c1f5b handle query params in HTTPManager, display stats table from DS 2014-03-24 14:14:26 -07:00
Stephen Birarda
55bc9c059d show stats for node at /nodes/UUID 2014-03-24 12:15:36 -07:00
Stephen Birarda
ec10e61b8c add logic to domain-server to parse JSON stats 2014-03-24 11:42:04 -07:00
Stephen Birarda
f652df9399 break on MTU size packets from domain-list, closes #2312 2014-03-17 09:19:05 -07:00
ZappoMan
8622f2d548 fix comment 2014-03-12 10:20:33 -07:00
ZappoMan
214866414c tweak names 2014-03-11 17:09:44 -07:00
ZappoMan
1d17e75043 more noise suppression 2014-03-11 16:56:41 -07:00
ZappoMan
3c24121f5c more noise suppression 2014-03-11 16:54:03 -07:00
ZappoMan
029b25ad29 make domain server less noisy about Agent assignments 2014-03-11 16:45:15 -07:00
Stephen Birarda
d1623e6e4d fixes for warnings produced by Xcode 5.1 2014-03-11 11:45:13 -07:00
Stephen Birarda
b09ed1dff1 present a login window on app start 2014-02-25 10:53:13 -08:00
Stephen Birarda
83f7c17279 move QStringList include to DomainServer header 2014-02-24 15:49:52 -08:00
Stephen Birarda
c1b45d7eaa Merge branch 'master' of https://github.com/highfidelity/hifi into authentication 2014-02-24 15:18:21 -08:00
Stephen Birarda
27c779666b add auth to assignment-client, fix refresh of static assignments 2014-02-24 13:29:32 -08:00
Stephen Birarda
fcb36f0aca switch to target specific username/pass 2014-02-24 12:07:07 -08:00
Stephen Birarda
9dc460bab4 make multiple instances of scripted assignment use diff UUID 2014-02-24 11:56:14 -08:00
Stephen Birarda
a8493ecaa2 cleanup login/logout in menu, logout only when in 2014-02-24 11:11:36 -08:00
Stephen Birarda
340248ac43 resolve conflicts on merge with upstream master 2014-02-21 15:16:15 -08:00
Stephen Birarda
d56bafc9a5 default to no auth for domain-server, fix no auth flow 2014-02-21 13:16:24 -08:00
Stephen Birarda
cb40a9b00d add naming info and ini settings to domain-server 2014-02-20 18:00:33 -08:00
Stephen Birarda
c728463410 use connection secret to verify domain-server packets 2014-02-20 17:57:58 -08:00
Stephen Birarda
a8e96441ab repair parsing of a node connect request 2014-02-20 17:16:56 -08:00
Stephen Birarda
bd18206573 ask node for authentication again if token redeem fails 2014-02-20 17:13:52 -08:00
Stephen Birarda
9cb8cbff2c fix noAuth flow for domain-server 2014-02-20 16:47:00 -08:00
Stephen Birarda
a6c1e3e87f tweaks to domain-server authentication flow 2014-02-20 16:31:50 -08:00
Stephen Birarda
217a7862e5 groundwork for domain-server to redeem registration tokens 2014-02-20 14:50:35 -08:00
Stephen Birarda
ee90c25a41 add helpers for json responses from AccountManager 2014-02-20 14:22:08 -08:00
Stephen Birarda
6f84230d9d resolve conflicts on merge with upstream/master 2014-02-20 10:14:36 -08:00
Stephen Birarda
cb165902fd use existing constants for HTTP operations 2014-02-19 18:12:10 -08:00
Stephen Birarda
d3dd49a2e8 force DomainServer to wait for session UUID before setup with auth 2014-02-19 18:06:21 -08:00
Stephen Birarda
ee9f8937e3 fix a silly typo 2014-02-19 18:03:34 -08:00
Stephen Birarda
32ceccfeb6 have domain-server bail if username/password not provided for auth 2014-02-19 17:26:21 -08:00
Stephen Birarda
b0895ea83a store registration token in more compact form, begin parse on domain-server 2014-02-18 15:58:54 -08:00
Stephen Birarda
949f79e945 hook up request for domain registration information for Interface 2014-02-18 15:38:43 -08:00
Stephen Birarda
ce3cc7e5c9 require that client ID for authentication server be known to AccountManager 2014-02-18 14:34:32 -08:00
Stephen Birarda
8a0136efe1 more work on authentication, show login window when domain asks 2014-02-18 13:21:32 -08:00
Stephen Birarda
c762b92e5a replace DataServerClient and Profile with AccountManager 2014-02-18 11:27:37 -08:00
Stephen Birarda
7c69028dc5 hook up domain request for node to authenticate 2014-02-18 10:54:45 -08:00
Stephen Birarda
c9ade0585b add a node authentication hostname to the domain-server 2014-02-18 09:03:35 -08:00
Stephen Birarda
a90ca59027 pools are allowed to have dashes 2014-02-07 17:30:32 -08:00
Stephen Birarda
f237b77fa7 fix a bad cast to Assignment, closes #1935 2014-02-07 15:26:18 -08:00
Stephen Birarda
66d4eeb805 enforce both a version and hash match for packets 2014-02-07 11:10:38 -08:00
Stephen Birarda
fa1825fa32 repairs to ping-reply, removal of deconstructPacketHeader to simply return UUID 2014-02-07 10:20:50 -08:00
Stephen Birarda
f02e1aaf47 cleanup the alive half of connection secrets when node dies 2014-02-06 11:37:52 -08:00
Stephen Birarda
3dca04aacb have the domain-server generate connection secrets, closes #1837 2014-02-06 11:30:53 -08:00
Stephen Birarda
6f638fa62c have domain-server create a UUID for unidentified nodes, closes #1840 2014-02-06 10:34:34 -08:00
Stephen Birarda
703b654728 make sure UUID key changes in static assignment hash, closes #1770 2014-01-30 17:39:37 -08:00
Stephen Birarda
f853e34ab1 fix unix complaint for no postfix for enum 2014-01-30 15:49:05 -08:00
Stephen Birarda
984fb1a5df fix config parsing from command line and json 2014-01-30 15:22:03 -08:00
Stephen Birarda
55049eeb6b fix assignment packing and unpacking from DS to AC 2014-01-30 14:54:52 -08:00
Stephen Birarda
356222ba15 removal of persistence in DS for static assignments 2014-01-30 14:33:36 -08:00
Stephen Birarda
d6431a3e7a remove an extra gs 2014-01-29 15:09:46 -08:00
Stephen Birarda
dbecb96a58 remove assignmentQueueMutex now that DS concurrency is gone 2014-01-29 15:08:50 -08:00
Stephen Birarda
7d27830064 domain-server patches while looking for payload/pool errors 2014-01-29 14:23:39 -08:00
Stephen Birarda
423e1598f0 use NodeSet in place of QSet<NodeType_t> where possible 2014-01-28 13:41:39 -08:00
Stephen Birarda
4de270b832 cleanup Node types, closes #1726 2014-01-28 13:38:33 -08:00
Stephen Birarda
cda06d1cb3 replace uint64_t with quint64 for Qt friendlyness 2014-01-28 12:35:42 -08:00
Stephen Birarda
ffefc529f3 ensure UUID pulled from packet header is exactly 16 bytes 2014-01-28 11:53:09 -08:00
Stephen Birarda
75e2fa491a some type fixes for marshalling/un-marshalling of data 2014-01-28 11:26:36 -08:00
Stephen Birarda
85ebad979f repair assignment flow errors from packet changes 2014-01-28 11:15:38 -08:00
Stephen Birarda
4103cc1cde packet header changes and beginning of conversion to QByteArray 2014-01-28 10:36:08 -08:00
AndrewMeadows
ea681f0d8f Merge pull request #1669 from birarda/avatar-list 
add an AvatarManager to house a separate list of Avatars from NodeList
 2014-01-24 09:54:17 -08:00
Stephen Birarda
9d71671a52 add extra debugging to packet mismatch 2014-01-24 09:10:27 -08:00
Stephen Birarda
349c790cc7 NodeData cleanup thanks to separation from rendered avatars 2014-01-23 15:41:40 -08:00
Lucas Crisman
1423f91717 Allow domain-server to read configuration from file 2014-01-21 15:48:44 -03:00
Stephen Birarda
5fdf310a45 hook OctreeServer up to embedded-webserver 2014-01-17 14:21:15 -08:00
Stephen Birarda
ffb628edfb remove the DomainServer singleton instance from DS 2014-01-17 12:18:41 -08:00
Stephen Birarda
1900d3a13b remove the old civetweb upload handler 2014-01-17 12:16:56 -08:00
Stephen Birarda
0f8cbb9aec add back script upload ability hooked to HttpManager 2014-01-17 12:16:19 -08:00
Stephen Birarda
ce393fdf27 uppercase the names of the HTTP classes 2014-01-17 11:53:47 -08:00
Stephen Birarda
40cdba203d handle programmatic DS requests except for script creation 2014-01-17 11:29:20 -08:00
Stephen Birarda
036dba9c2f setup the HTTPManager to serve files in the document root 2014-01-17 08:53:55 -08:00
Stephen Birarda
d236d6335d add initial rev of embedded webserver based on QTcpSocket 2014-01-16 17:05:02 -08:00
Andrew Meadows
1266ffd0ca merge of windows-build 
Conflicts:
	domain-server/src/DomainServer.cpp
	interface/src/Application.cpp
	interface/src/Menu.cpp
	libraries/avatars/src/AvatarData.h
	libraries/shared/src/NodeList.h
 2014-01-16 09:00:13 -08:00
Stephen Birarda
0c22aa241f leverage invokeMethod to make sure killNodeWithUUID is called on right thread 2014-01-15 16:10:51 -08:00
Brad Hefta-Gaub
952365a1b7 clean up comments and tab spacing 2014-01-15 12:50:36 -08:00
Brad Hefta-Gaub
170dbe6e85 Merge branch 'master' of git://github.com/worklist/hifi into windows_build 
Conflicts:
	assignment-client/src/audio/AudioMixer.cpp
	domain-server/src/DomainServer.cpp
	interface/src/Audio.cpp
	interface/src/DataServerClient.cpp
	interface/src/Oscilloscope.cpp
	interface/src/PairingHandler.cpp
	interface/src/Util.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/devices/Faceshift.cpp
	interface/src/devices/SerialInterface.cpp
	interface/src/renderer/FBXReader.cpp
	libraries/avatars/src/AvatarData.h
	libraries/octree-server/src/OctreeServer.cpp
	libraries/octree-server/src/OctreeServer.h
	libraries/octree/src/ViewFrustum.cpp
	libraries/shared/src/Logging.cpp
	libraries/shared/src/Node.cpp
	libraries/shared/src/Node.h
	libraries/shared/src/NodeList.cpp
	libraries/shared/src/NodeList.h
	libraries/shared/src/PerfStat.cpp
	libraries/shared/src/SharedUtil.cpp
	libraries/voxels/src/VoxelTree.cpp
	voxel-edit/src/main.cpp
 2014-01-15 10:20:21 -08:00
Stephen Birarda
599e3bb9e5 resolve conflicts on merge with upstream master 2014-01-14 16:15:58 -08:00
Stephen Birarda
8676ac38f9 foreach spacing and reference repairs 2014-01-14 15:54:09 -08:00
Stephen Birarda
987c639e36 initial newline removal from all QDebug calls 2014-01-14 13:09:22 -08:00
Stephen Birarda
9efb391ecf repair crazy references to node ponter from old iterator style 2014-01-14 10:50:06 -08:00
Stephen Birarda
ed0ed96029 properly emit signal on silent node removal 2014-01-14 10:28:41 -08:00
Stephen Birarda
7d1a64ca8c change NodeList container to QHash with QSharedPointer 2014-01-13 17:09:21 -08:00
Brad Hefta-Gaub
f9f29c68b2 more windows build fixes 2014-01-11 01:11:49 -08:00
Brad Hefta-Gaub
bd67531ffd warnings 2014-01-11 00:13:46 -08:00
Brad Hefta-Gaub
825c1c8876 fix windows warnings 2014-01-11 00:07:35 -08:00
Brad Hefta-Gaub
5725a92cfe get rid of arpa/inet.h and netdb.h 2014-01-10 18:13:23 -08:00
Andrew Meadows
d28ed70ca9 merge pull request 1446 2014-01-10 15:55:38 -08:00
Leonardo Murillo
57bf31e1a6 Wrong spacing 2013-12-19 11:25:51 -06:00
Leonardo Murillo
c3b222cfc2 Print assignment request details to log 2013-12-19 11:23:55 -06:00
ZappoMan
2ca628fdf1 first cut at particle renderer cleanup particle jurisdiction listener fix storage of particles 2013-12-09 11:45:32 -08:00
Stephen Birarda
e99b126134 remove quickExit option from AS, fix cleanup in DS 2013-12-05 17:35:26 -08:00
Stephen Birarda
5e429250d3 merge with upstream/master 2013-12-05 11:41:28 -08:00