X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=src%2Fconnection.hxx;h=60ea862b376387e116a9d529e8d0098c48948fe8;hp=9142c522e68ef522781077cc6976a1c5cf79b03f;hb=2f90dcbf75fbafbefde8916c6012f0023a90b527;hpb=a11e19b7adab2d5b937573701959562f06087ac5

diff --git a/src/connection.hxx b/src/connection.hxx
index 9142c52..60ea862 100644
--- a/src/connection.hxx
+++ b/src/connection.hxx
@@ -21,9 +21,15 @@
 
 #include <string>
 
+#include <netinet/in.h>
+
+#include "types.hxx"
+
 namespace libt2n
 {
 
+/** @brief a connection between client and server. abstact.
+*/
 class connection
 {
     private:
@@ -31,28 +37,46 @@ class connection
 
     protected:
         connection()
-        { closed=false; }
+            { closed=false; }
 
         std::string buffer;
 
-        typedef unsigned int packet_size_indicator;
+        typedef uint32_t packet_size_indicator;
 
         packet_size_indicator bytes_available();
 
         virtual void real_write(const std::string& data)=0;
 
+        virtual std::ostream* get_logstream(log_level_values level)=0;
+
     public:
-        ~connection()
+        virtual ~connection()
             { close(); }
 
+        /// is this connection closed or not
         bool is_closed()
             { return closed; }
 
+        /// close this connection
         virtual void close()
             { closed=true; }
 
-        virtual void fill_buffer(long long usec_timeout=-1)=0;
+        /** @brief look for new data and store it in the local buffer
+            @param usec_timeout wait until new data is found, max timeout usecs.
+                  -1: wait endless
+                   0: return instantly
+            @param usec_timeout_remaining if non-NULL the function will write the
+                  not used time to the given target
+            @retval true if new data was found (does not mean that the received data 
+                    is a complete packet though)
+        */
+        virtual bool fill_buffer(long long usec_timeout=-1,long long* usec_timeout_remaining=NULL)=0;
+
         bool get_packet(std::string& data);
+
+        unsigned int peek_packet(std::string& data);
+
+        /// returns true if a complete data packet is in the buffer. retrieve it with get_packet().
         bool packet_available()
             { return bytes_available(); }