Moved base and utility classes from global scope.

[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 c62161be2853a70834f4ab9f735cf6a67282ee19..f709528f55228a6b9758a9ef4bffcffe50fbbb6f 100644 (file)
--- a/stglibs/srvconf.lib/include/stg/servconf.h
+++ b/stglibs/srvconf.lib/include/stg/servconf.h
@@ -24,110 +24,40 @@
  $Author: faust $
  */
 
  $Author: faust $
  */
 

-#ifndef SERVCONF_H
-#define SERVCONF_H
+#ifndef __STG_STGLIBS_SERVCONF_H__
+#define __STG_STGLIBS_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/parser_get_user.h"
-#include "stg/parser_get_users.h"
-#include "stg/parser_chg_user.h"
+#include "stg/servconf_types.h"

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

-#include "stg/const.h"

 
 

-#include <list>
-#include <vector>

 #include <string>
 
 #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)
-//-----------------------------------------------------------------------------
-typedef int (* RecvSendMessageCb_t)(const char * answer, void * data);
-//-----------------------------------------------------------------------------
-struct ADMINDATA
-{
-    char login[ADM_LOGIN_LEN];
-};
-//-----------------------------------------------------------------------------
-class PARSER_SEND_MESSAGE: public PARSER
+namespace STG

 {
 {

-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;
-};
-//-----------------------------------------------------------------------------
+

 class SERVCONF
 {
 public:
 class SERVCONF
 {
 public:

-    SERVCONF();
-    void SetServer(const char * server);
-    void SetPort(uint16_t port);
-
-    void SetAdmLogin(const char * login);
-    void SetAdmPassword(const char * password);
-
-    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 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 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);
-    int ServerInfo();
-    int CheckUser(const char * login, const char * password);
+    SERVCONF(const std::string & server, uint16_t port,
+             const std::string & login, const std::string & password);
+    ~SERVCONF();
+
+    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, CHG_USER::CALLBACK f, void * data);
+    int AuthBy(const std::string & login, AUTH_BY::CALLBACK f, void * data);
+    int SendMessage(const std::string & request, SEND_MESSAGE::CALLBACK f, void * data);
+    int ServerInfo(SERVER_INFO::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;
 
     const std::string & GetStrError() const;

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

 
 private:
 
 private:

-    PARSER * currParser;
-
-    PARSER_GET_USERS parserGetUsers;
-    PARSER_GET_USER parserGetUser;
-    PARSER_AUTH_BY parserAuthBy;
-    PARSER_SERVER_INFO  parserServerInfo;
-    PARSER_CHG_USER parserChgUser;
-    PARSER_CHECK_USER parserCheckUser;
-    PARSER_SEND_MESSAGE parserSendMessage;
-
-    NETTRANSACT nt;
-
-    std::string errorMsg;
-    XML_Parser parser;
-
-    RecvSendMessageCb_t RecvSendMessageCb;
-
-    void * sendMessageDataCb;
-
-    int Exec(const char * request);
-
-    friend int AnsRecv(void * data, std::list<std::string> * list);
+    class IMPL;
+    IMPL * pImpl;

 };
 };

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

 
 

-#endif  /* _SERVCONF_H_ */
+} // namespace STG
+
+#endif