Merge pull request #1257 from AndreasAakesson/dev

tcp: Redefined bind => listen and support for virtual IPs

Author: alfreb

api/net/inet_common.hpp

@@ -108,7 +108,10 @@ namespace net {
     static constexpr uint16_t USER_START    {1024};
     static constexpr uint16_t USER_END      {49151};
     static constexpr uint16_t DYNAMIC_START {49152};
-    static constexpr uint16_t DYNAMIC_END   {65534}; // 65535 never assigned
+    static constexpr uint16_t DYNAMIC_END   {65535}; // 65535 should never be assigned
+
+    static constexpr bool is_dynamic(const uint16_t port) noexcept
+    { return port > USER_END; }
   }
 
   /**

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);