From: Sage Weil <sage@redhat.com>
Date: Thu, 10 Jan 2019 18:31:56 +0000 (-0600)
Subject: msg/msg_types: entity_addrvec_t: allow only ',' as an addrvec separator
X-Git-Tag: v14.1.0~357^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f36dc9c2b933f7746c8a97697accefb0612a929a;p=ceph.git

msg/msg_types: entity_addrvec_t: allow only ',' as an addrvec separator

This will allow us to list addrvecs using [ ;] as separators.

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

diff --git a/src/msg/msg_types.cc b/src/msg/msg_types.cc
index c39e4e404fa6..37146ad2b75a 100644
--- a/src/msg/msg_types.cc
+++ b/src/msg/msg_types.cc
@@ -244,11 +244,10 @@ bool entity_addrvec_t::parse(const char *s, const char **end)
     }
     v.push_back(a);
     s = *end;
-    while (*s == ',' ||
-	   *s == ' ' ||
-	   *s == ';') {
-      ++s;
+    if (*s != ',') {
+      break;
     }
+    ++s;
   }
   return !v.empty();
 }
diff --git a/src/test/test_addrs.cc b/src/test/test_addrs.cc
index 76156779b539..13be03cdcdc0 100644
--- a/src/test/test_addrs.cc
+++ b/src/test/test_addrs.cc
@@ -255,8 +255,8 @@ TEST(Msgr, TestAddrvecEncodeAddrDecode3)
 const char *addrvec_parse_checks[][3] = {
   { "127.0.0.1", "v2:127.0.0.1:0/0", "" },
   { "127.0.0.1 foo", "v2:127.0.0.1:0/0", " foo" },
-  { "127.0.0.1 1.2.3.4 foo", "[v2:127.0.0.1:0/0,v2:1.2.3.4:0/0]", " foo" },
-  { "127.0.0.1 :: - foo", "[v2:127.0.0.1:0/0,v2:[::]:0/0,-]", " foo" },
+  { "127.0.0.1,1.2.3.4 foo", "[v2:127.0.0.1:0/0,v2:1.2.3.4:0/0]", " foo" },
+  { "127.0.0.1,::,- foo", "[v2:127.0.0.1:0/0,v2:[::]:0/0,-]", " foo" },
   { NULL, NULL, NULL },
 };