tcp: Various tweaks to TCP packet offering

Author: fwsGonzo

api/net/tcp/tcp.hpp

@@ -26,7 +26,7 @@
 #include "packet.hpp"
 
 #include <map>  // connections, listeners
-#include <queue>  // writeq
+#include <deque>  // writeq
 #include <net/inet.hpp>
 #include <net/socket.hpp>
 #include <net/port_util.hpp>
@@ -710,7 +710,7 @@ namespace net {
      *
      * @param[in]  <unnamed>  A ptr to a Connection
      */
-    void queue_offer(tcp::Connection_ptr);
+    void queue_offer(tcp::Connection&);
 
     /**
      * @brief      Force the TCP to process the it's queue with the current amount of available packets.

src/net/tcp/connection.cpp

@@ -199,9 +199,9 @@ void Connection::offer(size_t& packets)
   debug2("<Connection::offer> Finished working offer with [%u] packets left and a queue of (%u) with a usable window of %i\n",
         packets, writeq.size(), usable_window());
 
-  if(can_send() and not queued_)
+  if (this->can_send() and not this->is_queued())
   {
-    host_.queue_offer(retrieve_shared());
+    host_.queue_offer(*this);
   }
 }
 

src/net/tcp/tcp.cpp

@@ -489,15 +489,24 @@ void TCP::request_offer(Connection& conn) {
   debug2("<TCP::request_offer> %s requestin offer: uw=%u rem=%u\n",
     conn.to_string().c_str(), conn.usable_window(), conn.sendq_remaining());
 
-  conn.offer(packets);
+  if (packets > 0) {
+    conn.offer(packets);
+  }
 }
 
-void TCP::queue_offer(Connection_ptr conn)
+void TCP::queue_offer(Connection& conn)
 {
-  if(not conn->is_queued() and conn->can_send())
+  if(not conn.is_queued() and conn.can_send())
   {
-    debug("<TCP::queue_offer> %s queued\n", conn->to_string().c_str());
-    writeq.push_back(conn);
-    conn->set_queued(true);
+    try {
+      debug("<TCP::queue_offer> %s queued\n", conn.to_string().c_str());
+      writeq.push_back(conn.retrieve_shared());
+      conn.set_queued(true);
+    }
+    catch (std::exception& e) {
+      printf("ERROR: Could not find connection for %p: %s\n",
+            &conn, conn.to_string().c_str());
+      throw;
+    }
   }
 }