From: Kefu Chai <kchai@redhat.com>
Date: Mon, 5 Apr 2021 02:49:22 +0000 (+0800)
Subject: msg/msg_types: add a default_type param to entity_addr_t::parse()
X-Git-Tag: v17.1.0~2361^2~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=b9e72ffe3a4f33c365fa33953fb3716023080871;p=ceph-ci.git

msg/msg_types: add a default_type param to entity_addr_t::parse()

so it can be used in more places.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/mon/MonMap.cc b/src/mon/MonMap.cc
index 8676443f247..22e4e4709ab 100644
--- a/src/mon/MonMap.cc
+++ b/src/mon/MonMap.cc
@@ -660,7 +660,7 @@ int MonMap::init_with_config_file(const ConfigProxy& conf,
     // there on a weird port is a v1 address, and do not handle
     // addrvecs.
     entity_addr_t addr;
-    if (!addr.parse(val.c_str(), nullptr, entity_addr_t::TYPE_LEGACY)) {
+    if (!addr.parse(val, entity_addr_t::TYPE_LEGACY)) {
       errout << "unable to parse address for mon." << mon_name
              << ": addr='" << val << "'" << std::endl;
       continue;
diff --git a/src/msg/msg_types.cc b/src/msg/msg_types.cc
index e6da94ecdb0..ab4ee57177a 100644
--- a/src/msg/msg_types.cc
+++ b/src/msg/msg_types.cc
@@ -96,11 +96,11 @@ void entity_inst_t::generate_test_instances(std::list<entity_inst_t*>& o)
   o.push_back(a);
 }
 
-bool entity_addr_t::parse(const std::string_view s)
+bool entity_addr_t::parse(const std::string_view s, int default_type)
 {
   const char* start = s.data();
   const char* end = nullptr;
-  bool got = parse(start, &end);
+  bool got = parse(start, &end, default_type);
   return got && end == start + s.size();
 }
 
diff --git a/src/msg/msg_types.h b/src/msg/msg_types.h
index e5586e45ac9..93927632f89 100644
--- a/src/msg/msg_types.h
+++ b/src/msg/msg_types.h
@@ -407,7 +407,7 @@ struct entity_addr_t {
     return ss.str();
   }
 
-  bool parse(const std::string_view s);
+  bool parse(const std::string_view s, int default_type=TYPE_DEFAULT);
   bool parse(const char *s, const char **end = 0, int type=0);
 
   void decode_legacy_addr_after_marker(ceph::buffer::list::const_iterator& bl)