libt2n: (tomj) documented code problems; have to find out if this is the source of...

[libt2n] / src / socket_handler.hxx

diff --git a/src/socket_handler.hxx b/src/socket_handler.hxx
index b9aa175..b91a505 100644 (file)
--- a/src/socket_handler.hxx
+++ b/src/socket_handler.hxx
@@ -34,17 +34,21 @@ class socket_handler
     private:
         static const unsigned int default_recv_buffer_size=2048;
         static const unsigned int default_write_block_size=4096;
+        static const long long default_write_timeout=30000000;
 
         socket_type_value socket_type;
 
-        bool data_waiting(long long usec_timeout,long long *timeout_remaining=NULL);
+        bool data_waiting(long long usec_timeout,long long *usec_timeout_remaining=NULL);
+        void wait_ready_to_write(int socket, long long write_block_timeout);
 
     protected:
         int sock;
         unsigned int recv_buffer_size;
         unsigned int write_block_size;
+        long long write_timeout;
 
         socket_handler(int _sock, socket_type_value _socket_type);
+        // TODO: No destructor?
 
         void set_socket_options(int sock);
 
@@ -55,7 +59,7 @@ class socket_handler
 
         virtual void close();
 
-        bool fill_buffer(std::string& buffer, long long usec_timeout, long long*timeout_remaining=NULL);
+        bool fill_buffer(std::string& buffer, long long usec_timeout, long long* usec_timeout_remaining=NULL);
         bool fill_buffer(std::string& buffer);
 
     public:
@@ -67,9 +71,11 @@ class socket_handler
 
         void set_recv_buffer_size(unsigned int new_recv_buffer_size);
         void set_write_block_size(unsigned int new_write_block_size);
+        void set_write_timeout(long long new_write_timeout);
 
         unsigned int get_recv_buffer_size() const { return recv_buffer_size; }
         unsigned int get_write_block_size() const { return write_block_size; }
+        long long get_write_timeout() const { return write_timeout; }
 };
 
 }