#include "stg/servconf.h"
+#include "stg/netunit.h"
+#include "stg/servconf_types.h"
+
#include "stg/common.h"
#include <cstdio>
#include <cstring>
-namespace
+#include <expat.h>
+
+class SERVCONF::IMPL
+{
+public:
+ IMPL(const std::string & server, uint16_t port,
+ const std::string & login, const std::string & password);
+
+ int GetUsers(PARSER_GET_USERS::CALLBACK f, void * data);
+ int GetUser(const std::string & login, PARSER_GET_USER::CALLBACK f, void * data);
+ int ChgUser(const std::string & request, PARSER_CHG_USER::CALLBACK f, void * data);
+ int AuthBy(const std::string & login, PARSER_AUTH_BY::CALLBACK f, void * data);
+ int SendMessage(const std::string & request, PARSER_SEND_MESSAGE::CALLBACK f, void * data);
+ int ServerInfo(PARSER_SERVER_INFO::CALLBACK f, void * data);
+ int CheckUser(const std::string & login, const std::string & password, PARSER_CHECK_USER::CALLBACK f, void * data);
+
+ const std::string & GetStrError() const;
+ static void Start(void * data, const char * el, const char ** attr);
+ static void End(void * data, const char * el);
+
+private:
+ PARSER_GET_USERS parserGetUsers;
+ PARSER_GET_USER parserGetUser;
+ PARSER_AUTH_BY parserAuthBy;
+ PARSER_SERVER_INFO parserServerInfo;
+ PARSER_CHG_USER parserChgUser;
+ PARSER_CHECK_USER parserCheckUser;
+ PARSER_SEND_MESSAGE parserSendMessage;
+
+ NETTRANSACT nt;
+
+ std::string errorMsg;
+ XML_Parser parser;
+
+ int Exec(const std::string & request, PARSER & cp);
+
+ static bool AnsRecv(void * data, const std::string & chunk, bool final);
+};
+
+/*namespace
{
void ElementStart(void * data, const char * el, const char ** attr)
{
-SERVCONF * sc = static_cast<SERVCONF *>(data);
-sc->Start(el, attr);
+static_cast<SERVCONF::IMPL *>(data)->Start(el, attr);
}
void ElementEnd(void * data, const char * el)
{
-SERVCONF * sc = static_cast<SERVCONF *>(data);
-sc->End(el);
+static_cast<SERVCONF::IMPL *>(data)->End(el);
}
} // namespace anonymous
+*/
-bool AnsRecv(void * data, const std::string & chunk, bool final)
+bool SERVCONF::IMPL::AnsRecv(void * data, const std::string & chunk, bool final)
{
-SERVCONF * sc = static_cast<SERVCONF *>(data);
+SERVCONF::IMPL * sc = static_cast<SERVCONF::IMPL *>(data);
if (XML_Parse(sc->parser, chunk.c_str(), chunk.length(), final) == XML_STATUS_ERROR)
{
return true;
}
-//-----------------------------------------------------------------------------
SERVCONF::SERVCONF(const std::string & server, uint16_t port,
const std::string & login, const std::string & password)
- : currParser(NULL),
- nt( server, port, login, password )
+ : pImpl(new IMPL(server, port, login, password))
{
-parser = XML_ParserCreate(NULL);
-nt.SetRxCallback(this, AnsRecv);
}
-//-----------------------------------------------------------------------------
-int SERVCONF::GetUser(const char * l)
-{
-char request[255];
-snprintf(request, 255, "<GetUser login=\"%s\"/>", l);
-return Exec(request, parserGetUser);
+SERVCONF::~SERVCONF()
+{
+ delete pImpl;
}
-//-----------------------------------------------------------------------------
-int SERVCONF::AuthBy(const char * l)
+
+int SERVCONF::GetUsers(PARSER_GET_USERS::CALLBACK f, void * data)
{
-char request[255];
-snprintf(request, 255, "<GetUserAuthBy login=\"%s\"/>", l);
+ return pImpl->GetUsers( f, data );
+}
-return Exec(request, parserAuthBy);
+int SERVCONF::GetUser(const std::string & login, PARSER_GET_USER::CALLBACK f, void * data)
+{
+ return pImpl->GetUser(login, f, data);
}
-//-----------------------------------------------------------------------------
-int SERVCONF::GetUsers()
+
+int SERVCONF::ChgUser(const std::string & request, PARSER_CHG_USER::CALLBACK f, void * data)
{
-char request[] = "<GetUsers/>";
+ return pImpl->ChgUser(request, f, data);
+}
-return Exec(request, parserGetUsers);
+int SERVCONF::AuthBy(const std::string & login, PARSER_AUTH_BY::CALLBACK f, void * data)
+{
+ return pImpl->AuthBy(login, f, data);
}
-//-----------------------------------------------------------------------------
-int SERVCONF::ServerInfo()
+
+int SERVCONF::SendMessage(const std::string & request, PARSER_SEND_MESSAGE::CALLBACK f, void * data)
{
-char request[] = "<GetServerInfo/>";
+ return pImpl->SendMessage(request, f, data);
+}
-return Exec(request, parserServerInfo);
+int SERVCONF::ServerInfo(PARSER_SERVER_INFO::CALLBACK f, void * data)
+{
+ return pImpl->ServerInfo(f, data);
}
-//-----------------------------------------------------------------------------
-int SERVCONF::ChgUser(const char * request)
+
+int SERVCONF::CheckUser(const std::string & login, const std::string & password, PARSER_CHECK_USER::CALLBACK f, void * data)
{
-return Exec(request, parserChgUser);
+ return pImpl->CheckUser(login, password, f, data);
}
-//-----------------------------------------------------------------------------
-int SERVCONF::SendMessage(const char * request)
+
+const std::string & SERVCONF::GetStrError() const
{
-return Exec(request, parserSendMessage);
+ return pImpl->GetStrError();
}
+
//-----------------------------------------------------------------------------
-int SERVCONF::CheckUser(const char * login, const char * password)
+SERVCONF::IMPL::IMPL(const std::string & server, uint16_t port,
+ const std::string & login, const std::string & password)
+ : nt( server, port, login, password )
{
-char request[255];
-snprintf(request, 255, "<CheckUser login=\"%s\" password=\"%s\"/>", login, password);
-
-return Exec(request, parserCheckUser);
+parser = XML_ParserCreate(NULL);
+nt.SetRxCallback(this, AnsRecv);
}
//-----------------------------------------------------------------------------
-int SERVCONF::Start(const char * el, const char ** attr)
+int SERVCONF::IMPL::GetUser(const std::string & login, PARSER_GET_USER::CALLBACK f, void * data)
{
-currParser->ParseStart(el, attr);
-return 0;
+parserGetUser.SetCallback(f, data);
+return Exec("<GetUser login=\"" + login + "\"/>", parserGetUser);
}
//-----------------------------------------------------------------------------
-void SERVCONF::End(const char * el)
+int SERVCONF::IMPL::AuthBy(const std::string & login, PARSER_AUTH_BY::CALLBACK f, void * data)
{
-currParser->ParseEnd(el);
+parserAuthBy.SetCallback(f, data);
+return Exec("<GetUserAuthBy login=\"" + login + "\"/>", parserAuthBy);
}
//-----------------------------------------------------------------------------
-void SERVCONF::SetGetUsersCallback(PARSER_GET_USERS::CALLBACK f, void * data)
+int SERVCONF::IMPL::GetUsers(PARSER_GET_USERS::CALLBACK f, void * data)
{
parserGetUsers.SetCallback(f, data);
+return Exec("<GetUsers/>", parserGetUsers);
}
//-----------------------------------------------------------------------------
-void SERVCONF::SetGetUserCallback(PARSER_GET_USER::CALLBACK f, void * data)
+int SERVCONF::IMPL::ServerInfo(PARSER_SERVER_INFO::CALLBACK f, void * data)
{
-parserGetUser.SetCallback(f, data);
+parserServerInfo.SetCallback(f, data);
+return Exec("<GetServerInfo/>", parserServerInfo);
}
//-----------------------------------------------------------------------------
-void SERVCONF::SetAuthByCallback(PARSER_AUTH_BY::CALLBACK f, void * data)
+int SERVCONF::IMPL::ChgUser(const std::string & request, PARSER_CHG_USER::CALLBACK f, void * data)
{
-parserAuthBy.SetCallback(f, data);
+parserChgUser.SetCallback(f, data);
+return Exec(request, parserChgUser);
}
//-----------------------------------------------------------------------------
-void SERVCONF::SetServerInfoCallback(PARSER_SERVER_INFO::CALLBACK f, void * data)
+int SERVCONF::IMPL::SendMessage(const std::string & request, PARSER_SEND_MESSAGE::CALLBACK f, void * data)
{
-parserServerInfo.SetCallback(f, data);
+parserSendMessage.SetCallback(f, data);
+return Exec(request, parserSendMessage);
}
//-----------------------------------------------------------------------------
-void SERVCONF::SetChgUserCallback(PARSER_CHG_USER::CALLBACK f, void * data)
+int SERVCONF::IMPL::CheckUser(const std::string & login, const std::string & password, PARSER_CHECK_USER::CALLBACK f, void * data)
{
-parserChgUser.SetCallback(f, data);
+parserCheckUser.SetCallback(f, data);
+return Exec("<CheckUser login=\"" + login + "\" password=\"" + password + "\"/>", parserCheckUser);
}
//-----------------------------------------------------------------------------
-void SERVCONF::SetCheckUserCallback(PARSER_CHECK_USER::CALLBACK f, void * data)
+void SERVCONF::IMPL::Start(void * data, const char * el, const char ** attr)
{
-parserCheckUser.SetCallback(f, data);
+PARSER * currParser = static_cast<PARSER *>(data);
+currParser->ParseStart(el, attr);
}
//-----------------------------------------------------------------------------
-void SERVCONF::SetSendMessageCallback(PARSER_SEND_MESSAGE::CALLBACK f, void * data)
+void SERVCONF::IMPL::End(void * data, const char * el)
{
-parserSendMessage.SetCallback(f, data);
+PARSER * currParser = static_cast<PARSER *>(data);
+currParser->ParseEnd(el);
}
//-----------------------------------------------------------------------------
-const std::string & SERVCONF::GetStrError() const
+const std::string & SERVCONF::IMPL::GetStrError() const
{
return errorMsg;
}
//-----------------------------------------------------------------------------
-int SERVCONF::Exec(const char * request, PARSER & cp)
+int SERVCONF::IMPL::Exec(const std::string & request, PARSER & cp)
{
-currParser = &cp;
-
XML_ParserReset(parser, NULL);
-XML_SetElementHandler(parser, ElementStart, ElementEnd);
-XML_SetUserData(parser, this);
+XML_SetElementHandler(parser, Start, End);
+XML_SetUserData(parser, &cp);
int ret = 0;
if ((ret = nt.Connect()) != st_ok)
errorMsg = nt.GetError();
return ret;
}
-if ((ret = nt.Transact(request)) != st_ok)
+if ((ret = nt.Transact(request.c_str())) != st_ok)
{
errorMsg = nt.GetError();
return ret;
git.stg.codes / stg.git / blobdiff