X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/20d884ddac6b8cacedb2701e282efe3ff9785cbf..dbd170cc6a6787325b3bd00391f2727041ea4ad9:/projects/sgconf/config.h diff --git a/projects/sgconf/config.h b/projects/sgconf/config.h index 424ca519..d3659a1d 100644 --- a/projects/sgconf/config.h +++ b/projects/sgconf/config.h @@ -35,8 +35,11 @@ struct CONFIG RESETABLE configFile; RESETABLE server; RESETABLE port; + RESETABLE localAddress; + RESETABLE localPort; RESETABLE userName; RESETABLE userPass; + RESETABLE showConfig; CONFIG & operator=(const CONFIG & rhs) { @@ -46,27 +49,37 @@ struct CONFIG 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("{ "); + std::string res; if (!configFile.empty()) - res += "configFile: '" + configFile.data() + "',"; + res += "configFile: '" + configFile.data() + "'\n"; if (!server.empty()) - res += " server: '" + server.data() + "',"; + res += "server: '" + server.data() + "'\n"; if (!port.empty()) - res += " port: " + x2str(port.data()) + ","; + 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() + "',"; + res += "userName: '" + userName.data() + "'\n"; if (!userPass.empty()) - res += " userPass: '" + userPass.data() + "'"; - return res + " }"; + res += "userPass: '" + userPass.data() + "\n"; + return res; } };