From f36dc9c2b933f7746c8a97697accefb0612a929a Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 10 Jan 2019 12:31:56 -0600 Subject: [PATCH] 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 --- src/msg/msg_types.cc | 7 +++---- src/test/test_addrs.cc | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/msg/msg_types.cc b/src/msg/msg_types.cc index c39e4e404fa6c..37146ad2b75ac 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 76156779b5394..13be03cdcdc03 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 }, }; -- 2.39.5