From: Sage Weil <sage@redhat.com>
Date: Tue, 10 Jul 2018 18:32:20 +0000 (-0500)
Subject: msg/msg_types: add entity_addr_t::legacy_or_front_addr()
X-Git-Tag: v14.0.1~649^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3dd79df478ee248e2e366ed91a80754ffc7e0b5e;p=ceph.git

msg/msg_types: add entity_addr_t::legacy_or_front_addr()

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

diff --git a/src/msg/msg_types.h b/src/msg/msg_types.h
index 714a8ca9ae6..245de72a7b0 100644
--- a/src/msg/msg_types.h
+++ b/src/msg/msg_types.h
@@ -554,6 +554,17 @@ struct entity_addrvec_t {
     }
     return entity_addr_t();
   }
+  entity_addr_t legacy_or_front_addr() const {
+    for (auto& a : v) {
+      if (a.type == entity_addr_t::TYPE_LEGACY) {
+	return a;
+      }
+    }
+    if (!v.empty()) {
+      return v.front();
+    }
+    return entity_addr_t();
+  }
 
   bool parse(const char *s, const char **end = 0);