libt2n: (tomj) fixed call of virtual function close() from destructor, fixed return...

[libt2n] / src / socket_server.hxx

diff --git a/src/socket_server.hxx b/src/socket_server.hxx
index 6ebe983..360777e 100644 (file)
--- a/src/socket_server.hxx
+++ b/src/socket_server.hxx
@@ -63,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
@@ -79,6 +79,8 @@ class socket_server_connection : public socket_handler, public server_connection
            : server_connection(_timeout), socket_handler(_sock,_stype)
            { }
 
+        ~socket_server_connection();
+
         std::ostream* get_logstream(log_level_values level)
             { return server_connection::get_logstream(level); }
 
@@ -86,10 +88,10 @@ class socket_server_connection : public socket_handler, public server_connection
             { 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();
+        virtual void close();
 };
 
 }