Fixed error handling in SetUser.

[stg.git] / stglibs / srvconf.lib / include / stg / servconf.h

diff --git a/stglibs/srvconf.lib/include/stg/servconf.h b/stglibs/srvconf.lib/include/stg/servconf.h
index fddbcf7a32629f4ec3cf0820a69bbab3ba330efd..b422f70825e6a7f87cd79e298f539e3ce0099892 100644 (file)
--- a/stglibs/srvconf.lib/include/stg/servconf.h
+++ b/stglibs/srvconf.lib/include/stg/servconf.h
@@ -34,6 +34,8 @@
 #include "stg/parser_check_user.h"
 #include "stg/parser_get_user.h"
 #include "stg/parser_get_users.h"
 #include "stg/parser_check_user.h"
 #include "stg/parser_get_user.h"
 #include "stg/parser_get_users.h"

+#include "stg/parser_chg_user.h"
+#include "stg/parser_send_message.h"

 
 #include "stg/os_int.h"
 #include "stg/const.h"
 
 #include "stg/os_int.h"
 #include "stg/const.h"


@@ -44,35 +46,17 @@
 
 #include <expat.h>
 
 
 #include <expat.h>
 

-void Start(void *data, const char *el, const char **attr);
-void End(void *data, const char *el);
+void Start(void * data, const char * el, const char ** attr);
+void End(void * data, const char * el);

 
 #define MAX_ERR_STR_LEN (64)
 #define IP_STRING_LEN   (255)
 
 #define MAX_ERR_STR_LEN (64)
 #define IP_STRING_LEN   (255)

-//-----------------------------------------------------------------------------
-typedef int(*RecvChgUserCb_t)(const char * asnwer, void * data);
-typedef int(*RecvSendMessageCb_t)(const char * answer, void * data);
-//-----------------------------------------------------------------------------
+

 struct ADMINDATA
 {
     char login[ADM_LOGIN_LEN];
 };
 //-----------------------------------------------------------------------------
 struct ADMINDATA
 {
     char login[ADM_LOGIN_LEN];
 };
 //-----------------------------------------------------------------------------

-class PARSER_SEND_MESSAGE: public PARSER
-{
-public:
-    PARSER_SEND_MESSAGE();
-    int  ParseStart(const char *el, const char **attr);
-    void ParseEnd(const char *el);
-    void ParseAnswer(const char *el, const char **attr);
-    void SetSendMessageRecvCb(RecvSendMessageCb_t, void * data);
-private:
-    RecvSendMessageCb_t RecvSendMessageCb;
-    void * sendMessageCbData;
-    int depth;
-    bool error;
-};
-//-----------------------------------------------------------------------------

 class SERVCONF
 {
 public:
 class SERVCONF
 {
 public:


@@ -86,25 +70,22 @@ public:
     void SetGetUsersCallback(PARSER_GET_USERS::CALLBACK f, void * data);
     void SetAuthByCallback(PARSER_AUTH_BY::CALLBACK f, void * data);
     void SetServerInfoCallback(PARSER_SERVER_INFO::CALLBACK f, void * data);
     void SetGetUsersCallback(PARSER_GET_USERS::CALLBACK f, void * data);
     void SetAuthByCallback(PARSER_AUTH_BY::CALLBACK f, void * data);
     void SetServerInfoCallback(PARSER_SERVER_INFO::CALLBACK f, void * data);

-    void SetChgUserCb(RecvChgUserCb_t, void * data);
+    void SetChgUserCallback(PARSER_CHG_USER::CALLBACK f, void * data);

     void SetCheckUserCallback(PARSER_CHECK_USER::CALLBACK f, void * data);
     void SetGetUserCallback(PARSER_GET_USER::CALLBACK f, void * data);
     void SetCheckUserCallback(PARSER_CHECK_USER::CALLBACK f, void * data);
     void SetGetUserCallback(PARSER_GET_USER::CALLBACK f, void * data);

-    void SetSendMessageCb(RecvSendMessageCb_t, void * data);
+    void SetSendMessageCallback(PARSER_SEND_MESSAGE::CALLBACK f, void * data);

 
     int GetUsers();
     int GetUser(const char * login);
     int ChgUser(const char * request);
     int AuthBy(const char * login);
 
     int GetUsers();
     int GetUser(const char * login);
     int ChgUser(const char * request);
     int AuthBy(const char * login);

-    // TODO: Remove this shit!
-    int MsgUser(const char * request);
-    int SendMessage(const char * login, const char * message, int prio);
+    int SendMessage(const char * request);

     int ServerInfo();
     int CheckUser(const char * login, const char * password);
 
     const std::string & GetStrError() const;
     int ServerInfo();
     int CheckUser(const char * login, const char * password);
 
     const std::string & GetStrError() const;

-    int GetError();
-    int Start(const char *el, const char **attr);
-    void End(const char *el);
+    int Start(const char * el, const char ** attr);
+    void End(const char * el);

 
 private:
     PARSER * currParser;
 
 private:
     PARSER * currParser;


@@ -118,27 +99,11 @@ private:
     PARSER_SEND_MESSAGE parserSendMessage;
 
     NETTRANSACT nt;
     PARSER_SEND_MESSAGE parserSendMessage;
 
     NETTRANSACT nt;

-    int parseDepth;

 
     std::string errorMsg;
 
     std::string errorMsg;

-    int error;

     XML_Parser parser;
 
     XML_Parser parser;
 

-    PARSER_GET_USERS::CALLBACK getUsersCallback;
-    PARSER_GET_USER::CALLBACK getUserCallback;
-    PARSER_AUTH_BY::CALLBACK authByCallback;
-    PARSER_SERVER_INFO::CALLBACK serverInfoCallback;
-    RecvChgUserCb_t RecvChgUserCb;
-    PARSER_CHECK_USER::CALLBACK checkUserCallback;
-    RecvSendMessageCb_t RecvSendMessageCb;
-
-    void * getUsersData;
-    void * getUserData;
-    void * authByData;
-    void * serverInfoData;
-    void * chgUserDataCb;
-    void * checkUserData;
-    void * sendMessageDataCb;
+    int Exec(const char * request);

 
     friend int AnsRecv(void * data, std::list<std::string> * list);
 };
 
     friend int AnsRecv(void * data, std::list<std::string> * list);
 };