X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=src%2Fsocket_wrapper.hxx;h=ebb85f6a8ff6000e9ae99cc2e260fbca0f0dd16b;hp=7a3ce47eeeaf47e0b20bffee1761be2d7b42e716;hb=2a956e6587338524eec8f66efe3a733a2116eb9b;hpb=ffbbf9abeb195a4017c1ede383cc9ab906aa4a0c

diff --git a/src/socket_wrapper.hxx b/src/socket_wrapper.hxx
index 7a3ce47..ebb85f6 100644
--- a/src/socket_wrapper.hxx
+++ b/src/socket_wrapper.hxx
@@ -51,17 +51,22 @@ class BasicSocketWrapper : public ConnectionWrapper
             long long _connect_timeout_usec=socket_client_connection::connect_timeout_usec_default, 
             int _max_retries=socket_client_connection::max_retries_default)
             : port(_port), server(_server), connect_timeout_usec(_connect_timeout_usec),
-              max_retries(_max_retries), socket_type(tcp_s)
+              max_retries(_max_retries), socket_type(tcp_s), ConnectionWrapper()
             { }
 
         BasicSocketWrapper(const std::string& _path,
             long long _connect_timeout_usec=socket_client_connection::connect_timeout_usec_default, 
             int _max_retries=socket_client_connection::max_retries_default)
             : path(_path), connect_timeout_usec(_connect_timeout_usec),
-              max_retries(_max_retries), socket_type(unix_s)
+              max_retries(_max_retries), socket_type(unix_s), ConnectionWrapper()
             { }
 
         client_connection* get_connection(void);
+
+        bool connection_established(void)
+            { return (c.get() != NULL); }
+
+        void set_logging(std::ostream *_logstream, log_level_values _log_level);
 };
 
 class ReconnectSocketWrapper : public BasicSocketWrapper
@@ -79,12 +84,29 @@ class ReconnectSocketWrapper : public BasicSocketWrapper
             : BasicSocketWrapper(_path,_connect_timeout_usec,_max_retries)
             { }
 
-        void handle(command_client* stubBase, boost::function< void() > f);
+        bool handle(command_client* stubBase, boost::function< void() > f);
 };
 
+class dummy_client_connection : public client_connection
+{
+    private:
+        void real_write(const std::string& data)
+            { }
+
+    public:
+        dummy_client_connection()
+            : client_connection()
+            { close(); }
+
+        bool fill_buffer(long long usec_timeout=-1, long long *usec_timeout_remaining=NULL)
+            { return false; }
+};
 
 class ReconnectIgnoreFailureSocketWrapper : public ReconnectSocketWrapper
 {
+    private:
+        dummy_client_connection dc;
+
     public:
         ReconnectIgnoreFailureSocketWrapper(int _port, const std::string& _server="127.0.0.1", 
             long long _connect_timeout_usec=socket_client_connection::connect_timeout_usec_default, 
@@ -99,11 +121,9 @@ class ReconnectIgnoreFailureSocketWrapper : public ReconnectSocketWrapper
             { }
 
         client_connection* get_connection(void);
-        void handle(command_client* stubBase, boost::function< void() > f);
+        bool handle(command_client* stubBase, boost::function< void() > f);
 };
 
-
-
 }
 
 #endif