tcp: Add support to bind for a given IP

Author: AndreasAakesson

api/net/tcp/connection.hpp

@@ -50,7 +50,7 @@ class Connection : public std::enable_shared_from_this<Connection> {
 
 public:
   /** Connection identifier */
-  using Tuple = std::pair<port_t, Socket>;
+  using Tuple = std::pair<Socket, Socket>;
   /** Interface for TCP states */
   class State;
   /** Disconnect event */
@@ -517,7 +517,7 @@ class Connection : public std::enable_shared_from_this<Connection> {
    * @return     A "tuple" of [[local port], [remote ip, remote port]]
    */
   Connection::Tuple tuple() const noexcept
-  { return {local_port_, remote_}; }
+  { return {local_, remote_}; }
 
   /// --- State checks --- ///
 
@@ -610,14 +610,15 @@ class Connection : public std::enable_shared_from_this<Connection> {
    * @return     A 16 bit unsigned port number
    */
   port_t local_port() const noexcept
-  { return local_port_; }
+  { return local_.port(); }
 
   /**
    * @brief      The local Socket bound to this connection.
    *
    * @return     A TCP Socket
    */
-  Socket local() const noexcept;
+  Socket local() const noexcept
+  { return local_; }
 
   /**
    * @brief      The remote Socket bound to this connection.
@@ -777,7 +778,7 @@ class Connection : public std::enable_shared_from_this<Connection> {
    * @param[in]  remote      The remote socket
    * @param[in]  callback    The connection callback
    */
-  Connection(TCP& host, port_t local_port, Socket remote, ConnectCallback callback = nullptr);
+  Connection(TCP& host, Socket local, Socket remote, ConnectCallback callback = nullptr);
 
   Connection(const Connection&)             = delete;
   Connection(Connection&&)                  = delete;
@@ -819,7 +820,7 @@ class Connection : public std::enable_shared_from_this<Connection> {
   TCP& host_;
 
   /* End points. */
-  port_t local_port_;
+  Socket local_;
   Socket remote_;
 
   /** The current state the Connection is in. Handles most of the logic. */

api/net/tcp/listener.hpp

@@ -41,7 +41,7 @@ class Listener {
 
 public:
 
-  Listener(TCP& host, port_t port, ConnectCallback cb = nullptr);
+  Listener(TCP& host, Socket local, ConnectCallback cb = nullptr);
 
   Listener& on_accept(AcceptCallback cb)
   {
@@ -59,14 +59,14 @@ class Listener {
 
   /**
    * @brief Returns the local socket identified with this Listener
-   * @details Creates a temporary identifier for the Listener,
-   * in form of Address to the current stack (TCP) and the port_
-   * @return The local Socket
+   *
+   * @return The local Socket the listener is bound to
    */
-  Socket local() const;
+  Socket local() const noexcept
+  { return local_; }
 
-  constexpr port_t port() const
-  { return port_; }
+  port_t port() const noexcept
+  { return local_.port(); }
 
   auto syn_queue_size() const
   { return syn_queue_.size(); }
@@ -88,17 +88,13 @@ class Listener {
 
 private:
   friend class net::TCP;
-  TCP& host_;
-  const port_t port_;
-  SynQueue syn_queue_;
+  TCP&      host_;
+  Socket    local_;
+  SynQueue  syn_queue_;
 
-  /** */
-  AcceptCallback on_accept_;
-
-  /** */
+  AcceptCallback  on_accept_;
   ConnectCallback on_connect_;
-
-  CloseCallback _on_close_;
+  CloseCallback   _on_close_;
 
   bool default_on_accept(Socket);
 

api/net/tcp/tcp.hpp

@@ -46,7 +46,7 @@ namespace net {
     friend class tcp::Listener;
 
   private:
-    using Listeners       = std::map<tcp::port_t, std::unique_ptr<tcp::Listener>>;
+    using Listeners       = std::map<tcp::Socket, std::unique_ptr<tcp::Listener>>;
     using Connections     = std::map<tcp::Connection::Tuple, tcp::Connection_ptr>;
 
   public:
@@ -70,7 +70,10 @@ namespace net {
      *
      * @return     a TCP Listener
      */
-    tcp::Listener& bind(const tcp::port_t port, ConnectCallback cb = nullptr);
+    tcp::Listener& bind(const tcp::port_t port, ConnectCallback cb = nullptr)
+    { return bind({0, port}, std::move(cb)); }
+
+    tcp::Listener& bind(tcp::Socket socket, ConnectCallback cb = nullptr);
 
     /**
      * @brief Unbind (and close) a Listener
@@ -80,7 +83,7 @@ namespace net {
      * @param port listening port
      * @return whether the listener had a port
      */
-    bool unbind(const tcp::port_t port);
+    bool unbind(tcp::Socket socket);
 
     /**
      * @brief      Make an outgoing connection to a TCP remote (IP:port).
@@ -341,7 +344,7 @@ namespace net {
      *
      * @return     An IP4 address
      */
-    tcp::Address address()
+    tcp::Address address() const noexcept
     { return inet_.ip_addr(); }
 
     /**
@@ -446,6 +449,38 @@ namespace net {
 
     // INTERNALS - Handling of collections
 
+    /**
+     * @brief      Try to find the listener bound to socket.
+     *             If none is found directly, try any address (0).
+     *
+     * @param[in]  socket  The socket the listener is bound to
+     *
+     * @return     A listener iterator
+     */
+    Listeners::iterator find_listener(const tcp::Socket socket)
+    {
+      Listeners::iterator it = listeners_.find(socket);
+      if(it == listeners_.end())
+        it = listeners_.find({0, socket.port()});
+      return it;
+    }
+
+    /**
+     * @brief      Try to find the listener bound to socket.
+     *             If none is found directly, try any address (0).
+     *
+     * @param[in]  socket  The socket the listener is bound to
+     *
+     * @return     A listener const iterator
+     */
+    Listeners::const_iterator cfind_listener(const tcp::Socket socket)
+    {
+      Listeners::const_iterator it = listeners_.find(socket);
+      if(it == listeners_.cend())
+        it = listeners_.find({0, socket.port()});
+      return it;
+    }
+
     /**
      * @brief      Adds a connection.
      *
@@ -456,13 +491,13 @@ namespace net {
     /**
      * @brief      Creates a connection.
      *
-     * @param[in]  local_port  The local port
-     * @param[in]  remote      The remote
-     * @param[in]  cb          Connect callback
+     * @param[in]  local    The local socket
+     * @param[in]  remote   The remote socket
+     * @param[in]  cb       Connect callback
      *
      * @return     A ptr to the Connection whos created
      */
-    tcp::Connection_ptr create_connection(tcp::port_t local_port,
+    tcp::Connection_ptr create_connection(tcp::Socket local,
                                           tcp::Socket remote,
                                           ConnectCallback cb = nullptr);
 
@@ -480,7 +515,7 @@ namespace net {
      * @param[in]  listener  A Listener
      */
     void close_listener(tcp::Listener& listener)
-    { listeners_.erase(listener.port()); }
+    { listeners_.erase(listener.local()); }
 
 
     // WRITEQ HANDLING

src/net/tcp/connection.cpp

@@ -31,9 +31,9 @@ using namespace std;
 /*
   This is most likely used in a ACTIVE open
 */
-Connection::Connection(TCP& host, port_t local_port, Socket remote, ConnectCallback callback)
+Connection::Connection(TCP& host, Socket local, Socket remote, ConnectCallback callback)
   : host_(host),
-    local_port_(local_port),
+    local_(local),
     remote_(remote),
     state_(&Connection::Closed::instance()),
     prev_state_(state_),
@@ -89,10 +89,6 @@ void Connection::reset_callbacks()
   read_request.clean_up();
 }
 
-Socket Connection::local() const noexcept {
-  return {host_.address(), local_port_};
-}
-
 uint16_t Connection::MSDS() const noexcept {
   return std::min(host_.MSS(), cb.SND.MSS) + sizeof(Header);
 }

src/net/tcp/listener.cpp

@@ -23,8 +23,8 @@
 
 using namespace net::tcp;
 
-Listener::Listener(TCP& host, port_t port, ConnectCallback cb)
-  : host_(host), port_(port), syn_queue_(),
+Listener::Listener(TCP& host, Socket local, ConnectCallback cb)
+  : host_(host), local_(local), syn_queue_(),
     on_accept_({this, &Listener::default_on_accept}),
     on_connect_{std::move(cb)},
     _on_close_({host_, &TCP::close_listener})
@@ -38,9 +38,6 @@ bool Listener::default_on_accept(Socket) {
 bool Listener::syn_queue_full() const
 { return syn_queue_.size() >= host_.max_syn_backlog(); }
 
-Socket Listener::local() const {
-  return {host_.address(), port_};
-}
 
 void Listener::segment_arrived(Packet_ptr packet) {
   debug2("<Listener::segment_arrived> Received packet: %s\n",
@@ -87,7 +84,7 @@ void Listener::segment_arrived(Packet_ptr packet) {
 
     auto& conn = *(syn_queue_.emplace(
       syn_queue_.cbegin(),
-      std::make_shared<Connection>(host_, port_, packet->source(), ConnectCallback{this, &Listener::connected})
+      std::make_shared<Connection>(host_, packet->destination(), packet->source(), ConnectCallback{this, &Listener::connected})
       )
     );
     conn->_on_cleanup({this, &Listener::remove});
@@ -143,7 +140,7 @@ void Listener::close() {
 
 std::string Listener::to_string() const {
   std::stringstream ss;
-  ss << "Port [ " << port_ << " ] " << " SynQueue ( " <<  syn_queue_.size() << " ) ";
+  ss << "[ " << local_.to_string() << " ] " << " SynQueue ( " <<  syn_queue_.size() << " ) ";
 
   for(auto& conn : syn_queue_)
     ss << "\n\t" << conn->to_string();