Ticket. The stgTime argument added in TariffChangeIsAllowed() function

[stg.git] / projects / sgconf / config.h

diff --git a/projects/sgconf/config.h b/projects/sgconf/config.h
index 0c76d2de374f9a3114a70465a4bf6900dc47ce39..d3659a1d343423884b58fc32ef367d8e7a6f1af1 100644 (file)
--- a/projects/sgconf/config.h
+++ b/projects/sgconf/config.h
@@ -35,8 +35,11 @@ struct CONFIG
     RESETABLE<std::string> configFile;
     RESETABLE<std::string> server;
     RESETABLE<uint16_t> port;
+    RESETABLE<std::string> localAddress;
+    RESETABLE<uint16_t> localPort;
     RESETABLE<std::string> userName;
     RESETABLE<std::string> userPass;
+    RESETABLE<bool> showConfig;
 
     CONFIG & operator=(const CONFIG & rhs)
     {
@@ -46,30 +49,40 @@ 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;
     }
 };
 
-}
+} // namespace SGCONF
 
 #endif