diff options
| author | Adam Ierymenko <[email protected]> | 2020-11-25 10:50:35 -0500 |
|---|---|---|
| committer | Adam Ierymenko <[email protected]> | 2020-11-25 10:50:35 -0500 |
| commit | bc4bd2948847e939f393139721de06aa9bb6ed86 (patch) | |
| tree | 9d198c441f0ccbad3e2d9ac8a14c761c12abae69 /one.cpp | |
| parent | f906eec42e07d7716602dd0734e7ead0e9f73071 (diff) | |
| parent | 1f8905dfc9e93e341f48c17e726cee85204ce018 (diff) | |
Merge branch 'master' of github.com:zerotier/ZeroTierOne
Diffstat (limited to 'one.cpp')
| -rw-r--r-- | one.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1021,7 +1021,7 @@ static int cli(int argc,char **argv) int addressCountOfType = 0; for (int k = 0; k<std::min(ZT_MAX_ZT_ASSIGNED_ADDRESSES, (int)assignedAddresses.size());++k) { nlohmann::json &addr = assignedAddresses[k]; - if ((arg2 == "ip4" && addr.get<std::string>().find(".") != std::string::npos) + if ((arg2 == "ip4" && addr.get<std::string>().find('.') != std::string::npos) || ((arg2.find("ip6") == 0) && addr.get<std::string>().find(":") != std::string::npos) || (arg2 == "ip") ) { @@ -1036,19 +1036,19 @@ static int cli(int argc,char **argv) if (arg2.find("ip6p") == 0) { if (arg2 == "ip6plane") { if (addr.get<std::string>().find("fc") == 0) { - aa.append(addr.get<std::string>().substr(0,addr.get<std::string>().find("/"))); + aa.append(addr.get<std::string>().substr(0,addr.get<std::string>().find('/'))); if (k < addressCountOfType-1) aa.append("\n"); } } if (arg2 == "ip6prefix") { if (addr.get<std::string>().find("fc") == 0) { - aa.append(addr.get<std::string>().substr(0,addr.get<std::string>().find("/")).substr(0,24)); + aa.append(addr.get<std::string>().substr(0,addr.get<std::string>().find('/')).substr(0,24)); if (k < addressCountOfType-1) aa.append("\n"); } } } else { - aa.append(addr.get<std::string>().substr(0,addr.get<std::string>().find("/"))); + aa.append(addr.get<std::string>().substr(0,addr.get<std::string>().find('/'))); if (k < addressCountOfType-1) aa.append("\n"); } } |
