started reactor refactoring

include/matador/net/peer.hpp

@@ -11,7 +11,7 @@
 
 #include <cstring>
 
-namespace matador {
+namespace matador::net {
 
 /**
  * The peer_base class acts like the holder
@@ -25,7 +25,7 @@ template < class P >
 class peer_base
 {
 public:
-  typedef P protocol_type; /**< Short to protocol type */
+  typedef P protocol_type; /**< Short to a protocol-type */
 
   /**
    * Default constructor
@@ -48,9 +48,8 @@ public:
    * @param addr Address to create the peer from
    * @param port Port of the endpoint
    */
-  peer_base(address addr, unsigned short port)
-    : addr_(std::move(addr))
-  {
+  peer_base(address addr, const unsigned short port)
+  : addr_(std::move(addr)) {
     addr_.port(port);
   }
 
@@ -60,8 +59,7 @@ public:
    * @param x Peer to copy from
    */
   peer_base(const peer_base &x)
-    : addr_(x.addr_)
-  {}
+  : addr_(x.addr_) {}
 
   /**
    * Move creates a peer from a given peer
@@ -69,8 +67,7 @@ public:
    * @param x Peer to move from
    */
   peer_base(peer_base &&x) noexcept
-    : addr_(std::move(x.addr_))
-  {}
+  : addr_(std::move(x.addr_)) {}
 
   /**
    * Copy assigns a given peer to this peer
@@ -78,8 +75,7 @@ public:
    * @param x Peer to assign
    * @return The assigned peer
    */
-  peer_base& operator=(const peer_base &x)
-  {
+  peer_base& operator=(const peer_base &x) {
     addr_ = x.addr_;
     return *this;
   }
@@ -90,8 +86,7 @@ public:
    * @param x The peer to move assign
    * @return The moved peer
    */
-  peer_base& operator=(peer_base &&x) noexcept
-  {
+  peer_base& operator=(peer_base &&x) noexcept {
     addr_ = std::move(x.addr_);
     return *this;
   }
@@ -114,13 +109,8 @@ public:
    *
    * @return The current IP protocol
    */
-  protocol_type protocol() const
-  {
-    if (addr_.is_v4()) {
-      return protocol_type::v4();
-    } else {
-      return protocol_type::v6();
-    }
+  protocol_type protocol() const {
+    return addr_.is_v4() ? protocol_type::v4() : protocol_type::v6();
   }
 
   /**
@@ -128,8 +118,7 @@ public:
    *
    * @return The raw pointer to the sockaddr structure
    */
-  sockaddr* data()
-  {
+  sockaddr* data() {
     return addr_.addr();
   }
 
@@ -138,8 +127,7 @@ public:
    *
    * @return The raw pointer to the sockaddr structure
    */
-  const sockaddr* data() const
-  {
+  const sockaddr* data() const {
     return addr_.addr();
   }
 
@@ -148,8 +136,7 @@ public:
    *
    * @return The size of the underlying sockaddr structure
    */
-  size_t size() const
-  {
+  size_t size() const {
     return addr_.size();
   }
 
@@ -158,8 +145,7 @@ public:
    *
    * @return A reference to the address
    */
-  address& addr()
-  {
+  address& addr() {
     return addr_;
   }
 
@@ -168,8 +154,7 @@ public:
    *
    * @return A reference to the address
    */
-  const address& addr() const
-  {
+  const address& addr() const {
     return addr_;
   }
 
@@ -179,20 +164,19 @@ public:
    *
    * @return Returns a string representation of the peer
    */
-  std::string to_string() const
-  {
-    char addstr[INET6_ADDRSTRLEN + 8];
+  std::string to_string() const {
+    char address_str[INET6_ADDRSTRLEN + 8];
     const char *name;
     if (addr().is_v4()) {
-      name = os::inet_ntop(addr_.addr()->sa_family, &addr_.addr_v4()->sin_addr, addstr, INET6_ADDRSTRLEN);
+      name = os::inet_ntop(addr_.addr()->sa_family, &addr_.addr_v4()->sin_addr, address_str, INET6_ADDRSTRLEN);
     } else {
-      name = os::inet_ntop(addr_.addr()->sa_family, &addr_.addr_v6()->sin6_addr, addstr, INET6_ADDRSTRLEN);
+      name = os::inet_ntop(addr_.addr()->sa_family, &addr_.addr_v6()->sin6_addr, address_str, INET6_ADDRSTRLEN);
     }
 
-    size_t pos = strlen(name);
+    const size_t pos = strlen(name);
 
-    snprintf(addstr+pos, INET6_ADDRSTRLEN+8-pos, ":%d", addr_.port());
-    return addstr;
+    snprintf(address_str + pos, INET6_ADDRSTRLEN+8-pos, ":%d", addr_.port());
+    return address_str;
   }
 
 private: