X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/b3139bf3f37b3b0244efea8b4b5e5a7d0bc90095..79ce57fb1209a4ad02f96aadb0c47e8162b9f007:/projects/sgconf/config.h diff --git a/projects/sgconf/config.h b/projects/sgconf/config.h index 9ec9616e..e52111e3 100644 --- a/projects/sgconf/config.h +++ b/projects/sgconf/config.h @@ -35,6 +35,8 @@ struct CONFIG RESETABLE configFile; RESETABLE server; RESETABLE port; + RESETABLE localAddress; + RESETABLE localPort; RESETABLE userName; RESETABLE userPass; @@ -46,6 +48,10 @@ 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()) @@ -57,19 +63,23 @@ struct CONFIG { std::string res("{ "); if (!configFile.empty()) - res += "configFile: '" + configFile.data() + "'"; + res += "configFile: '" + configFile.data() + "',"; if (!server.empty()) - res += ", server: '" + server.data() + "'"; + res += " server: '" + server.data() + "',"; if (!port.empty()) - res += ", port: " + x2str(port.data()); + res += " port: " + x2str(port.data()) + ","; + if (!localAddress.empty()) + res += " local address: '" + localAddress.data() + "',"; + if (!localPort.empty()) + res += " local port: " + x2str(localPort.data()) + ","; if (!userName.empty()) - res += ", userName: '" + userName.data() + "'"; + res += " userName: '" + userName.data() + "',"; if (!userPass.empty()) - res += ", userPass: '" + userPass.data() + "'"; + res += " userPass: '" + userPass.data() + "'"; return res + " }"; } }; -} +} // namespace SGCONF #endif