From d0db627cc00113a29a77572351198e22dbe8a90c Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 4 Jun 2018 16:36:10 -0500 Subject: [PATCH] msg/async: (legacy) handshake using legacy addr Signed-off-by: Sage Weil --- src/msg/async/AsyncConnection.cc | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/msg/async/AsyncConnection.cc b/src/msg/async/AsyncConnection.cc index 52e0b940e3e..3777aa3b22d 100644 --- a/src/msg/async/AsyncConnection.cc +++ b/src/msg/async/AsyncConnection.cc @@ -990,17 +990,19 @@ ssize_t AsyncConnection::_process_connection() return 0; } - encode(async_msgr->get_myaddr(), myaddrbl, 0); // legacy + encode(async_msgr->get_myaddrs().legacy_addr(), myaddrbl, 0); // legacy r = try_send(myaddrbl); if (r == 0) { state = STATE_CONNECTING_SEND_CONNECT_MSG; ldout(async_msgr->cct, 10) << __func__ << " connect sent my addr " - << async_msgr->get_myaddr() << dendl; + << async_msgr->get_myaddrs().legacy_addr() + << dendl; } else if (r > 0) { state = STATE_WAIT_SEND; state_after_send = STATE_CONNECTING_SEND_CONNECT_MSG; ldout(async_msgr->cct, 10) << __func__ << " connect send my addr done: " - << async_msgr->get_myaddr() << dendl; + << async_msgr->get_myaddrs().legacy_addr() + << dendl; } else { ldout(async_msgr->cct, 2) << __func__ << " connect couldn't write my addr, " << cpp_strerror(r) << dendl; @@ -1207,8 +1209,9 @@ ssize_t AsyncConnection::_process_connection() bl.append(CEPH_BANNER, strlen(CEPH_BANNER)); - encode(async_msgr->get_myaddr(), bl, 0); // legacy - port = async_msgr->get_myaddr().get_port(); + auto legacy = async_msgr->get_myaddrs().legacy_addr(); + encode(legacy, bl, 0); // legacy + port = legacy.get_port(); encode(socket_addr, bl, 0); // legacy ldout(async_msgr->cct, 1) << __func__ << " sd=" << cs.fd() << " " << socket_addr << dendl; -- 2.39.5