From: Sage Weil <sage@redhat.com>
Date: Fri, 1 Jun 2018 19:14:24 +0000 (-0500)
Subject: msg/Messenger: new bindv() that takes an addrvec
X-Git-Tag: v14.0.1~951^2~34
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1b80cfa8aec36adb0d571f99e68ebc7fc2aa2bd9;p=ceph.git

msg/Messenger: new bindv() that takes an addrvec

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/msg/Messenger.cc b/src/msg/Messenger.cc
index 22c591955833..14c5827cea24 100644
--- a/src/msg/Messenger.cc
+++ b/src/msg/Messenger.cc
@@ -78,3 +78,10 @@ int Messenger::get_default_crc_flags(md_config_t * conf)
     r |= MSG_CRC_HEADER;
   return r;
 }
+
+int Messenger::bindv(const entity_addrvec_t& addrs)
+{
+  lderr(cct) << __func__ << " " << addrs << " fallback to legacy "
+	     << addrs.legacy_addr() << dendl;
+  return bind(addrs.legacy_addr());
+}
diff --git a/src/msg/Messenger.h b/src/msg/Messenger.h
index 338db67b7aee..1f43876580d4 100644
--- a/src/msg/Messenger.h
+++ b/src/msg/Messenger.h
@@ -361,6 +361,7 @@ public:
    * we can be more specific about the failure.
    */
   virtual int bind(const entity_addr_t& bind_addr) = 0;
+
   /**
    * This function performs a full restart of the Messenger component,
    * whatever that means.  Other entities who connect to this
@@ -379,6 +380,9 @@ public:
    * @return 0 on success, or -1 on error, or -errno if
    */
   virtual int client_bind(const entity_addr_t& bind_addr) = 0;
+
+  virtual int bindv(const entity_addrvec_t& addrs);
+
   /**
    * @} // Configuration
    */