mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-02 01:30:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update version number to 0.15.0

Browse Source 
Move AllowAddresses out of Interface into Server in openspace.cfg to circumvent potential stack corruption
Make lua_state not being copied
This commit is contained in:
Alexander Bock
2019-09-17 18:38:40 +02:00
parent 9f88a7347b
commit af4dee8d01
4 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -28,8 +28,8 @@ project(OpenSpace)
set(OPENSPACE_VERSION_MAJOR 0)
set(OPENSPACE_VERSION_MINOR 15)
set(OPENSPACE_VERSION_PATCH -1)
set(OPENSPACE_VERSION_STRING "Beta-5 RC1")
set(OPENSPACE_VERSION_PATCH 0)
set(OPENSPACE_VERSION_STRING "Beta-5")
set(OPENSPACE_BASE_DIR "${PROJECT_SOURCE_DIR}")

6
include/openspace/engine/configuration.h
View File

@@ -36,6 +36,12 @@ namespace openspace::documentation { struct Documentation; }
namespace openspace::configuration {
struct Configuration {
Configuration() = default;
Configuration(Configuration&&) = default;
Configuration(const Configuration&) = delete;
Configuration& operator=(const Configuration&) = delete;
Configuration& operator=(Configuration&&) = default;
std::string windowConfiguration = "${CONFIG}/single.xml";
std::string asset;
std::vector<std::string> globalCustomizationScripts;

9
modules/server/servermodule.cpp
View File

@@ -82,6 +82,15 @@ void ServerModule::internalInitialize(const ghoul::Dictionary& configuration) {
for (const std::string& key : interfaces.keys()) {
ghoul::Dictionary interfaceDictionary = interfaces.value<ghoul::Dictionary>(key);
// @TODO (abock, 2019-09-17); This is a hack to make the parsing of the
// openspace.cfg file not corrupt the heap and cause a potential crash at shutdown
// (see ticket https://github.com/OpenSpace/OpenSpace/issues/982)
// The AllowAddresses are specified externally and are injected here
interfaceDictionary.setValue(
"AllowAddresses",
configuration.value<ghoul::Dictionary>("AllowAddresses")
);
std::unique_ptr<ServerInterface> serverInterface =
ServerInterface::createFromDictionary(interfaceDictionary);

3
openspace.cfg
View File

@@ -99,6 +99,7 @@ ModuleConfigurations = {
}
},
Server = {
AllowAddresses = { "127.0.0.1", "localhost" },
Interfaces = {
{
Type = "TcpSocket",
@@ -106,7 +107,6 @@ ModuleConfigurations = {
Port = 4681,
Enabled = true,
DefaultAccess = "Deny",
AllowAddresses = { "127.0.0.1", "localhost" },
RequirePasswordAddresses = {},
Password = ""
},
@@ -116,7 +116,6 @@ ModuleConfigurations = {
Port = 4682,
Enabled = true,
DefaultAccess = "Deny",
AllowAddresses = { "127.0.0.1", "localhost" },
RequirePasswordAddresses = {},
Password = ""
}