X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/2d0dedb8abc45c661e35e729b5ff71724d4d749a..e9f74534ad9bd4df3cecab080f6b6ac9a6cb6b7c:/stglibs/srvconf.lib/servconf.cpp?ds=inline diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp index a9881f05..046190ee 100644 --- a/stglibs/srvconf.lib/servconf.cpp +++ b/stglibs/srvconf.lib/servconf.cpp @@ -50,8 +50,10 @@ #include #include +#include #include +#include using namespace STG; @@ -60,6 +62,10 @@ class SERVCONF::IMPL public: IMPL(const std::string & server, uint16_t port, const std::string & login, const std::string & password); + IMPL(const std::string & server, uint16_t port, + const std::string & localAddress, uint16_t localPort, + const std::string & login, const std::string & password); + ~IMPL() { XML_ParserFree(parser); } const std::string & GetStrError() const; static void Start(void * data, const char * el, const char ** attr); @@ -70,45 +76,48 @@ public: template int Exec(const std::string & request, C callback, void * data) { - P cp(callback, data); + P cp(callback, data, encoding); return ExecImpl(request, cp); } template int Exec(const std::string & tag, const std::string & request, C callback, void * data) { - P cp(tag, callback, data); + P cp(tag, callback, data, encoding); return ExecImpl(request, cp); } + const std::string & Encoding() const { return encoding; } + private: NETTRANSACT nt; + std::string encoding; std::string errorMsg; XML_Parser parser; - static bool ParserRecv(void * data, const std::string & chunk, bool final); - static bool SimpleRecv(void * data, const std::string & chunk, bool final); + static bool ParserRecv(const std::string & chunk, bool final, void * data); + static bool SimpleRecv(const std::string & chunk, bool final, void * data); int ExecImpl(const std::string & request, PARSER & cp); }; -bool SERVCONF::IMPL::ParserRecv(void * data, const std::string & chunk, bool final) +bool SERVCONF::IMPL::ParserRecv(const std::string & chunk, bool final, void * data) { SERVCONF::IMPL * sc = static_cast(data); if (XML_Parse(sc->parser, chunk.c_str(), chunk.length(), final) == XML_STATUS_ERROR) { - strprintf(&sc->errorMsg, "XML parse error at line %d: %s", + strprintf(&sc->errorMsg, "XML parse error at line %d, %d: %s. Is final: %d", static_cast(XML_GetCurrentLineNumber(sc->parser)), - XML_ErrorString(XML_GetErrorCode(sc->parser))); - printf("%s\n", sc->errorMsg.c_str()); + static_cast(XML_GetCurrentColumnNumber(sc->parser)), + XML_ErrorString(XML_GetErrorCode(sc->parser)), (int)final); return false; } return true; } -bool SERVCONF::IMPL::SimpleRecv(void * data, const std::string & chunk, bool /*final*/) +bool SERVCONF::IMPL::SimpleRecv(const std::string & chunk, bool /*final*/, void * data) { *static_cast(data) += chunk; return true; @@ -120,6 +129,13 @@ SERVCONF::SERVCONF(const std::string & server, uint16_t port, { } +SERVCONF::SERVCONF(const std::string & server, uint16_t port, + const std::string & localAddress, uint16_t localPort, + const std::string & login, const std::string & password) + : pImpl(new IMPL(server, port, localAddress, localPort, login, password)) +{ +} + SERVCONF::~SERVCONF() { delete pImpl; @@ -137,7 +153,7 @@ return pImpl->RawXML(request, f, data); // -- Admins -- -int SERVCONF::GetAdmins(GET_ADMINS::CALLBACK f, void * data) +int SERVCONF::GetAdmins(GET_CONTAINER::CALLBACK::TYPE f, void * data) { return pImpl->Exec >("admins", "", f, data); } @@ -149,7 +165,7 @@ return pImpl->Exec("", f, int SERVCONF::ChgAdmin(const ADMIN_CONF_RES & conf, SIMPLE::CALLBACK f, void * data) { -return pImpl->Exec("ChgAdmin", "", f, data); +return pImpl->Exec("ChgAdmin", "Encoding()) + "/>", f, data); } int SERVCONF::AddAdmin(const std::string & login, @@ -159,7 +175,7 @@ int SERVCONF::AddAdmin(const std::string & login, int res = pImpl->Exec("AddAdmin", "", f, data); if (res != st_ok) return res; -return pImpl->Exec("ChgAdmin", "", f, data); +return pImpl->Exec("ChgAdmin", "Encoding()) + "/>", f, data); } int SERVCONF::DelAdmin(const std::string & login, SIMPLE::CALLBACK f, void * data) @@ -169,7 +185,7 @@ return pImpl->Exec("DelAdmin", "::TYPE f, void * data) { return pImpl->Exec >("tariffs", "", f, data); } @@ -181,7 +197,7 @@ return pImpl->Exec("", f, int SERVCONF::ChgTariff(const TARIFF_DATA_RES & tariffData, SIMPLE::CALLBACK f, void * data) { -return pImpl->Exec("SetTariff", "" + CHG_TARIFF::Serialize(tariffData) + "", f, data); +return pImpl->Exec("SetTariff", "" + CHG_TARIFF::Serialize(tariffData, pImpl->Encoding()) + "", f, data); } int SERVCONF::AddTariff(const std::string & name, @@ -191,7 +207,7 @@ int SERVCONF::AddTariff(const std::string & name, int res = pImpl->Exec("AddTariff", "", f, data); if (res != st_ok) return res; -return pImpl->Exec("SetTariff", "" + CHG_TARIFF::Serialize(tariffData) + "", f, data); +return pImpl->Exec("SetTariff", "" + CHG_TARIFF::Serialize(tariffData, pImpl->Encoding()) + "", f, data); } int SERVCONF::DelTariff(const std::string & name, SIMPLE::CALLBACK f, void * data) @@ -201,7 +217,7 @@ return pImpl->Exec("DelTariff", "::TYPE f, void * data) { return pImpl->Exec >("users", "", f, data); } @@ -216,7 +232,7 @@ int SERVCONF::ChgUser(const std::string & login, const USER_STAT_RES & stat, SIMPLE::CALLBACK f, void * data) { -return pImpl->Exec("" + CHG_USER::Serialize(conf, stat) + "", f, data); +return pImpl->Exec("" + CHG_USER::Serialize(conf, stat, pImpl->Encoding()) + "", f, data); } int SERVCONF::DelUser(const std::string & login, SIMPLE::CALLBACK f, void * data) @@ -224,9 +240,15 @@ int SERVCONF::DelUser(const std::string & login, SIMPLE::CALLBACK f, void * data return pImpl->Exec("DelUser", "", f, data); } -int SERVCONF::AddUser(const std::string & login, SIMPLE::CALLBACK f, void * data) +int SERVCONF::AddUser(const std::string & login, + const USER_CONF_RES & conf, + const USER_STAT_RES & stat, + SIMPLE::CALLBACK f, void * data) { -return pImpl->Exec("AddUser", "", f, data); +int res = pImpl->Exec("AddUser", "", f, data); +if (res != st_ok) + return res; +return pImpl->Exec("" + CHG_USER::Serialize(conf, stat, pImpl->Encoding()) + "", f, data); } int SERVCONF::AuthBy(const std::string & login, AUTH_BY::CALLBACK f, void * data) @@ -236,7 +258,7 @@ return pImpl->Exec("", int SERVCONF::SendMessage(const std::string & login, const std::string & text, SIMPLE::CALLBACK f, void * data) { -return pImpl->Exec("SendMessage", "", f, data); +return pImpl->Exec("SendMessageResult", "", f, data); } int SERVCONF::CheckUser(const std::string & login, const std::string & password, SIMPLE::CALLBACK f, void * data) @@ -246,7 +268,7 @@ return pImpl->Exec("CheckUser", "::TYPE f, void * data) { return pImpl->Exec >("services", "", f, data); } @@ -258,7 +280,7 @@ return pImpl->Exec("", f int SERVCONF::ChgService(const SERVICE_CONF_RES & conf, SIMPLE::CALLBACK f, void * data) { -return pImpl->Exec("SetService", "" + CHG_SERVICE::Serialize(conf) + "", f, data); +return pImpl->Exec("SetService", "Encoding()) + "/>", f, data); } int SERVCONF::AddService(const std::string & name, @@ -268,7 +290,7 @@ int SERVCONF::AddService(const std::string & name, int res = pImpl->Exec("AddService", "", f, data); if (res != st_ok) return res; -return pImpl->Exec("SetService", "" + CHG_SERVICE::Serialize(conf) + "", f, data); +return pImpl->Exec("SetService", "Encoding()) + "/>", f, data); } int SERVCONF::DelService(const std::string & name, SIMPLE::CALLBACK f, void * data) @@ -278,7 +300,7 @@ return pImpl->Exec("DelService", "::TYPE f, void * data) { return pImpl->Exec >("corporations", "", f, data); } @@ -290,7 +312,7 @@ return pImpl->Exec("", f, data int SERVCONF::ChgCorp(const CORP_CONF_RES & conf, SIMPLE::CALLBACK f, void * data) { -return pImpl->Exec("SetCorp", "" + CHG_CORP::Serialize(conf) + "", f, data); +return pImpl->Exec("SetCorp", "" + CHG_CORP::Serialize(conf, pImpl->Encoding()) + "", f, data); } int SERVCONF::AddCorp(const std::string & name, @@ -300,7 +322,7 @@ int SERVCONF::AddCorp(const std::string & name, int res = pImpl->Exec("AddCorp", "", f, data); if (res != st_ok) return res; -return pImpl->Exec("SetCorp", "" + CHG_CORP::Serialize(conf) + "", f, data); +return pImpl->Exec("SetCorp", "" + CHG_CORP::Serialize(conf, pImpl->Encoding()) + "", f, data); } int SERVCONF::DelCorp(const std::string & name, SIMPLE::CALLBACK f, void * data) @@ -316,10 +338,23 @@ return pImpl->GetStrError(); //----------------------------------------------------------------------------- SERVCONF::IMPL::IMPL(const std::string & server, uint16_t port, const std::string & login, const std::string & password) - : nt( server, port, login, password ) + : nt(server, port, login, password) +{ +setlocale(LC_ALL, ""); +setlocale(LC_NUMERIC, "C"); +encoding = nl_langinfo(CODESET); +parser = XML_ParserCreate(NULL); +} +//----------------------------------------------------------------------------- +SERVCONF::IMPL::IMPL(const std::string & server, uint16_t port, + const std::string & localAddress, uint16_t localPort, + const std::string & login, const std::string & password) + : nt(server, port, localAddress, localPort, login, password) { +setlocale(LC_ALL, ""); +setlocale(LC_NUMERIC, "C"); +encoding = nl_langinfo(CODESET); parser = XML_ParserCreate(NULL); -nt.SetRxCallback(this, ParserRecv); } //----------------------------------------------------------------------------- void SERVCONF::IMPL::Start(void * data, const char * el, const char ** attr) @@ -349,49 +384,38 @@ int ret = 0; if ((ret = nt.Connect()) != st_ok) { errorMsg = nt.GetError(); + cp.Failure(errorMsg); return ret; } -if ((ret = nt.Transact(request.c_str())) != st_ok) - { - errorMsg = nt.GetError(); - return ret; - } -if ((ret = nt.Disconnect()) != st_ok) +if ((ret = nt.Transact(request, ParserRecv, this)) != st_ok) { errorMsg = nt.GetError(); + cp.Failure(errorMsg); return ret; } +nt.Disconnect(); return st_ok; } -int SERVCONF::IMPL::RawXML(const std::string & request, RAW_XML::CALLBACK f, void * data) +int SERVCONF::IMPL::RawXML(const std::string & request, RAW_XML::CALLBACK callback, void * data) { -std::string response; -nt.SetRxCallback(&response, SimpleRecv); int ret = 0; if ((ret = nt.Connect()) != st_ok) { - nt.SetRxCallback(this, ParserRecv); errorMsg = nt.GetError(); - f(false, errorMsg, "", data); + callback(false, errorMsg, "", data); return ret; } -if ((ret = nt.Transact(request.c_str())) != st_ok) - { - nt.SetRxCallback(this, ParserRecv); - errorMsg = nt.GetError(); - f(false, errorMsg, "", data); - return ret; - } -if ((ret = nt.Disconnect()) != st_ok) +std::string response; +if ((ret = nt.Transact(request, SimpleRecv, &response)) != st_ok) { - nt.SetRxCallback(this, ParserRecv); errorMsg = nt.GetError(); - f(false, errorMsg, "", data); + callback(false, errorMsg, "", data); return ret; } -nt.SetRxCallback(this, ParserRecv); -f(true, "", response, data); + +nt.Disconnect(); +callback(true, "", response, data); return st_ok; }