libt2n: (gerd) socket reconnect added (incl. unit tests)

[libt2n] / src / connection.hxx

diff --git a/src/connection.hxx b/src/connection.hxx
index 4092fde..8e72bf6 100644 (file)
--- a/src/connection.hxx
+++ b/src/connection.hxx
@@ -20,9 +20,15 @@
 #define __LIBT2N_CONNECTION
 
 #include <string>
+#include <vector>
+#include <list>
+#include <iostream>
 
-#include "types.hxx"
+#include <boost/function.hpp>
+
+#include <netinet/in.h>
 
+#include "types.hxx"
 
 namespace libt2n
 {
@@ -34,13 +40,17 @@ class connection
     private:
         bool closed;
 
+        /// vector initialized for all callback-types, all elements in each list will be called
+        std::vector<std::list<boost::function<void ()> > > callbacks;
+
     protected:
         connection()
-            { closed=false; }
+            : callbacks(__events_end), closed(false)
+            { }
 
         std::string buffer;
 
-        typedef unsigned int packet_size_indicator;
+        typedef uint32_t packet_size_indicator;
 
         packet_size_indicator bytes_available();
 
@@ -48,33 +58,45 @@ class connection
 
         virtual std::ostream* get_logstream(log_level_values level)=0;
 
+        void do_callbacks(callback_event_type event);
+
+        void reopen(void);
+        void remove_incomplete_packets();
+
     public:
-        virtual ~connection()
-            { close(); }
+        virtual ~connection();
 
         /// is this connection closed or not
         bool is_closed()
             { return closed; }
 
         /// close this connection
-        virtual void close()
-            { closed=true; }
+        virtual void close();
 
         /** @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(); }
 
         void write(const std::string& data);
+
+        void add_callback(callback_event_type event, const boost::function<void ()>& func);
+
+        std::list<boost::function<void ()> > get_callback_list(callback_event_type event);
 };
 
 }