Connection は server/client の Endpoint を持つ

src/lib/transport/connection.cpp

@@ -1,7 +1,9 @@
 #include "connection.hpp"
 #include "utils/logger.hpp"
 
-Connection::Connection(const int fd) : clientFd_(fd), fdReader_(clientFd_), buffer_(fdReader_) {}
+Connection::Connection(const int fd, const Endpoint &listenerEndpoint, const Endpoint &clientEndpoint)
+    : clientFd_(fd), listenerEndpoint_(listenerEndpoint), clientEndpoint_(clientEndpoint), fdReader_(clientFd_),
+      buffer_(fdReader_) {}
 
 Connection::~Connection() {
     LOG_DEBUG("Connection: destruct");
@@ -11,6 +13,14 @@ int Connection::getFd() const {
     return clientFd_.get();
 }
 
+const Endpoint &Connection::getListenerEndpoint() const {
+    return listenerEndpoint_;
+}
+
+const Endpoint &Connection::getClientEndpoint() const {
+    return clientEndpoint_;
+}
+
 ReadBuffer &Connection::getReadBuffer() {
     return buffer_;
 }

src/lib/transport/connection.hpp

@@ -1,22 +1,26 @@
 #ifndef SRC_LIB_CONNECTION_HPP
 #define SRC_LIB_CONNECTION_HPP
 
+#include "endpoint.hpp"
 #include "utils/auto_fd.hpp"
 #include "utils/io/read_buffer.hpp"
 #include "utils/io/reader.hpp"
-#include <memory>
 
 // クライアントソケットの抽象
 class Connection {
 public:
-    explicit Connection(int fd);
+    Connection(int fd, const Endpoint &listenerEndpoint, const Endpoint &clientEndpoint);
     ~Connection();
 
     int getFd() const;
+    const Endpoint &getListenerEndpoint() const;
+    const Endpoint &getClientEndpoint() const;
     ReadBuffer &getReadBuffer();
 
 private:
     AutoFd clientFd_;
+    Endpoint listenerEndpoint_;
+    Endpoint clientEndpoint_;
     io::FdReader fdReader_; // ReadBuffer に渡す IReader & の参照先として必要
     ReadBuffer buffer_;
 };

src/lib/transport/listener.cpp

@@ -34,18 +34,17 @@ Listener::AcceptConnectionResult Listener::acceptConnection() const {
         LOG_WARNF("failed to accept connection: %s", std::strerror(errno));
         return Err<std::string>("failed to accept connection");
     }
+    const Endpoint clientEndpoint(inet_ntoa(clientAddr.sin_addr), ntohs(clientAddr.sin_port));
 
     const Result<void, error::AppError> result = utils::setNonBlocking(fd);
     if (result.isErr()) {
         LOG_ERROR("failed to set non-blocking fd");
         return Err<std::string>("failed to set non-blocking fd");
     }
 
-    LOG_INFOF(
-        "connection established from %s:%u (fd: %d)", inet_ntoa(clientAddr.sin_addr), ntohs(clientAddr.sin_port), fd
-    );
+    LOG_INFOF("connection established from %s (fd: %d)", clientEndpoint.toString().c_str(), fd);
 
-    return Ok(new Connection(fd));
+    return Ok(new Connection(fd, this->getEndpoint(), clientEndpoint));
 }
 
 int Listener::setupSocket(const std::string &ip, const unsigned short port, const int backlog) {