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

diff --git a/src/connection.hxx b/src/connection.hxx
index 4092fde..60ea862 100644
--- a/src/connection.hxx
+++ b/src/connection.hxx
@@ -21,8 +21,9 @@
 
 #include <string>
 
-#include "types.hxx"
+#include <netinet/in.h>
 
+#include "types.hxx"
 
 namespace libt2n
 {
@@ -40,7 +41,7 @@ class connection
 
         std::string buffer;
 
-        typedef unsigned int packet_size_indicator;
+        typedef uint32_t packet_size_indicator;
 
         packet_size_indicator bytes_available();
 
@@ -63,13 +64,18 @@ class connection
         /** @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
-                   NULL: no timeout
+                   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)=0;
+        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(); }