X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/46432ca916d65b4801a11f7b8196201bea6d2d2d..f37a10e385478953dcc19c2ca3b75bf5465a79c1:/projects/sgconf/config.h diff --git a/projects/sgconf/config.h b/projects/sgconf/config.h index 9ed90c73..d3659a1d 100644 --- a/projects/sgconf/config.h +++ b/projects/sgconf/config.h @@ -21,6 +21,7 @@ #ifndef __STG_SGCONF_CONFIG_H__ #define __STG_SGCONF_CONFIG_H__ +#include "stg/common.h" #include "stg/resetable.h" #include "stg/os_int.h" @@ -34,10 +35,54 @@ struct CONFIG RESETABLE configFile; RESETABLE server; RESETABLE port; + RESETABLE localAddress; + RESETABLE localPort; RESETABLE userName; RESETABLE userPass; + RESETABLE showConfig; + + CONFIG & operator=(const CONFIG & rhs) + { + if (!rhs.configFile.empty()) + configFile = rhs.configFile; + if (!rhs.server.empty()) + server = rhs.server; + if (!rhs.port.empty()) + port = rhs.port; + if (!rhs.localAddress.empty()) + localAddress = rhs.localAddress; + if (!rhs.localPort.empty()) + localPort = rhs.localPort; + if (!rhs.userName.empty()) + userName = rhs.userName; + if (!rhs.userPass.empty()) + userPass = rhs.userPass; + if (!rhs.showConfig.empty()) + showConfig = rhs.showConfig; + return *this; + } + + std::string Serialize() const + { + std::string res; + if (!configFile.empty()) + res += "configFile: '" + configFile.data() + "'\n"; + if (!server.empty()) + res += "server: '" + server.data() + "'\n"; + if (!port.empty()) + res += "port: " + x2str(port.data()) + "\n"; + if (!localAddress.empty()) + res += "local address: '" + localAddress.data() + "'\n"; + if (!localPort.empty()) + res += "local port: " + x2str(localPort.data()) + "\n"; + if (!userName.empty()) + res += "userName: '" + userName.data() + "'\n"; + if (!userPass.empty()) + res += "userPass: '" + userPass.data() + "\n"; + return res; + } }; -} +} // namespace SGCONF #endif