Use common functions in admin tests and service tests.

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

diff --git a/projects/sgconf/config.h b/projects/sgconf/config.h
index 9ec9616eabebfc11ad40f6e5d8d30f0853fcf030..e52111e3fcd9eac231bd54ed335974609469aede 100644 (file)
--- a/projects/sgconf/config.h
+++ b/projects/sgconf/config.h
@@ -35,6 +35,8 @@ 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;
 
@@ -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