#include "stg/servconf.h"
#include "netunit.h"
-#include "parser_auth_by.h"
-#include "parser_server_info.h"
-#include "parser_check_user.h"
-#include "parser_get_users.h"
-#include "parser_get_user.h"
+#include "parsers/auth_by.h"
+#include "parsers/server_info.h"
+#include "parsers/check_user.h"
+#include "parsers/get_users.h"
+#include "parsers/get_user.h"
+#include "parsers/chg_user.h"
+#include "parsers/send_message.h"
+#include "parsers/base.h"
#include "stg/common.h"
IMPL(const std::string & server, uint16_t port,
const std::string & login, const std::string & password);
+ int ServerInfo(SERVER_INFO::CALLBACK f, void * data);
+
+ int GetAdmins(GET_ADMINS::CALLBACK f, void * data);
+ int GetAdmin(const std::string & login, GET_ADMIN::CALLBACK f, void * data);
+ int ChgAdmin(const std::string & login, const ADMIN_CONF_RES & conf, CHG_ADMIN::CALLBACK f, void * data);
+ int AddAdmin(const std::string & login, const ADMIN_CONF & conf, GET_ADMIN::CALLBACK f, void * data);
+ int DelAdmin(const std::string & login, DEL_ADMIN::CALLBACK f, void * data);
+
int GetUsers(GET_USERS::CALLBACK f, void * data);
int GetUser(const std::string & login, GET_USER::CALLBACK f, void * data);
- int ChgUser(const std::string & request, PARSER_CHG_USER::CALLBACK f, void * data);
+ int ChgUser(const std::string & request, CHG_USER::CALLBACK f, void * data);
int AuthBy(const std::string & login, AUTH_BY::CALLBACK f, void * data);
- int SendMessage(const std::string & request, PARSER_SEND_MESSAGE::CALLBACK f, void * data);
- int ServerInfo(SERVER_INFO::CALLBACK f, void * data);
+ int SendMessage(const std::string & request, SEND_MESSAGE::CALLBACK f, void * data);
int CheckUser(const std::string & login, const std::string & password, CHECK_USER::CALLBACK f, void * data);
const std::string & GetStrError() const;
static void End(void * data, const char * el);
private:
- GET_USERS::PARSER parserGetUsers;
- GET_USER::PARSER parserGetUser;
- AUTH_BY::PARSER parserAuthBy;
- SERVER_INFO::PARSER parserServerInfo;
- PARSER_CHG_USER parserChgUser;
- CHECK_USER::PARSER parserCheckUser;
- PARSER_SEND_MESSAGE parserSendMessage;
-
NETTRANSACT nt;
std::string errorMsg;
XML_Parser parser;
- int Exec(const std::string & request, PARSER & cp);
+ template <class P, typename C>
+ int Exec(const std::string & request, C callback, void * data);
static bool AnsRecv(void * data, const std::string & chunk, bool final);
};
return pImpl->GetUser(login, f, data);
}
-int SERVCONF::ChgUser(const std::string & request, PARSER_CHG_USER::CALLBACK f, void * data)
+int SERVCONF::ChgUser(const std::string & request, CHG_USER::CALLBACK f, void * data)
{
return pImpl->ChgUser(request, f, data);
}
return pImpl->AuthBy(login, f, data);
}
-int SERVCONF::SendMessage(const std::string & request, PARSER_SEND_MESSAGE::CALLBACK f, void * data)
+int SERVCONF::SendMessage(const std::string & request, SEND_MESSAGE::CALLBACK f, void * data)
{
return pImpl->SendMessage(request, f, data);
}
//-----------------------------------------------------------------------------
int SERVCONF::IMPL::GetUser(const std::string & login, GET_USER::CALLBACK f, void * data)
{
-parserGetUser.SetCallback(f, data);
-return Exec("<GetUser login=\"" + login + "\"/>", parserGetUser);
+return Exec<GET_USER::PARSER>("<GetUser login=\"" + login + "\"/>", f, data);
}
//-----------------------------------------------------------------------------
int SERVCONF::IMPL::AuthBy(const std::string & login, AUTH_BY::CALLBACK f, void * data)
{
-parserAuthBy.SetCallback(f, data);
-return Exec("<GetUserAuthBy login=\"" + login + "\"/>", parserAuthBy);
+return Exec<AUTH_BY::PARSER>("<GetUserAuthBy login=\"" + login + "\"/>", f, data);
}
//-----------------------------------------------------------------------------
int SERVCONF::IMPL::GetUsers(GET_USERS::CALLBACK f, void * data)
{
-parserGetUsers.SetCallback(f, data);
-return Exec("<GetUsers/>", parserGetUsers);
+return Exec<GET_USERS::PARSER>("<GetUsers/>", f, data);
}
//-----------------------------------------------------------------------------
int SERVCONF::IMPL::ServerInfo(SERVER_INFO::CALLBACK f, void * data)
{
-parserServerInfo.SetCallback(f, data);
-return Exec("<GetServerInfo/>", parserServerInfo);
+return Exec<SERVER_INFO::PARSER>("<GetServerInfo/>", f, data);
}
//-----------------------------------------------------------------------------
-int SERVCONF::IMPL::ChgUser(const std::string & request, PARSER_CHG_USER::CALLBACK f, void * data)
+int SERVCONF::IMPL::ChgUser(const std::string & request, CHG_USER::CALLBACK f, void * data)
{
-parserChgUser.SetCallback(f, data);
-return Exec(request, parserChgUser);
+return Exec<CHG_USER::PARSER>(request, f, data);
}
//-----------------------------------------------------------------------------
-int SERVCONF::IMPL::SendMessage(const std::string & request, PARSER_SEND_MESSAGE::CALLBACK f, void * data)
+int SERVCONF::IMPL::SendMessage(const std::string & request, SEND_MESSAGE::CALLBACK f, void * data)
{
-parserSendMessage.SetCallback(f, data);
-return Exec(request, parserSendMessage);
+return Exec<SEND_MESSAGE::PARSER>(request, f, data);
}
//-----------------------------------------------------------------------------
int SERVCONF::IMPL::CheckUser(const std::string & login, const std::string & password, CHECK_USER::CALLBACK f, void * data)
{
-parserCheckUser.SetCallback(f, data);
-return Exec("<CheckUser login=\"" + login + "\" password=\"" + password + "\"/>", parserCheckUser);
+return Exec<CHECK_USER::PARSER>("<CheckUser login=\"" + login + "\" password=\"" + password + "\"/>", f, data);
}
//-----------------------------------------------------------------------------
void SERVCONF::IMPL::Start(void * data, const char * el, const char ** attr)
return errorMsg;
}
//-----------------------------------------------------------------------------
-int SERVCONF::IMPL::Exec(const std::string & request, PARSER & cp)
+template <class P, typename C>
+int SERVCONF::IMPL::Exec(const std::string & request, C callback, void * data)
{
+P cp(callback, data);
XML_ParserReset(parser, NULL);
XML_SetElementHandler(parser, Start, End);
XML_SetUserData(parser, &cp);