~singpolyma/biboumi

45fd41eb38ce9cd0c5fd14d7278514b79d7debcd — Florent Le Coz 8 years ago ece4b49
Display the resolved IP in debug logs
2 files changed, 22 insertions(+), 0 deletions(-)

M louloulibs/network/tcp_socket_handler.cpp
M louloulibs/network/tcp_socket_handler.hpp
M louloulibs/network/tcp_socket_handler.cpp => louloulibs/network/tcp_socket_handler.cpp +17 -0
@@ 16,6 16,7 @@
#include <fcntl.h>

#include <iostream>
#include <arpa/inet.h>

#ifdef BOTAN_FOUND
# include <botan/hex.h>


@@ 159,6 160,9 @@ void TCPSocketHandler::connect(const std::string& address, const std::string& po
            break;
          }
        }

      this->display_resolved_ip(rp);

      if (::connect(this->socket, rp->ai_addr, rp->ai_addrlen) == 0
          || errno == EISCONN)
        {


@@ 343,6 347,19 @@ void TCPSocketHandler::close()
  this->port.clear();
}

void TCPSocketHandler::display_resolved_ip(struct addrinfo* rp) const
{
  char buf[INET6_ADDRSTRLEN];
  if (rp->ai_family == AF_INET)
    log_debug("Connecting to IP address " << ::inet_ntop(rp->ai_family,
              &reinterpret_cast<sockaddr_in*>(rp->ai_addr)->sin_addr,
                                                         buf, sizeof(buf)));
  else if (rp->ai_family == AF_INET6)
    log_debug("Connecting to IPv6 address " << ::inet_ntop(rp->ai_family,
              &reinterpret_cast<sockaddr_in6*>(rp->ai_addr)->sin6_addr,
                                                           buf, sizeof(buf)));
}

void TCPSocketHandler::send_data(std::string&& data)
{
#ifdef BOTAN_FOUND

M louloulibs/network/tcp_socket_handler.hpp => louloulibs/network/tcp_socket_handler.hpp +5 -0
@@ 264,6 264,11 @@ private:
  TCPSocketHandler& operator=(const TCPSocketHandler&) = delete;
  TCPSocketHandler& operator=(TCPSocketHandler&&) = delete;

  /**
   * Display the resolved IP, just for information purpose.
   */
  void display_resolved_ip(struct addrinfo* rp) const;

#ifdef BOTAN_FOUND
  /**
   * Botan stuff to manipulate a TLS session.