Merge remote-tracking branch 'origin/stg-2.409' into ticket37

[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 69513d08ca128dd90d1643a5651381c6eafd22f9..6bf33ddb189288e5daaedfb95c458ace5fe4b510 100644 (file)
--- a/stglibs/srvconf.lib/include/stg/servconf.h
+++ b/stglibs/srvconf.lib/include/stg/servconf.h
@@ -27,26 +27,24 @@
 #ifndef SERVCONF_H
 #define SERVCONF_H
 
 #ifndef SERVCONF_H
 #define SERVCONF_H
 

-#include "netunit.h"
-
-#include "stg/parser_auth_by.h"
-#include "stg/parser_server_info.h"
-#include "stg/parser_check_user.h"
-
-#include "stg/os_int.h"
-#include "stg/const.h"
+#include <expat.h>

 
 #include <list>
 #include <vector>
 #include <string>
 
 
 #include <list>
 #include <vector>
 #include <string>
 

-#include <expat.h>
+#include "stg/os_int.h"
+#include "stg/const.h"
+#include "netunit.h"

 
 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)
 
 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 UNAME_LEN       (256)
+#define SERV_VER_LEN    (64)
+#define DIRNAME_LEN     (16)

 
 //-----------------------------------------------------------------------------
 struct STAT
 
 //-----------------------------------------------------------------------------
 struct STAT


@@ -58,6 +56,17 @@ struct STAT
     double      freeMb;
 };
 //-----------------------------------------------------------------------------
     double      freeMb;
 };
 //-----------------------------------------------------------------------------

+struct SERVERINFO
+{
+    std::string version;
+    int         tariffNum;
+    int         tariffType;
+    int         usersNum;
+    std::string uname;
+    int         dirNum;
+    std::string dirName[DIR_NUM];
+};
+//-----------------------------------------------------------------------------

 struct USERDATA
 {
     std::string     login;
 struct USERDATA
 {
     std::string     login;


@@ -89,14 +98,26 @@ struct USERDATA
 };
 //-----------------------------------------------------------------------------
 typedef void(*RecvUserDataCb_t)(USERDATA * ud, void * data);
 };
 //-----------------------------------------------------------------------------
 typedef void(*RecvUserDataCb_t)(USERDATA * ud, void * data);

+typedef void(*RecvServerInfoDataCb_t)(SERVERINFO * si, void * data);

 typedef int(*RecvChgUserCb_t)(const char * asnwer, void * data);
 typedef int(*RecvChgUserCb_t)(const char * asnwer, void * data);

+typedef int(*RecvCheckUserCb_t)(const char * answer, void * data);

 typedef int(*RecvSendMessageCb_t)(const char * answer, void * data);
 typedef int(*RecvSendMessageCb_t)(const char * answer, void * data);

+typedef void(*RecvAuthByDataCb_t)(const std::vector<std::string> & list, void * data);

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

+class PARSER
+{
+public:
+    PARSER() {}
+    virtual ~PARSER() {}
+    virtual int ParseStart(const char *el, const char **attr) = 0;
+    virtual void ParseEnd(const char *el) = 0;
+};
+//-----------------------------------------------------------------------------

 class PARSER_CHG_USER: public PARSER
 {
 public:
 class PARSER_CHG_USER: public PARSER
 {
 public:


@@ -109,7 +130,20 @@ private:
     RecvChgUserCb_t RecvChgUserCb;
     void * chgUserCbData;
     int depth;
     RecvChgUserCb_t RecvChgUserCb;
     void * chgUserCbData;
     int depth;

-    bool error;
+};
+//-----------------------------------------------------------------------------
+class PARSER_CHECK_USER: public PARSER
+{
+public:
+    PARSER_CHECK_USER();
+    int  ParseStart(const char *el, const char **attr);
+    void ParseEnd(const char *el);
+    void ParseAnswer(const char *el, const char **attr);
+    void SetCheckUserRecvCb(RecvCheckUserCb_t, void * data);
+private:
+    RecvCheckUserCb_t RecvCheckUserCb;
+    void * checkUserCbData;
+    int depth;

 };
 //-----------------------------------------------------------------------------
 class PARSER_GET_USERS: public PARSER
 };
 //-----------------------------------------------------------------------------
 class PARSER_GET_USERS: public PARSER


@@ -128,7 +162,6 @@ private:
     void * userDataCb;
     USERDATA user;
     int depth;
     void * userDataCb;
     USERDATA user;
     int depth;

-    bool error;

 };
 //-----------------------------------------------------------------------------
 class PARSER_GET_USER: public PARSER
 };
 //-----------------------------------------------------------------------------
 class PARSER_GET_USER: public PARSER


@@ -150,6 +183,31 @@ private:
     bool error;
 };
 //-----------------------------------------------------------------------------
     bool error;
 };
 //-----------------------------------------------------------------------------

+class PARSER_GET_SERVER_INFO: public PARSER
+{
+public:
+    PARSER_GET_SERVER_INFO();
+    int  ParseStart(const char *el, const char **attr);
+    void ParseEnd(const char *el);
+    void ParseServerInfo(const char *el, const char **attr);
+    bool GetError();
+    void SetServerInfoRecvCb(RecvServerInfoDataCb_t, void * data);
+private:
+    void ParseUname(const char ** attr);
+    void ParseServerVersion(const char ** attr);
+    void ParseUsersNum(const char ** attr);
+    void ParseTariffsNum(const char ** attr);
+    void ParseTariffType(const char ** attr);
+    void ParseDirNum(const char **attr);
+    void ParseDirName(const char **attr, int d);
+
+    RecvServerInfoDataCb_t RecvServerInfoDataCb;
+    void * serverInfoDataCb;
+    int depth;
+    bool error;
+    SERVERINFO serverInfo;
+};
+//-----------------------------------------------------------------------------

 class PARSER_SEND_MESSAGE: public PARSER
 {
 public:
 class PARSER_SEND_MESSAGE: public PARSER
 {
 public:


@@ -162,13 +220,30 @@ private:
     RecvSendMessageCb_t RecvSendMessageCb;
     void * sendMessageCbData;
     int depth;
     RecvSendMessageCb_t RecvSendMessageCb;
     void * sendMessageCbData;
     int depth;

+};
+//-----------------------------------------------------------------------------
+class PARSER_AUTH_BY: public PARSER
+{
+public:
+    PARSER_AUTH_BY();
+    int  ParseStart(const char *el, const char **attr);
+    void ParseEnd(const char *el);
+    void ParseServerInfo(const char *el, const char **attr);
+    bool GetError();
+    void SetRecvCb(RecvAuthByDataCb_t, void * data);
+private:
+    RecvAuthByDataCb_t RecvAuthByDataCb;
+    void * authByDataCb;
+    int depth;

     bool error;
     bool error;

+    std::vector<std::string> list;

 };
 //-----------------------------------------------------------------------------
 class SERVCONF
 {
 public:
     SERVCONF();
 };
 //-----------------------------------------------------------------------------
 class SERVCONF
 {
 public:
     SERVCONF();

+    ~SERVCONF();

     void SetServer(const char * server);
     void SetPort(uint16_t port);
 
     void SetServer(const char * server);
     void SetPort(uint16_t port);
 


@@ -176,21 +251,21 @@ public:
     void SetAdmPassword(const char * password);
 
     void SetUserDataRecvCb(RecvUserDataCb_t, void * data);
     void SetAdmPassword(const char * password);
 
     void SetUserDataRecvCb(RecvUserDataCb_t, void * data);

-    void SetAuthByCallback(PARSER_AUTH_BY::CALLBACK f, void * data);
-    void SetServerInfoCallback(PARSER_SERVER_INFO::CALLBACK f, void * data);
+    void SetGetUserAuthByRecvCb(RecvAuthByDataCb_t, void * data);
+    void SetServerInfoRecvCb(RecvServerInfoDataCb_t, void * data);

     void SetChgUserCb(RecvChgUserCb_t, void * data);
     void SetChgUserCb(RecvChgUserCb_t, void * data);

-    void SetCheckUserCallback(PARSER_CHECK_USER::CALLBACK f, void * data);
+    void SetCheckUserCb(RecvCheckUserCb_t, void * data);

     void SetGetUserDataRecvCb(RecvUserDataCb_t, void * data);
     void SetSendMessageCb(RecvSendMessageCb_t, void * data);
 
     int GetUsers();
     int GetUser(const char * login);
     int ChgUser(const char * request);
     void SetGetUserDataRecvCb(RecvUserDataCb_t, void * data);
     void SetSendMessageCb(RecvSendMessageCb_t, void * data);
 
     int GetUsers();
     int GetUser(const char * login);
     int ChgUser(const char * request);

-    int AuthBy(const char * login);
+    int GetUserAuthBy(const char * login);

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

-    int ServerInfo();
+    int GetServerInfo();

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


@@ -204,13 +279,12 @@ private:
     PARSER_GET_USERS parserGetUsers;
     PARSER_GET_USER parserGetUser;
     PARSER_AUTH_BY parserAuthBy;
     PARSER_GET_USERS parserGetUsers;
     PARSER_GET_USER parserGetUser;
     PARSER_AUTH_BY parserAuthBy;

-    PARSER_SERVER_INFO  parserServerInfo;
+    PARSER_GET_SERVER_INFO  parserServerInfo;

     PARSER_CHG_USER parserChgUser;
     PARSER_CHECK_USER parserCheckUser;
     PARSER_SEND_MESSAGE parserSendMessage;
 
     NETTRANSACT nt;
     PARSER_CHG_USER parserChgUser;
     PARSER_CHECK_USER parserCheckUser;
     PARSER_SEND_MESSAGE parserSendMessage;
 
     NETTRANSACT nt;

-    int parseDepth;

 
     std::string errorMsg;
     int error;
 
     std::string errorMsg;
     int error;


@@ -218,18 +292,18 @@ private:
 
     RecvUserDataCb_t RecvUserDataCb;
     RecvUserDataCb_t RecvGetUserDataCb;
 
     RecvUserDataCb_t RecvUserDataCb;
     RecvUserDataCb_t RecvGetUserDataCb;

-    PARSER_AUTH_BY::CALLBACK authByCallback;
-    PARSER_SERVER_INFO::CALLBACK serverInfoCallback;
+    RecvAuthByDataCb_t RecvAuthByCb;
+    RecvServerInfoDataCb_t RecvServerInfoDataCb;

     RecvChgUserCb_t RecvChgUserCb;
     RecvChgUserCb_t RecvChgUserCb;

-    PARSER_CHECK_USER::CALLBACK checkUserCallback;
+    RecvCheckUserCb_t RecvCheckUserCb;

     RecvSendMessageCb_t RecvSendMessageCb;
 
     void * getUserDataDataCb;
     RecvSendMessageCb_t RecvSendMessageCb;
 
     void * getUserDataDataCb;

-    void * authByData;
+    void * getUserAuthByDataCb;

     void * getUsersDataDataCb;
     void * getUsersDataDataCb;

-    void * serverInfoData;
+    void * getServerInfoDataCb;

     void * chgUserDataCb;
     void * chgUserDataCb;

-    void * checkUserData;
+    void * checkUserDataCb;

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