X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/70f71a1009f438ec1d514cb31bfa9ecba6832aec..acdf6ab94fee26ebc4017bf32cf6171c7d9462e9:/projects/sgconf/corps.cpp

diff --git a/projects/sgconf/corps.cpp b/projects/sgconf/corps.cpp
index f079acfc..586ddcd5 100644
--- a/projects/sgconf/corps.cpp
+++ b/projects/sgconf/corps.cpp
@@ -24,7 +24,7 @@ if (level == 0)
 return dash ? std::string(level * 4 - 2, ' ') + "- " : std::string(level * 4, ' ');
 }
 
-void PrintCorp(const STG::GET_CORP::INFO & info, size_t level = 0)
+void PrintCorp(const STG::GetCorp::Info & info, size_t level = 0)
 {
 std::cout << Indent(level, true) << "name: " << info.name << "\n"
           << Indent(level)       << "cash: " << info.cash << "\n";
@@ -51,7 +51,7 @@ std::cout << "Success.\n";
 
 void GetCorpsCallback(bool result,
                       const std::string & reason,
-                      const std::vector<STG::GET_CORP::INFO> & info,
+                      const std::vector<STG::GetCorp::Info> & info,
                       void * /*data*/)
 {
 if (!result)
@@ -66,7 +66,7 @@ for (size_t i = 0; i < info.size(); ++i)
 
 void GetCorpCallback(bool result,
                      const std::string & reason,
-                     const STG::GET_CORP::INFO & info,
+                     const STG::GetCorp::Info & info,
                      void * /*data*/)
 {
 if (!result)
@@ -81,8 +81,10 @@ bool GetCorpsFunction(const SGCONF::CONFIG & config,
                       const std::string & /*arg*/,
                       const std::map<std::string, std::string> & /*options*/)
 {
-STG::SERVCONF proto(config.server.data(),
+STG::ServConf proto(config.server.data(),
                     config.port.data(),
+                    config.localAddress.data(),
+                    config.localPort.data(),
                     config.userName.data(),
                     config.userPass.data());
 return proto.GetCorporations(GetCorpsCallback, NULL) == STG::st_ok;
@@ -92,8 +94,10 @@ bool GetCorpFunction(const SGCONF::CONFIG & config,
                      const std::string & arg,
                      const std::map<std::string, std::string> & /*options*/)
 {
-STG::SERVCONF proto(config.server.data(),
+STG::ServConf proto(config.server.data(),
                     config.port.data(),
+                    config.localAddress.data(),
+                    config.localPort.data(),
                     config.userName.data(),
                     config.userPass.data());
 return proto.GetCorp(arg, GetCorpCallback, NULL) == STG::st_ok;
@@ -103,8 +107,10 @@ bool DelCorpFunction(const SGCONF::CONFIG & config,
                      const std::string & arg,
                      const std::map<std::string, std::string> & /*options*/)
 {
-STG::SERVCONF proto(config.server.data(),
+STG::ServConf proto(config.server.data(),
                     config.port.data(),
+                    config.localAddress.data(),
+                    config.localPort.data(),
                     config.userName.data(),
                     config.userPass.data());
 return proto.DelCorp(arg, SimpleCallback, NULL) == STG::st_ok;
@@ -114,11 +120,13 @@ bool AddCorpFunction(const SGCONF::CONFIG & config,
                      const std::string & arg,
                      const std::map<std::string, std::string> & options)
 {
-CORP_CONF_RES conf;
+STG::CorpConfOpt conf;
 conf.name = arg;
 SGCONF::MaybeSet(options, "cash", conf.cash);
-STG::SERVCONF proto(config.server.data(),
+STG::ServConf proto(config.server.data(),
                     config.port.data(),
+                    config.localAddress.data(),
+                    config.localPort.data(),
                     config.userName.data(),
                     config.userPass.data());
 return proto.AddCorp(arg, conf, SimpleCallback, NULL) == STG::st_ok;
@@ -128,11 +136,13 @@ bool ChgCorpFunction(const SGCONF::CONFIG & config,
                      const std::string & arg,
                      const std::map<std::string, std::string> & options)
 {
-CORP_CONF_RES conf;
+STG::CorpConfOpt conf;
 conf.name = arg;
 SGCONF::MaybeSet(options, "cash", conf.cash);
-STG::SERVCONF proto(config.server.data(),
+STG::ServConf proto(config.server.data(),
                     config.port.data(),
+                    config.localAddress.data(),
+                    config.localPort.data(),
                     config.userName.data(),
                     config.userPass.data());
 return proto.ChgCorp(conf, SimpleCallback, NULL) == STG::st_ok;