Outgoing conn requires address_ for .inbound() resolution.

Author: evoskuil

include/bitcoin/network/net/socket.hpp

@@ -103,12 +103,12 @@ class BCT_API socket
 
 protected:
     // These are thread safe.
-    const config::address address_;
-    std::atomic_bool stopped_{};
     asio::strand strand_;
+    std::atomic_bool stopped_{};
 
     // These are protected by strand (see also handle_accept).
     asio::socket socket_;
+    config::address address_;
     config::authority authority_{};
 
 private:

src/net/socket.cpp

@@ -50,9 +50,9 @@ socket::socket(const logger& log, asio::io_context& service) NOEXCEPT
 // authority_.port() nonzero implies outbound connection.
 socket::socket(const logger& log, asio::io_context& service,
     const config::address& address) NOEXCEPT
-  : address_(address),
-    strand_(service.get_executor()),
+  : strand_(service.get_executor()),
     socket_(strand_),
+    address_(address),
     reporter(log),
     tracker<socket>(log)
 {
@@ -228,8 +228,10 @@ void socket::handle_accept(const error::boost_code& ec,
 {
     // This is running in the acceptor (not socket) execution context.
     // socket_ and authority_ are not guarded here, see comments on accept.
+    // address_ remains defaulted for inbound (accepted) connections.
 
-    if (!ec) authority_ = { socket_.remote_endpoint() };
+    if (!ec)
+        authority_ = { socket_.remote_endpoint() };
 
     if (error::asio_is_canceled(ec))
     {
@@ -256,6 +258,10 @@ void socket::handle_connect(const error::boost_code& ec,
 
     authority_ = peer;
 
+    // Outgoing connection requires address_ for .inbound() resolution.
+    if (is_zero(address_.port()))
+        address_ = config::endpoint{ peer };
+
     if (error::asio_is_canceled(ec))
     {
         handler(error::operation_canceled);