Merge RicoAntonioFelix:socket

Author: AnnikaH

api/net/socket.hpp

@@ -16,37 +16,27 @@
 // limitations under the License.
 
 #pragma once
-#ifndef NET_SOCKET_HPP
-#define NET_SOCKET_HPP
+#ifndef NET_TCP_SOCKET_HPP
+#define NET_TCP_SOCKET_HPP
 
-#include <net/ip4/addr.hpp>
+#include "common.hpp"
 
 namespace net {
+namespace tcp {
 
 /**
  * An IP address and port
  */
 class Socket {
 public:
-
-  using Address = ip4::Addr;
-  using port_t = uint16_t;
-
-  struct pair_hash {
-    std::size_t operator () (const Socket& s) const {
-      auto h1 = std::hash<Address>{}(s.address());
-      auto h2 = std::hash<port_t>{}(s.port());
-      return h1 ^ h2;
-    }
-  };
-
   /**
    * Constructor
    *
    * Intialize an empty socket <0.0.0.0:0>
    */
-  Socket() noexcept
-    : address_{}, port_{}
+  constexpr Socket() noexcept
+    : address_{}
+    , port_{}
   {}
 
   /**
@@ -60,24 +50,25 @@ class Socket {
    * @param port
    *  The port associated with the process
    */
-  Socket(const Address address, const port_t port) noexcept
-    : address_{address}, port_{port}
+  constexpr Socket(const Address address, const port_t port) noexcept
+    : address_{address}
+    , port_{port}
   {}
 
   /**
    * Get the socket's network address
    *
    * @return The socket's network address
    */
-  Address address() const noexcept
+  constexpr Address address() const noexcept
   { return address_; }
 
   /**
    * Get the socket's port value
    *
    * @return The socket's port value
    */
-  port_t port() const noexcept
+  constexpr port_t port() const noexcept
   { return port_; }
 
   /**
@@ -93,7 +84,7 @@ class Socket {
    *
    * @return true if this socket is empty, false otherwise
    */
-  bool is_empty() const noexcept
+  constexpr bool is_empty() const noexcept
   { return (address_ == 0) and (port_ == 0); }
 
   /**
@@ -104,7 +95,7 @@ class Socket {
    *
    * @return true if the specified socket is equal, false otherwise
    */
-  bool operator==(const Socket& other) const noexcept
+  constexpr bool operator==(const Socket& other) const noexcept
   {
     return (address() == other.address())
        and (port() == other.port());
@@ -118,7 +109,7 @@ class Socket {
    *
    * @return true if the specified socket is not equal, false otherwise
    */
-  bool operator!=(const Socket& other) const noexcept
+  constexpr bool operator!=(const Socket& other) const noexcept
   { return not (*this == other); }
 
   /**
@@ -130,7 +121,7 @@ class Socket {
    * @return true if this socket is less-than the specified socket,
    * false otherwise
    */
-  bool operator<(const Socket& other) const noexcept
+  constexpr bool operator<(const Socket& other) const noexcept
   {
     return (address() < other.address())
         or ((address() == other.address()) and (port() < other.port()));
@@ -145,39 +136,14 @@ class Socket {
    * @return true if this socket is greater-than the specified socket,
    * false otherwise
    */
-  bool operator>(const Socket& other) const noexcept
+  constexpr bool operator>(const Socket& other) const noexcept
   { return not (*this < other); }
-
 private:
   Address address_;
   port_t  port_;
-
 }; //< class Socket
 
-class Quadruple {
-
-public:
-  Quadruple() noexcept
-    : source_{}, destination_{}
-  {}
-
-  Quadruple(const Socket::Address src_address, const Socket::port_t src_port,
-    const Socket::Address dst_address, const Socket::port_t dst_port) noexcept
-    : source_{src_address, src_port}, destination_{dst_address, dst_port}
-  {}
-
-  const Socket& source() const noexcept
-  { return source_; }
-
-  const Socket& destination() const noexcept
-  { return destination_; }
-
-private:
-  Socket source_;
-  Socket destination_;
-
-};  //< class Quadruple
-
+} //< namespace tcp
 } //< namespace net
 
-#endif //< NET_SOCKET_HPP
+#endif //< NET_TCP_SOCKET_HPP