From 4397c86dae8e854c4d4b1dd3785b56f3838ccd50 Mon Sep 17 00:00:00 2001 From: NotAdam Date: Mon, 7 Jan 2019 23:26:34 +1100 Subject: [PATCH] refactor parameters to general, fix build error --- config/global.ini.default | 2 +- src/api/main.cpp | 20 ++++++++++---------- src/common/Config/ConfigDef.h | 4 ++-- src/common/Config/ConfigMgr.cpp | 10 ++++------ src/lobby/GameConnection.cpp | 6 +++--- src/lobby/ServerLobby.cpp | 2 +- src/world/ServerMgr.cpp | 2 +- 7 files changed, 22 insertions(+), 24 deletions(-) diff --git a/config/global.ini.default b/config/global.ini.default index 46cd4747..87c3b4cc 100644 --- a/config/global.ini.default +++ b/config/global.ini.default @@ -7,7 +7,7 @@ Password = SyncThreads = 2 AsyncThreads = 2 -[Parameters] +[General] ServerSecret = default DataPath = C:\\SquareEnix\\FINAL FANTASY XIV - A Realm Reborn\\game\\sqpack WorldID = 67 diff --git a/src/api/main.cpp b/src/api/main.cpp index 372cad9f..5fd967a0 100644 --- a/src/api/main.cpp +++ b/src/api/main.cpp @@ -118,7 +118,7 @@ bool loadSettings( int32_t argc, char* argv[] ) } Logger::info( "Setting up generated EXD data" ); - auto dataPath = m_config.global.parameters.dataPath; + auto dataPath = m_config.global.general.dataPath; if( !g_exdDataGen.init( dataPath ) ) { Logger::fatal( "Error setting up generated EXD data. Make sure that DataPath is set correctly in global.ini" ); @@ -300,7 +300,7 @@ void deleteCharacter( shared_ptr< HttpServer::Response > response, shared_ptr< H int32_t accountId = g_sapphireAPI.checkSession( sId ); - if( m_config.global.parameters.serverSecret != secret ) + if( m_config.global.general.serverSecret != secret ) { std::string json_string = "{\"result\":\"invalid_secret\"}"; *response << buildHttpResponse( 403, json_string, JSON ); @@ -340,7 +340,7 @@ void createCharacter( shared_ptr< HttpServer::Response > response, shared_ptr< H if( result != -1 ) { - if( m_config.global.parameters.serverSecret != secret ) + if( m_config.global.general.serverSecret != secret ) { std::string json_string = "{\"result\":\"invalid_secret\"}"; *response << buildHttpResponse( 403, json_string, JSON ); @@ -348,7 +348,7 @@ void createCharacter( shared_ptr< HttpServer::Response > response, shared_ptr< H else { int32_t charId = g_sapphireAPI.createCharacter( result, name, finalJson, - m_config.global.parameters.defaultGMRank ); + m_config.global.general.defaultGMRank ); std::string json_string = "{\"result\":\"" + std::to_string( charId ) + "\"}"; *response << buildHttpResponse( 200, json_string, JSON ); @@ -381,7 +381,7 @@ void insertSession( shared_ptr< HttpServer::Response > response, shared_ptr< Htt std::string secret = json["secret"]; // reloadConfig(); - if( m_config.global.parameters.serverSecret != secret ) + if( m_config.global.general.serverSecret != secret ) { std::string json_string = "{\"result\":\"invalid_secret\"}"; *response << buildHttpResponse( 403, json_string, JSON ); @@ -413,7 +413,7 @@ void checkNameTaken( shared_ptr< HttpServer::Response > response, shared_ptr< Ht // reloadConfig(); - if( m_config.global.parameters.serverSecret != secret ) + if( m_config.global.general.serverSecret != secret ) { std::string json_string = "{\"result\":\"invalid_secret\"}"; *response << buildHttpResponse( 403, json_string, JSON ); @@ -450,7 +450,7 @@ void checkSession( shared_ptr< HttpServer::Response > response, shared_ptr< Http if( result != -1 ) { - if( m_config.global.parameters.serverSecret != secret ) + if( m_config.global.general.serverSecret != secret ) { std::string json_string = "{\"result\":\"invalid_secret\"}"; *response << buildHttpResponse( 403, json_string, JSON ); @@ -489,7 +489,7 @@ void getNextCharId( shared_ptr< HttpServer::Response > response, shared_ptr< Htt // reloadConfig(); - if( m_config.global.parameters.serverSecret != secret ) + if( m_config.global.general.serverSecret != secret ) { std::string json_string = "{\"result\":\"invalid_secret\"}"; *response << buildHttpResponse( 403, json_string, JSON ); @@ -520,7 +520,7 @@ void getNextContentId( shared_ptr< HttpServer::Response > response, shared_ptr< // reloadConfig(); - if( m_config.global.parameters.serverSecret != secret ) + if( m_config.global.general.serverSecret != secret ) { std::string json_string = "{\"result\":\"invalid_secret\"}"; *response << buildHttpResponse( 403, json_string, JSON ); @@ -555,7 +555,7 @@ void getCharacterList( shared_ptr< HttpServer::Response > response, shared_ptr< if( result != -1 ) { - if( m_config.global.parameters.serverSecret != secret ) + if( m_config.global.general.serverSecret != secret ) { std::string json_string = "{\"result\":\"invalid_secret\"}"; *response << buildHttpResponse( 403, json_string, JSON ); diff --git a/src/common/Config/ConfigDef.h b/src/common/Config/ConfigDef.h index 2fcc8251..a6a111b8 100644 --- a/src/common/Config/ConfigDef.h +++ b/src/common/Config/ConfigDef.h @@ -9,14 +9,14 @@ namespace Sapphire::Common::Config { Sapphire::Db::ConnectionInfo database; - struct Parameters + struct General { std::string serverSecret; std::string dataPath; uint16_t worldID; uint8_t defaultGMRank; - } parameters; + } general; struct Network { diff --git a/src/common/Config/ConfigMgr.cpp b/src/common/Config/ConfigMgr.cpp index d236f9dd..fe5cee56 100644 --- a/src/common/Config/ConfigMgr.cpp +++ b/src/common/Config/ConfigMgr.cpp @@ -26,8 +26,6 @@ bool Sapphire::ConfigMgr::loadConfig( const std::string& configName ) if( m_pInih->ParseError() < 0 ) return false; - initConfigData(); - return true; } @@ -55,10 +53,10 @@ bool Sapphire::ConfigMgr::loadGlobalConfig( Common::Config::GlobalConfig& config config.database.asyncThreads = getValue< uint8_t >( "Database", "AsyncThreads", 2 ); // params - config.parameters.dataPath = getValue< std::string >( "Parameters", "DataPath", "C:\\SquareEnix\\FINAL FANTASY XIV - A Realm Reborn\\game\\sqpack" ); - config.parameters.serverSecret = getValue< std::string >( "Parameters", "ServerSecret", "default" ); - config.parameters.worldID = getValue< uint16_t >( "Parameters", "WorldID", 67 ); - config.parameters.defaultGMRank = getValue< uint8_t >( "Parameters", "DefaultGMRank", 255 ); + config.general.dataPath = getValue< std::string >( "Parameters", "DataPath", "C:\\SquareEnix\\FINAL FANTASY XIV - A Realm Reborn\\game\\sqpack" ); + config.general.serverSecret = getValue< std::string >( "Parameters", "ServerSecret", "default" ); + config.general.worldID = getValue< uint16_t >( "Parameters", "WorldID", 67 ); + config.general.defaultGMRank = getValue< uint8_t >( "Parameters", "DefaultGMRank", 255 ); // network config.network.zoneHost = getValue< std::string >( "Network", "ZoneHost", "127.0.0.1" ); diff --git a/src/lobby/GameConnection.cpp b/src/lobby/GameConnection.cpp index f5e5180e..6b17b453 100644 --- a/src/lobby/GameConnection.cpp +++ b/src/lobby/GameConnection.cpp @@ -128,7 +128,7 @@ void Sapphire::Network::GameConnection::getCharList( FFXIVARR_PACKET_RAW& packet serverListPacket->data().seq = 1; serverListPacket->data().offset = 0; serverListPacket->data().numServers = 1; - serverListPacket->data().server[ 0 ].id = g_serverLobby.getConfig().global.parameters.worldID; + serverListPacket->data().server[ 0 ].id = g_serverLobby.getConfig().global.general.worldID; serverListPacket->data().server[ 0 ].index = 0; serverListPacket->data().final = 1; strcpy( serverListPacket->data().server[ 0 ].name, g_serverLobby.getConfig().worldName.c_str() ); @@ -161,8 +161,8 @@ void Sapphire::Network::GameConnection::getCharList( FFXIVARR_PACKET_RAW& packet auto& charEntry = charList[ charIndex ]; details.uniqueId = std::get< 1 >( charEntry ); details.contentId = std::get< 2 >( charEntry ); - details.serverId = g_serverLobby.getConfig().global.parameters.worldID; - details.serverId1 = g_serverLobby.getConfig().global.parameters.worldID; + details.serverId = g_serverLobby.getConfig().global.general.worldID; + details.serverId1 = g_serverLobby.getConfig().global.general.worldID; details.index = charIndex; strcpy( details.charDetailJson, std::get< 3 >( charEntry ).c_str() ); strcpy( details.nameChara, std::get< 0 >( charEntry ).c_str() ); diff --git a/src/lobby/ServerLobby.cpp b/src/lobby/ServerLobby.cpp index 7d09dcbe..d1530dcf 100644 --- a/src/lobby/ServerLobby.cpp +++ b/src/lobby/ServerLobby.cpp @@ -155,7 +155,7 @@ namespace Sapphire g_restConnector.restHost = m_config.global.network.restHost + ":" + std::to_string( m_config.global.network.restPort ); - g_restConnector.serverSecret = m_config.global.parameters.serverSecret; + g_restConnector.serverSecret = m_config.global.general.serverSecret; return true; } diff --git a/src/world/ServerMgr.cpp b/src/world/ServerMgr.cpp index 5014dc08..d675859a 100644 --- a/src/world/ServerMgr.cpp +++ b/src/world/ServerMgr.cpp @@ -127,7 +127,7 @@ void Sapphire::World::ServerMgr::run( int32_t argc, char* argv[] ) Logger::info( "Setting up generated EXD data" ); auto pExdData = std::make_shared< Data::ExdDataGenerated >(); - auto dataPath = m_config.global.parameters.dataPath; + auto dataPath = m_config.global.general.dataPath; if( !pExdData->init( dataPath ) ) { Logger::fatal( "Error setting up generated EXD data. Make sure that DataPath is set correctly in global.ini" );