X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/8e80bb9cec2c90dd61f810fb1525932a434288eb..8bfc0bdce2bf4f53ac2c072e7a44e9a7d3b3cca8:/projects/sgconf/services.cpp?ds=sidebyside diff --git a/projects/sgconf/services.cpp b/projects/sgconf/services.cpp index ede820af..2d0caa04 100644 --- a/projects/sgconf/services.cpp +++ b/projects/sgconf/services.cpp @@ -2,6 +2,7 @@ #include "api_action.h" #include "options.h" +#include "makeproto.h" #include "config.h" #include "utils.h" @@ -85,39 +86,21 @@ bool GetServicesFunction(const SGCONF::CONFIG & config, const std::string & /*arg*/, const std::map & /*options*/) { -STG::ServConf proto(config.server.data(), - config.port.data(), - config.localAddress.data(), - config.localPort.data(), - config.userName.data(), - config.userPass.data()); -return proto.GetServices(GetServicesCallback, NULL) == STG::st_ok; +return makeProto(config).GetServices(GetServicesCallback, NULL) == STG::st_ok; } bool GetServiceFunction(const SGCONF::CONFIG & config, const std::string & arg, const std::map & /*options*/) { -STG::ServConf proto(config.server.data(), - config.port.data(), - config.localAddress.data(), - config.localPort.data(), - config.userName.data(), - config.userPass.data()); -return proto.GetService(arg, GetServiceCallback, NULL) == STG::st_ok; +return makeProto(config).GetService(arg, GetServiceCallback, NULL) == STG::st_ok; } bool DelServiceFunction(const SGCONF::CONFIG & config, const std::string & arg, const std::map & /*options*/) { -STG::ServConf proto(config.server.data(), - config.port.data(), - config.localAddress.data(), - config.localPort.data(), - config.userName.data(), - config.userPass.data()); -return proto.DelService(arg, SimpleCallback, NULL) == STG::st_ok; +return makeProto(config).DelService(arg, SimpleCallback, NULL) == STG::st_ok; } bool AddServiceFunction(const SGCONF::CONFIG & config, @@ -129,13 +112,7 @@ conf.name = arg; SGCONF::MaybeSet(options, "cost", conf.cost); SGCONF::MaybeSet(options, "pay-day", conf.payDay); SGCONF::MaybeSet(options, "comment", conf.comment); -STG::ServConf proto(config.server.data(), - config.port.data(), - config.localAddress.data(), - config.localPort.data(), - config.userName.data(), - config.userPass.data()); -return proto.AddService(arg, conf, SimpleCallback, NULL) == STG::st_ok; +return makeProto(config).AddService(arg, conf, SimpleCallback, NULL) == STG::st_ok; } bool ChgServiceFunction(const SGCONF::CONFIG & config, @@ -147,13 +124,7 @@ conf.name = arg; SGCONF::MaybeSet(options, "cost", conf.cost); SGCONF::MaybeSet(options, "pay-day", conf.payDay); SGCONF::MaybeSet(options, "comment", conf.comment); -STG::ServConf proto(config.server.data(), - config.port.data(), - config.localAddress.data(), - config.localPort.data(), - config.userName.data(), - config.userPass.data()); -return proto.ChgService(conf, SimpleCallback, NULL) == STG::st_ok; +return makeProto(config).ChgService(conf, SimpleCallback, NULL) == STG::st_ok; } } // namespace anonymous