Merge branch 'ptrstuff' of github.com:AndreasAakesson/IncludeOS into dev

Author: fwsGonzo

api/net/inet_common.hpp

@@ -50,11 +50,11 @@ namespace net {
   }
 
 
-  template<typename Derived, typename Base, typename Del>
-  auto static_unique_ptr_cast( std::unique_ptr<Base, Del>&& p )
+  template<typename Derived, typename Base>
+  auto static_unique_ptr_cast( std::unique_ptr<Base>&& p )
   {
       auto* d = static_cast<Derived *>(p.release());
-      return std::unique_ptr<Derived, Del>(d, std::move(p.get_deleter()));
+      return std::unique_ptr<Derived>(d);
   }
 
 } //< namespace net

api/net/packet.hpp

@@ -48,7 +48,7 @@ namespace net
       bufstore  (bs)
     {}
 
-    ~Packet()
+    virtual ~Packet()
     {
       if (bufstore)
           bufstore->release(this);

api/net/tcp/common.hpp

@@ -54,7 +54,7 @@ namespace net {
     { return buffer_t(new uint8_t[length], std::default_delete<uint8_t[]>()); }
 
     class Packet;
-    using Packet_ptr = std::unique_ptr<Packet, std::default_delete<net::Packet>>;
+    using Packet_ptr = std::unique_ptr<Packet>;
 
     class Connection;
     using Connection_ptr = std::shared_ptr<Connection>;

api/net/tcp/connection.hpp

@@ -485,10 +485,10 @@ class Connection : public std::enable_shared_from_this<Connection> {
   Timer timewait_timer;
 
   /** Number of retransmission attempts on the packet first in RT-queue */
-  size_t rtx_attempt_ = 0;
+  int8_t rtx_attempt_ = 0;
 
   /** number of retransmitted SYN packets. */
-  size_t syn_rtx_ = 0;
+  int8_t syn_rtx_ = 0;
 
   /** Congestion control */
   // is fast recovery state
@@ -665,19 +665,19 @@ class Connection : public std::enable_shared_from_this<Connection> {
     Invoke/signal the diffrent TCP events.
   */
   void signal_connect()
-  { on_connect_(shared_from_this()); }
+  { if(on_connect_) on_connect_(shared_from_this()); }
 
   void signal_disconnect(Disconnect::Reason&& reason)
   { on_disconnect_(shared_from_this(), Disconnect{reason}); }
 
   void signal_error(TCPException error)
-  { on_error_(std::forward<TCPException>(error)); }
+  { if(on_error_) on_error_(std::forward<TCPException>(error)); }
 
   void signal_packet_dropped(const Packet& packet, const std::string& reason)
-  { on_packet_dropped_(packet, reason); }
+  { if(on_packet_dropped_) on_packet_dropped_(packet, reason); }
 
   void signal_rtx_timeout()
-  { on_rtx_timeout_(rtx_attempt_+1, rttm.RTO); }
+  { if(on_rtx_timeout_) on_rtx_timeout_(rtx_attempt_+1, rttm.RTO); }
 
   /*
     Drop a packet. Used for debug/callback.

src/net/tcp/connection.cpp

@@ -41,13 +41,13 @@ Connection::Connection(TCP& host, port_t local_port, Socket remote) :
   cb(),
   read_request(),
   writeq(),
+  on_disconnect_({this, &Connection::default_on_disconnect}),
   bytes_rx_(0), bytes_tx_(0),
   queued_(false),
   rtx_timer({this, &Connection::rtx_timeout}),
   timewait_timer({this, &Connection::timewait_timeout})
 {
   setup_congestion_control();
-  setup_default_callbacks();
   debug("<Connection> %s created\n", to_string().c_str());
 }
 
@@ -816,7 +816,7 @@ void Connection::signal_close() {
   debug("<Connection::signal_close> It's time to delete this connection. \n");
 
   // call user callback
-  on_close_();
+  if(on_close_) on_close_();
 
   // clean up all copies, delegates and timers
   clean_up();
@@ -833,7 +833,7 @@ void Connection::clean_up() {
   auto shared = shared_from_this();
   // clean up all other copies
   // either in TCP::listeners_ (open) or Listener::syn_queue_ (half-open)
-  _on_cleanup_(shared);
+  if(_on_cleanup_) _on_cleanup_(shared);
 
   on_connect_.reset();
   on_disconnect_.reset(),