Merge pull request #750 from evoskuil/master

Set address_ on socket accept.

Author: evoskuil

include/bitcoin/network/net/socket.hpp

@@ -161,8 +161,8 @@ class BCT_API socket
     /// Properties.
     /// -----------------------------------------------------------------------
 
-    /// TODO: this can be set to the binding for incoming sockets.
-    /// Get the address of the outgoing endpoint passed via construct.
+    /// Get the address of the outgoing endpoint passed via construct, or the
+    /// resolved endpoint address for incoming connections.
     virtual const config::address& address() const NOEXCEPT;
 
     /// Get the endpoint of the remote host. Established by connection

src/net/hosts.cpp

@@ -304,11 +304,11 @@ inline void hosts::push(const std::string& line) NOEXCEPT
         }
         else if (settings_.blacklisted(item))
         {
-            LOGF("Address blacklisted upon load [" << line << "].");
+            LOGV("Address blacklisted upon load [" << line << "].");
         }
         else if (!settings_.whitelisted(item))
         {
-            LOGF("Address not whitelisted upon load [" << line << "].");
+            LOGV("Address not whitelisted upon load [" << line << "].");
         }
         else
         {

src/net/socket_connect.cpp

@@ -83,6 +83,7 @@ void socket::handle_accept(boost_code ec,
     }
 
     endpoint_ = { std::get<asio::socket>(socket_).remote_endpoint(ec) };
+    address_ = endpoint_;
 
     if (ec)
     {

src/sessions/session_inbound.cpp

@@ -174,15 +174,15 @@ void session_inbound::handle_accepted(const code& ec,
 
     if (!whitelisted(socket->address()))
     {
-        ////LOGS("Dropping not whitelisted peer [" << socket->endpoint() << "].");
+        LOGV("Dropping not whitelisted peer [" << socket->endpoint() << "].");
         socket->stop();
         start_accept(error::success, acceptor);
         return;
     }
 
     if (blacklisted(socket->address()))
     {
-        ////LOGS("Dropping blacklisted peer [" << socket->endpoint() << "].");
+        LOGV("Dropping blacklisted peer [" << socket->endpoint() << "].");
         socket->stop();
         start_accept(error::success, acceptor);
         return;

src/sessions/session_server.cpp

@@ -138,7 +138,7 @@ code session_server::do_accept(const config::authorities& binds,
 // Accept cycle.
 // ----------------------------------------------------------------------------
 
-// Attempt to accept peers on each configured endpoint.
+// Attempt to accept clients on each configured endpoint.
 void session_server::start_accept(const code&,
     const acceptor::ptr& acceptor, bool secure) NOEXCEPT
 {
@@ -205,15 +205,15 @@ void session_server::handle_accepted(const code& ec, const socket::ptr& socket,
 
     if (!whitelisted(socket->address()))
     {
-        ////LOGS("Dropping not whitelisted peer [" << socket->endpoint() << "].");
+        LOGV("Dropping not whitelisted client [" << socket->endpoint() << "].");
         socket->stop();
         start_accept(error::success, acceptor, secure);
         return;
     }
 
     if (blacklisted(socket->address()))
     {
-        ////LOGS("Dropping blacklisted peer [" << socket->endpoint() << "].");
+        LOGV("Dropping blacklisted client [" << socket->endpoint() << "].");
         socket->stop();
         start_accept(error::success, acceptor, secure);
         return;