git.stg.codes
/
stg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Show more information abot XML parsing error.
[stg.git]
/
projects
/
sgconf
/
config.h
diff --git
a/projects/sgconf/config.h
b/projects/sgconf/config.h
index 0c76d2de374f9a3114a70465a4bf6900dc47ce39..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> 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<std::string> userName;
RESETABLE<std::string> userPass;
@@
-46,6
+48,10
@@
struct CONFIG
server = rhs.server;
if (!rhs.port.empty())
port = rhs.port;
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())
if (!rhs.userName.empty())
userName = rhs.userName;
if (!rhs.userPass.empty())
@@
-62,6
+68,10
@@
struct CONFIG
res += " server: '" + server.data() + "',";
if (!port.empty())
res += " port: " + x2str(port.data()) + ",";
res += " server: '" + server.data() + "',";
if (!port.empty())
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() + "',";
if (!userPass.empty())
if (!userName.empty())
res += " userName: '" + userName.data() + "',";
if (!userPass.empty())
@@
-70,6
+80,6
@@
struct CONFIG
}
};
}
};
-}
+}
// namespace SGCONF
#endif
#endif