#include <cstdio>
#include <cstring>
-//-----------------------------------------------------------------------------
-int AnsRecv(void * data, std::list<std::string> * list1)
+namespace
{
-SERVCONF * sc = static_cast<SERVCONF *>(data);
-
-XML_ParserReset(sc->parser, NULL);
-XML_SetElementHandler(sc->parser, Start, End);
-XML_SetUserData(sc->parser, data);
-char ans[ENC_MSG_LEN + 1];
-int len, done = 0;
-
-//loop parsing
-std::list<std::string>::iterator node;
-node = list1->begin();
-
-while (node != list1->end())
- {
- strncpy(ans, node->c_str(), ENC_MSG_LEN);
- ans[ENC_MSG_LEN] = 0;
- len = strlen(ans);
-
- if (XML_Parse(sc->parser, ans, len, done) == XML_STATUS_ERROR)
- {
- strprintf(&sc->errorMsg, "XML parse error at line %d: %s",
- static_cast<int>(XML_GetCurrentLineNumber(sc->parser)),
- XML_ErrorString(XML_GetErrorCode(sc->parser)));
- printf("%s\n", sc->errorMsg.c_str());
- return st_xml_parse_error;
- }
- ++node;
- }
-
-return st_ok;
-}
-//-----------------------------------------------------------------------------
-void Start(void *data, const char *el, const char **attr)
+void ElementStart(void * data, const char * el, const char ** attr)
{
SERVCONF * sc = static_cast<SERVCONF *>(data);
sc->Start(el, attr);
}
-//-----------------------------------------------------------------------------
-void End(void * data, const char * el)
+
+void ElementEnd(void * data, const char * el)
{
SERVCONF * sc = static_cast<SERVCONF *>(data);
sc->End(el);
}
-//-----------------------------------------------------------------------------
-SERVCONF::SERVCONF()
- : currParser(NULL)
-{
-parser = XML_ParserCreate(NULL);
-nt.SetRxCallback(this, AnsRecv);
-}
-//-----------------------------------------------------------------------------
-void SERVCONF::SetServer(const char * server)
-{
-nt.SetServer(server);
-}
-//-----------------------------------------------------------------------------
-void SERVCONF::SetPort(uint16_t port)
-{
-nt.SetServerPort(port);
-}
-//-----------------------------------------------------------------------------
-void SERVCONF::SetAdmLogin(const char * login)
+
+} // namespace anonymous
+
+bool AnsRecv(void * data, const std::string & chunk, bool final)
{
-nt.SetLogin(login);
+SERVCONF * sc = static_cast<SERVCONF *>(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",
+ static_cast<int>(XML_GetCurrentLineNumber(sc->parser)),
+ XML_ErrorString(XML_GetErrorCode(sc->parser)));
+ printf("%s\n", sc->errorMsg.c_str());
+ return false;
+ }
+
+return true;
}
+
//-----------------------------------------------------------------------------
-void SERVCONF::SetAdmPassword(const char * password)
+SERVCONF::SERVCONF(const std::string & server, uint16_t port,
+ const std::string & login, const std::string & password)
+ : currParser(NULL),
+ nt( server, port, login, password )
{
-nt.SetPassword(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);
-currParser = &parserGetUser;
-
-return Exec(request);
+return Exec(request, parserGetUser);
}
//-----------------------------------------------------------------------------
int SERVCONF::AuthBy(const char * l)
char request[255];
snprintf(request, 255, "<GetUserAuthBy login=\"%s\"/>", l);
-currParser = &parserAuthBy;
-
-return Exec(request);
+return Exec(request, parserAuthBy);
}
//-----------------------------------------------------------------------------
int SERVCONF::GetUsers()
{
char request[] = "<GetUsers/>";
-currParser = &parserGetUsers;
-
-return Exec(request);
+return Exec(request, parserGetUsers);
}
//-----------------------------------------------------------------------------
int SERVCONF::ServerInfo()
{
char request[] = "<GetServerInfo/>";
-currParser = &parserServerInfo;
-
-return Exec(request);
+return Exec(request, parserServerInfo);
}
//-----------------------------------------------------------------------------
int SERVCONF::ChgUser(const char * request)
{
-currParser = &parserChgUser;
-
-return Exec(request);
+return Exec(request, parserChgUser);
}
//-----------------------------------------------------------------------------
int SERVCONF::SendMessage(const char * request)
{
-currParser = &parserSendMessage;
-
-return Exec(request);
+return Exec(request, parserSendMessage);
}
//-----------------------------------------------------------------------------
int SERVCONF::CheckUser(const char * login, const char * password)
char request[255];
snprintf(request, 255, "<CheckUser login=\"%s\" password=\"%s\"/>", login, password);
-currParser = &parserCheckUser;
-
-return Exec(request);
+return Exec(request, parserCheckUser);
}
//-----------------------------------------------------------------------------
int SERVCONF::Start(const char * el, const char ** attr)
return errorMsg;
}
//-----------------------------------------------------------------------------
-int SERVCONF::Exec(const char * request)
+int SERVCONF::Exec(const char * request, PARSER & cp)
{
-nt.Reset();
+currParser = &cp;
+
+XML_ParserReset(parser, NULL);
+XML_SetElementHandler(parser, ElementStart, ElementEnd);
+XML_SetUserData(parser, this);
int ret = 0;
if ((ret = nt.Connect()) != st_ok)