crimson/net: fix peer_addr sync in during handshake

Signed-off-by: Yingxin <yingxin.cheng@intel.com>

diff --git a/src/crimson/net/SocketConnection.cc b/src/crimson/net/SocketConnection.cc
index 67a3e3d177184bff7fdc6688438347673dd76a06..69a729505db79ae9c91529a7843c4035ea826513 100644 (file)
--- a/src/crimson/net/SocketConnection.cc
+++ b/src/crimson/net/SocketConnection.cc
@@ -801,8 +801,7 @@ seastar::future<> SocketConnection::client_handshake(entity_type_t peer_type,
       validate_peer_addr(saddr, peer_addr);
 
       if (my_addr != caddr) {
-        // take peer's address for me, but preserve my port/nonce
-        caddr.set_port(my_addr.get_port());
+        // take peer's address for me, but preserve my nonce
         caddr.nonce = my_addr.nonce;
         my_addr = caddr;
       }

diff --git a/src/crimson/net/SocketMessenger.cc b/src/crimson/net/SocketMessenger.cc
index f601d223f6cbe25956d94783a0c7132a733c936f..520e3d615387ea462b0b5bf2e46db221036c0132 100644 (file)
--- a/src/crimson/net/SocketMessenger.cc
+++ b/src/crimson/net/SocketMessenger.cc
@@ -73,6 +73,7 @@ seastar::future<> SocketMessenger::accept(seastar::connected_socket socket,
 {
   // allocate the connection
   entity_addr_t peer_addr;
+  peer_addr.set_type(entity_addr_t::TYPE_DEFAULT);
   peer_addr.set_sockaddr(&paddr.as_posix_sockaddr());
   ConnectionRef conn = new SocketConnection(this, get_myaddr(),
                                             peer_addr, std::move(socket));