X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=src%2Fsocket_handler.hxx;h=b9aa175ddaaa9a7bf3e475cf999e10bd3229f247;hp=8ea65a1199751a8bde6a634b0401fc0eac4ea9f6;hb=517d1214577af263bb4d6821e4e7ad9ba8c94901;hpb=9424729586fdb0aabb671d2f1266bdb07e0bed38

diff --git a/src/socket_handler.hxx b/src/socket_handler.hxx
index 8ea65a1..b9aa175 100644
--- a/src/socket_handler.hxx
+++ b/src/socket_handler.hxx
@@ -19,6 +19,8 @@
 #ifndef __LIBT2N_SOCKET_HANDLER
 #define __LIBT2N_SOCKET_HANDLER
 
+#include <iostream>
+
 #include "types.hxx"
 
 namespace libt2n
@@ -30,39 +32,44 @@ namespace libt2n
 class socket_handler
 {
     private:
-        static const unsigned int recv_buffer_size=2048;
-        static const unsigned int write_block_size=4096;
+        static const unsigned int default_recv_buffer_size=2048;
+        static const unsigned int default_write_block_size=4096;
 
         socket_type_value socket_type;
 
-        bool data_waiting(long long usec_timeout=-1);
+        bool data_waiting(long long usec_timeout,long long *timeout_remaining=NULL);
 
     protected:
         int sock;
+        unsigned int recv_buffer_size;
+        unsigned int write_block_size;
 
-        socket_handler(int _sock, socket_type_value _socket_type)
-            { sock=_sock; socket_type=_socket_type; }
+        socket_handler(int _sock, socket_type_value _socket_type);
 
         void set_socket_options(int sock);
 
-        void log(log_level_values level, const std::string& message)
-            { log(level,message.c_str()); }
-        virtual void log(log_level_values level, const char* message)
-            { return; }
+        virtual std::ostream* get_logstream(log_level_values level)
+            { return NULL; }
 
         void socket_write(const std::string& data);
 
         virtual void close();
 
-        bool fill_buffer(std::string& buffer, long long usec_timeout);
+        bool fill_buffer(std::string& buffer, long long usec_timeout, long long*timeout_remaining=NULL);
         bool fill_buffer(std::string& buffer);
 
     public:
-        /// is this a tcp or udp socket connection
+        /// is this a tcp or unix socket connection
         socket_type_value get_type()
             { return socket_type; }
 
         bool is_closed();
+
+        void set_recv_buffer_size(unsigned int new_recv_buffer_size);
+        void set_write_block_size(unsigned int new_write_block_size);
+
+        unsigned int get_recv_buffer_size() const { return recv_buffer_size; }
+        unsigned int get_write_block_size() const { return write_block_size; }
 };
 
 }