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

[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 fae0c4b2426d2c59f6296244e56ff4b7044caf9b..c67c972eb98df40b9f359bab4852f1348fef28a1 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/conn.h
+++ b/projects/stargazer/plugins/configuration/sgconfig/conn.h
@@ -23,6 +23,8 @@
 
 #include "parser.h"
 
 
 #include "parser.h"
 

+#include "dumphelpers.h"
+

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


@@ -63,6 +65,8 @@ class Conn
         uint32_t IP() const { return *(uint32_t *)(&m_addr.sin_addr); }
         uint16_t Port() const { return ntohs(m_addr.sin_port); }
 
         uint32_t IP() const { return *(uint32_t *)(&m_addr.sin_addr); }
         uint16_t Port() const { return ntohs(m_addr.sin_port); }
 

+        std::string endpoint() const { return inet_ntostring(IP()) + ":" + x2str(Port()); }
+

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


@@ -127,6 +131,10 @@ class Conn
             Conn & conn;
         } m_dataState;
 
             Conn & conn;
         } m_dataState;
 

+#ifdef DUMPCRYPTO
+        Dumper m_dumper;
+#endif
+

         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);