Merge remote-tracking branch 'origin/master' into ticket

[stg.git] / projects / sgconf / corps.cpp

diff --git a/projects/sgconf/corps.cpp b/projects/sgconf/corps.cpp
index 1821770574e27d036aa0561fa6ea0a6fbdc4987a..4bd436dd2f56676e09e165fb4c78a2563d04b8ba 100644 (file)
--- a/projects/sgconf/corps.cpp
+++ b/projects/sgconf/corps.cpp
@@ -83,6 +83,8 @@ bool GetCorpsFunction(const SGCONF::CONFIG & config,
 {
 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;
@@ -94,6 +96,8 @@ bool GetCorpFunction(const SGCONF::CONFIG & config,
 {
 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;
@@ -105,6 +109,8 @@ bool DelCorpFunction(const SGCONF::CONFIG & config,
 {
 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;
@@ -119,6 +125,8 @@ conf.name = arg;
 SGCONF::MaybeSet(options, "cash", conf.cash);
 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;
@@ -133,6 +141,8 @@ conf.name = arg;
 SGCONF::MaybeSet(options, "cash", conf.cash);
 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;
@@ -147,6 +157,6 @@ blocks.Add("Corporation management options")
       .Add("get-corps", SGCONF::MakeAPIAction(commands, GetCorpsFunction), "\tget corporation list")
       .Add("get-corp", SGCONF::MakeAPIAction(commands, "<name>", GetCorpFunction), "get corporation")
       .Add("add-corp", SGCONF::MakeAPIAction(commands, "<name>", params, AddCorpFunction), "add corporation")
-      .Add("del-corp", SGCONF::MakeAPIAction(commands, "<name>", DelCorpFunction), "del corporation")
+      .Add("del-corp", SGCONF::MakeAPIAction(commands, "<name>", DelCorpFunction), "delete corporation")
       .Add("chg-corp", SGCONF::MakeAPIAction(commands, "<name>", params, ChgCorpFunction), "change corporation");
 }