From 3dcde6f73a684fd10c0594a8fd384e18fb0d0bad Mon Sep 17 00:00:00 2001 From: Radoslaw Zarzynski Date: Thu, 24 Jan 2019 01:46:50 +0100 Subject: [PATCH] msg/async, auth: switch AuthStreamHandler::rxtx_t to std::unique_ptr. Signed-off-by: Radoslaw Zarzynski --- src/auth/AuthSessionHandler.cc | 4 ++-- src/auth/AuthSessionHandler.h | 4 ++-- src/msg/async/ProtocolV2.cc | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/auth/AuthSessionHandler.cc b/src/auth/AuthSessionHandler.cc index 479171f77b0..75da38a84dc 100644 --- a/src/auth/AuthSessionHandler.cc +++ b/src/auth/AuthSessionHandler.cc @@ -464,8 +464,8 @@ AuthStreamHandler::rxtx_t AuthStreamHandler::create_stream_handler_pair( ::memcpy(&tx_nonce, auth_meta.connection_secret.c_str() + 16 + sizeof(rx_nonce), sizeof(tx_nonce)); return { - std::make_shared(cct, auth_meta, rx_nonce), - std::make_shared(cct, auth_meta, tx_nonce) + std::make_unique(cct, auth_meta, rx_nonce), + std::make_unique(cct, auth_meta, tx_nonce) }; } else { return { nullptr, nullptr }; diff --git a/src/auth/AuthSessionHandler.h b/src/auth/AuthSessionHandler.h index 080f73c2d73..a334ee1eac4 100644 --- a/src/auth/AuthSessionHandler.h +++ b/src/auth/AuthSessionHandler.h @@ -78,8 +78,8 @@ struct AuthStreamHandler { //rxtx_t(rxtx_t&& r) : rx(std::move(rx)), tx(std::move(tx)) {} // Each peer can use different handlers. // Hmm, isn't that too much flexbility? - std::shared_ptr rx; - std::shared_ptr tx; + std::unique_ptr rx; + std::unique_ptr tx; }; static rxtx_t create_stream_handler_pair( CephContext* ctx, diff --git a/src/msg/async/ProtocolV2.cc b/src/msg/async/ProtocolV2.cc index e17b7938838..975378a76a8 100644 --- a/src/msg/async/ProtocolV2.cc +++ b/src/msg/async/ProtocolV2.cc @@ -2848,7 +2848,7 @@ CtPtr ProtocolV2::reuse_connection(AsyncConnectionRef existing, exproto->can_write = false; exproto->reconnecting = reconnecting; exproto->replacing = true; - exproto->session_security = session_security; + std::swap(exproto->session_security, session_security); exproto->auth_meta = auth_meta; existing->state_offset = 0; // avoid previous thread modify event -- 2.39.5