From 1aceb2d04be9d865dc3a88d8207ac250b607ca2d Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 21 Dec 2018 08:37:25 -0600 Subject: [PATCH] msg/msg_types: add get_legacy_str() Render a pre-nautilus entity_addr_t string. Signed-off-by: Sage Weil --- src/msg/msg_types.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/msg/msg_types.h b/src/msg/msg_types.h index 1f5137e6c50fd..422ee5c01aedc 100644 --- a/src/msg/msg_types.h +++ b/src/msg/msg_types.h @@ -416,6 +416,12 @@ struct entity_addr_t { std::string ip_only_to_str() const; + std::string get_legacy_str() const { + ostringstream ss; + ss << get_sockaddr() << "/" << get_nonce(); + return ss.str(); + } + bool parse(const char *s, const char **end = 0, int type=0); void decode_legacy_addr_after_marker(bufferlist::const_iterator& bl) @@ -567,6 +573,9 @@ struct entity_addrvec_t { } return entity_addr_t(); } + string get_legacy_str() const { + return legacy_or_front_addr().get_legacy_str(); + } entity_addr_t msgr2_addr() const { for (auto &a : v) { -- 2.39.5