X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=src%2Fsocket_server.hxx;h=4c928c5f020026d392d60ce64ae086b99830ad22;hp=e3a4f34c10581ab2809c176ab33774e9a9499960;hb=2f90dcbf75fbafbefde8916c6012f0023a90b527;hpb=cc68aabb16ec32278df8b071c4c9efec7e9f0dce

diff --git a/src/socket_server.hxx b/src/socket_server.hxx
index e3a4f34..4c928c5 100644
--- a/src/socket_server.hxx
+++ b/src/socket_server.hxx
@@ -54,10 +54,8 @@ class socket_server : public socket_handler, public server
         void remove_connection_socket(int sock);
 
     protected:
-        void log(log_level_values level, const std::string& message)
-            { log(level,message.c_str()); }
-        void log(log_level_values level, const char* message)
-            { server::log(level,message); }
+        std::ostream* get_logstream(log_level_values level)
+            { return server::get_logstream(level); }
 
     public:
         socket_server(int port, const std::string& ip="0.0.0.0");
@@ -65,7 +63,7 @@ class socket_server : public socket_handler, public server
 
         ~socket_server();
 
-        bool fill_buffer(long long usec_timeout=-1);
+        bool fill_buffer(long long usec_timeout=-1,long long* usec_timeout_remaining=NULL);
 };
 
 /** @brief Socket based connection
@@ -81,14 +79,15 @@ class socket_server_connection : public socket_handler, public server_connection
            : server_connection(_timeout), socket_handler(_sock,_stype)
            { }
 
-        void log(log_level_values level, const char* message);
+        std::ostream* get_logstream(log_level_values level)
+            { return server_connection::get_logstream(level); }
 
         void real_write(const std::string& data)
             { socket_write(data); }
 
     public:
-        bool fill_buffer(long long usec_timeout=-1)
-            { return socket_handler::fill_buffer(buffer,usec_timeout); }
+        bool fill_buffer(long long usec_timeout=-1,long long* usec_timeout_remaining=NULL)
+            { return socket_handler::fill_buffer(buffer,usec_timeout,usec_timeout_remaining); }
 
         void close();
 };