Added missing semicolon.

[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 67c2f248dbae85c49b08fb1cf7f4eaa0189170e2..714a4e79357f3858d937bb463393311db17c26f9 100644 (file)
--- a/stglibs/srvconf.lib/include/stg/servconf.h
+++ b/stglibs/srvconf.lib/include/stg/servconf.h
@@ -27,79 +27,30 @@
 #ifndef SERVCONF_H
 #define SERVCONF_H
 
 #ifndef SERVCONF_H
 #define SERVCONF_H
 

-#include <expat.h>
+#include "netunit.h"

 
 

-#include <list>
-#include <string>
+#include "stg/parser_auth_by.h"
+#include "stg/parser_server_info.h"
+#include "stg/parser_check_user.h"
+#include "stg/parser_get_user.h"
+#include "stg/parser_get_users.h"

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

-#include "netunit.h"
+
+#include <list>
+#include <vector>
+#include <string>
+
+#include <expat.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
-{
-    long long   su[DIR_NUM];
-    long long   sd[DIR_NUM];
-    long long   mu[DIR_NUM];
-    long long   md[DIR_NUM];
-    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;
-    std::string     password;
-    double          cash;
-    double          credit;
-    time_t          creditExpire;
-    double          lastCash;
-    double          prepaidTraff;
-    int             down;
-    int             passive;
-    int             disableDetailStat;
-    int             connected;
-    int             alwaysOnline;
-    uint32_t        ip;
-    std::string     ips;
-    std::string     tariff;
-    std::string     iface;
-    std::string     group;
-    std::string     note;
-    std::string     email;
-    std::string     name;
-    std::string     address;
-    std::string     phone;
-    STAT            stat;
-    std::string     userData[USERDATA_NUM];
-
-    struct USERDATA * next;
-};

 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-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);
 //-----------------------------------------------------------------------------
 struct ADMINDATA
 typedef int(*RecvSendMessageCb_t)(const char * answer, void * data);
 //-----------------------------------------------------------------------------
 struct ADMINDATA


@@ -107,15 +58,6 @@ struct ADMINDATA
     char login[ADM_LOGIN_LEN];
 };
 //-----------------------------------------------------------------------------
     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:


@@ -131,84 +73,6 @@ private:
     bool error;
 };
 //-----------------------------------------------------------------------------
     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;
-    bool error;
-};
-//-----------------------------------------------------------------------------
-class PARSER_GET_USERS: public PARSER
-{
-public:
-    PARSER_GET_USERS();
-    int  ParseStart(const char *el, const char **attr);
-    void ParseEnd(const char *el);
-    void ParseUsers(const char *el, const char **attr);
-    void ParseUser(const char *el, const char **attr);
-    void ParseUserParams(const char *el, const char **attr);
-    void ParseUserLoadStat(const char * el, const char ** attr);
-    void SetUserDataRecvCb(RecvUserDataCb_t, void * data);
-private:
-    RecvUserDataCb_t RecvUserDataCb;
-    void * userDataCb;
-    USERDATA user;
-    int depth;
-    bool error;
-};
-//-----------------------------------------------------------------------------
-class PARSER_GET_USER: public PARSER
-{
-public:
-    PARSER_GET_USER();
-    int  ParseStart(const char *el, const char **attr);
-    void ParseEnd(const char *el);
-    void ParseUsers(const char *el, const char **attr);
-    void ParseUser(const char *el, const char **attr);
-    void ParseUserParams(const char *el, const char **attr);
-    void ParseUserLoadStat(const char * el, const char ** attr);
-    void SetUserDataRecvCb(RecvUserDataCb_t, void * data);
-private:
-    RecvUserDataCb_t RecvUserDataCb;
-    void * userDataCb;
-    USERDATA user;
-    int depth;
-    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:


@@ -234,20 +98,22 @@ public:
     void SetAdmLogin(const char * login);
     void SetAdmPassword(const char * password);
 
     void SetAdmLogin(const char * login);
     void SetAdmPassword(const char * password);
 

-    void SetUserDataRecvCb(RecvUserDataCb_t, void * data);
-    void SetServerInfoRecvCb(RecvServerInfoDataCb_t, void * data);
+    void SetGetUsers(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 SetChgUserCb(RecvChgUserCb_t, void * data);

-    void SetCheckUserCb(RecvCheckUserCb_t, void * data);
-    void SetGetUserDataRecvCb(RecvUserDataCb_t, 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);
 
     int GetUsers();
     int GetUser(const char * login);
     int ChgUser(const char * request);
     void SetSendMessageCb(RecvSendMessageCb_t, void * data);
 
     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);
     // TODO: Remove this shit!
     int MsgUser(const char * request);
     int SendMessage(const char * login, const char * message, int prio);

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

     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;


@@ -260,7 +126,8 @@ private:
 
     PARSER_GET_USERS parserGetUsers;
     PARSER_GET_USER parserGetUser;
 
     PARSER_GET_USERS parserGetUsers;
     PARSER_GET_USER parserGetUser;

-    PARSER_GET_SERVER_INFO  parserServerInfo;
+    PARSER_AUTH_BY parserAuthBy;
+    PARSER_SERVER_INFO  parserServerInfo;

     PARSER_CHG_USER parserChgUser;
     PARSER_CHECK_USER parserCheckUser;
     PARSER_SEND_MESSAGE parserSendMessage;
     PARSER_CHG_USER parserChgUser;
     PARSER_CHECK_USER parserCheckUser;
     PARSER_SEND_MESSAGE parserSendMessage;


@@ -272,18 +139,20 @@ private:
     int error;
     XML_Parser parser;
 
     int error;
     XML_Parser parser;
 

-    RecvUserDataCb_t RecvUserDataCb;
-    RecvUserDataCb_t RecvGetUserDataCb;
-    RecvServerInfoDataCb_t RecvServerInfoDataCb;
+    PARSER_GET_USERS::CALLBACK getUsersCallback;
+    PARSER_GET_USER::CALLBACK getUserCallback;
+    PARSER_AUTH_BY::CALLBACK authByCallback;
+    PARSER_SERVER_INFO::CALLBACK serverInfoCallback;

     RecvChgUserCb_t RecvChgUserCb;
     RecvChgUserCb_t RecvChgUserCb;

-    RecvCheckUserCb_t RecvCheckUserCb;
+    PARSER_CHECK_USER::CALLBACK checkUserCallback;

     RecvSendMessageCb_t RecvSendMessageCb;
 
     RecvSendMessageCb_t RecvSendMessageCb;
 

-    void * getUserDataDataCb;
-    void * getUsersDataDataCb;
-    void * getServerInfoDataCb;
+    void * getUserData;
+    void * authByData;
+    void * getUsersData;
+    void * serverInfoData;

     void * chgUserDataCb;
     void * chgUserDataCb;

-    void * checkUserDataCb;
+    void * checkUserData;

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