From: Sage Weil <sage@redhat.com>
Date: Sat, 18 Jun 2016 16:45:14 +0000 (-0400)
Subject: msg/msg_types: add TYPE_MSGR2
X-Git-Tag: v11.1.0~515^2~14
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fb5332a0a5233ad78e060b6892b2e1310bee4fa4;p=ceph.git

msg/msg_types: add TYPE_MSGR2

Unused so far.

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

diff --git a/src/msg/msg_types.cc b/src/msg/msg_types.cc
index f8e6a562fe4..6a9ffa285d1 100644
--- a/src/msg/msg_types.cc
+++ b/src/msg/msg_types.cc
@@ -70,6 +70,9 @@ bool entity_addr_t::parse(const char *s, const char **end)
   if (strncmp("legacy:", s, 7) == 0) {
     start += 7;
     newtype = TYPE_LEGACY;
+  } else if (strncmp("msgr2:", s, 6) == 0) {
+    start += 6;
+    newtype = TYPE_MSGR2;
   } else if (*s == '-') {
     *this = entity_addr_t();
     *end = s + 1;
diff --git a/src/msg/msg_types.h b/src/msg/msg_types.h
index df1499b5704..c36fc978bf1 100644
--- a/src/msg/msg_types.h
+++ b/src/msg/msg_types.h
@@ -208,12 +208,14 @@ struct entity_addr_t {
   typedef enum {
     TYPE_NONE = 0,
     TYPE_LEGACY = 1,  ///< legacy msgr1 protocol (ceph jewel and older)
+    TYPE_MSGR2 = 2,   ///< msgr2 protocol (new in ceph kraken)
   } type_t;
   static const type_t TYPE_DEFAULT = TYPE_LEGACY;
   static const char *get_type_name(int t) {
     switch (t) {
     case TYPE_NONE: return "none";
     case TYPE_LEGACY: return "legacy";
+    case TYPE_MSGR2: return "msgr2";
     default: return "???";
     }
   };