X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=src%2Fsocket_server.hxx;h=360777e33e8546a7d5692736d8a0c751c89b6f5c;hp=6ebe983c81501126fbb9d18f2c667fdcd20d86b7;hb=56f3994d74dbc36d10bfa83b50b016bf269ac563;hpb=a7170401dd90dc79cc7d7a808cfe18a06c7e983b diff --git a/src/socket_server.hxx b/src/socket_server.hxx index 6ebe983..360777e 100644 --- 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(); }; }