Removed "alpha" from version.

[stg.git] / projects / stargazer / plugins / configuration / sgconfig / conn.h

diff --git a/projects/stargazer/plugins/configuration/sgconfig/conn.h b/projects/stargazer/plugins/configuration/sgconfig/conn.h
index 396e9753602afc04e0098b27425214a004cde6e9..fae0c4b2426d2c59f6296244e56ff4b7044caf9b 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/conn.h
+++ b/projects/stargazer/plugins/configuration/sgconfig/conn.h
@@ -21,12 +21,13 @@
 #ifndef __STG_SGCONFIG_CONN_H__
 #define __STG_SGCONFIG_CONN_H__
 
 #ifndef __STG_SGCONFIG_CONN_H__
 #define __STG_SGCONFIG_CONN_H__
 

+#include "parser.h"
+

 #include "stg/os_int.h"
 #include "stg/const.h"
 
 #include <stdexcept>
 #include <string>
 #include "stg/os_int.h"
 #include "stg/const.h"
 
 #include <stdexcept>
 #include <string>

-#include <map>

 
 #include <expat.h>
 
 
 #include <expat.h>
 


@@ -38,6 +39,7 @@ class USERS;
 class TARIFFS;
 class ADMIN;
 class BASE_PARSER;
 class TARIFFS;
 class ADMIN;
 class BASE_PARSER;

+class PLUGIN_LOGGER;

 
 namespace STG
 {
 
 namespace STG
 {


@@ -52,22 +54,23 @@ class Conn
             Error(const std::string& message) : runtime_error(message.c_str()) {}
         };
 
             Error(const std::string& message) : runtime_error(message.c_str()) {}
         };
 

-        Conn(const SETTINGS & settings,
-             ADMINS & admins,
-             USERS & users,
-             TARIFFS & tariffs,
-             int sock, const sockaddr_in& addr);
+        Conn(const BASE_PARSER::REGISTRY & registry,
+             ADMINS & admins, int sock, const sockaddr_in& addr,
+             PLUGIN_LOGGER & logger);

         ~Conn();
 
         int Sock() const { return m_sock; }
         uint32_t IP() const { return *(uint32_t *)(&m_addr.sin_addr); }
         ~Conn();
 
         int Sock() const { return m_sock; }
         uint32_t IP() const { return *(uint32_t *)(&m_addr.sin_addr); }

-        uint16_t Port() const { return m_addr.sin_port; }
+        uint16_t Port() const { return ntohs(m_addr.sin_port); }

 
         bool Read();
 
         bool IsOk() const { return m_state != ERROR; }
 
         bool Read();
 
         bool IsOk() const { return m_state != ERROR; }

+        bool IsDone() const { return m_state == DONE; }

         bool IsKeepAlive() const { return m_keepAlive; }
 
         bool IsKeepAlive() const { return m_keepAlive; }
 

+        void SetKeepAlive() { m_keepAlive = true; }
+

     private:
 
         static const char STG_HEADER[5];
     private:
 
         static const char STG_HEADER[5];


@@ -78,10 +81,9 @@ class Conn
         static const char OK_LOGINS[5];
         static const char ERR_LOGINS[5];
 
         static const char OK_LOGINS[5];
         static const char ERR_LOGINS[5];
 

-        const SETTINGS & m_settings;
+        const BASE_PARSER::REGISTRY & m_registry;
+

         ADMINS & m_admins;
         ADMINS & m_admins;

-        USERS & m_users;
-        TARIFFS & m_tariffs;

 
         ADMIN * m_admin;
 
 
         ADMIN * m_admin;
 


@@ -93,17 +95,18 @@ class Conn
 
         XML_Parser m_xmlParser;
 
 
         XML_Parser m_xmlParser;
 

-        enum { HEADER, LOGIN, CRYPTO_LOGIN, DATA, ERROR } m_state;
+        enum { HEADER, LOGIN, CRYPTO_LOGIN, DATA, DONE, ERROR } m_state;

 
         void * m_buffer;
         size_t m_bufferSize;
 
         void * m_buffer;
         size_t m_bufferSize;

-        char m_header[sizeof(STG_HEADER)];
-        char m_login[ADM_LOGIN_LEN + 1];
-        char m_cryptoLogin[ADM_LOGIN_LEN + 1];
+        char m_header[sizeof(STG_HEADER) - 1]; // Without \0
+        char m_login[ADM_LOGIN_LEN]; // Without \0
+        char m_cryptoLogin[ADM_LOGIN_LEN]; // Without \0

         char m_data[1024];
         STG::DECRYPT_STREAM * m_stream;
         char m_data[1024];
         STG::DECRYPT_STREAM * m_stream;

+        PLUGIN_LOGGER &  m_logger;

 
 

-        BASE_PARSER * GetParser(const std::string & tag);
+        BASE_PARSER * GetParser(const std::string & tag) const;

 
         bool HandleBuffer(size_t size);
 
 
         bool HandleBuffer(size_t size);
 


@@ -112,6 +115,11 @@ class Conn
         bool HandleCryptoLogin();
         bool HandleData(size_t size);
 
         bool HandleCryptoLogin();
         bool HandleData(size_t size);
 

+        bool WriteAnswer(const void* buffer, size_t size);
+        bool WriteResponse();
+
+        void Log(const char * file, const std::string & message);
+

         struct DataState
         {
             DataState(bool f, Conn & c) : final(f), conn(c) {}
         struct DataState
         {
             DataState(bool f, Conn & c) : final(f), conn(c) {}


@@ -122,6 +130,7 @@ class Conn
         static bool DataCallback(const void * block, size_t size, void * data);
         static void ParseXMLStart(void * data, const char * el, const char ** attr);
         static void ParseXMLEnd(void * data, const char * el);
         static bool DataCallback(const void * block, size_t size, void * data);
         static void ParseXMLStart(void * data, const char * el, const char ** attr);
         static void ParseXMLEnd(void * data, const char * el);

+        static bool WriteCallback(const void * block, size_t size, void * data);

 };
 
 }
 };
 
 }