From 1e5852215ad0fb53e13949669dca86af4024b8d8 Mon Sep 17 00:00:00 2001 From: Yingxin Cheng Date: Fri, 15 Feb 2019 15:43:08 +0800 Subject: [PATCH] crimson/net: create SocketConnection based on address type Signed-off-by: Yingxin Cheng --- src/crimson/net/SocketMessenger.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/crimson/net/SocketMessenger.cc b/src/crimson/net/SocketMessenger.cc index 5de019a7010..b10b9997515 100644 --- a/src/crimson/net/SocketMessenger.cc +++ b/src/crimson/net/SocketMessenger.cc @@ -154,7 +154,8 @@ seastar::future<> SocketMessenger::do_start(Dispatcher *disp) #warning fixme // we currently do dangerous i/o from a Connection core, different from the Socket core. container().invoke_on(shard, [sock = std::move(socket), peer_addr, this](auto& msgr) mutable { - SocketConnectionRef conn = seastar::make_shared(msgr, *msgr.dispatcher, false); + SocketConnectionRef conn = seastar::make_shared( + msgr, *msgr.dispatcher, get_myaddr().is_msgr2()); conn->start_accept(std::move(sock), peer_addr); }); }); @@ -175,7 +176,8 @@ SocketMessenger::do_connect(const entity_addr_t& peer_addr, const entity_type_t& if (auto found = lookup_conn(peer_addr); found) { return seastar::make_foreign(found->shared_from_this()); } - SocketConnectionRef conn = seastar::make_shared(*this, *dispatcher, false); + SocketConnectionRef conn = seastar::make_shared( + *this, *dispatcher, peer_addr.is_msgr2()); conn->start_connect(peer_addr, peer_type); return seastar::make_foreign(conn->shared_from_this()); } -- 2.39.5