ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace from_string_checked pair return type with optional<Endpoint>

Browse Source
This commit is contained in:
seelabs
2019-08-14 13:39:49 -07:00
parent 0a256247a0
commit 1eb3753f26
8 changed files with 48 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ripple/server/impl/Port.cpp
View File

@@ -85,18 +85,18 @@ populate (Section const& section, std::string const& field, std::ostream& log,
while (std::getline (ss, ip, ','))
{
auto const addr = beast::IP::Endpoint::from_string_checked (ip);
if (! addr.second)
if (! addr)
{
log << "Invalid value '" << ip << "' for key '" << field <<
"' in [" << section.name () << "]";
Throw<std::exception> ();
}
if (is_unspecified (addr.first))
if (is_unspecified (*addr))
{
if (! allowAllIps)
{
log << addr.first.address() << " not allowed'" <<
log << addr->address() << " not allowed'" <<
"' for key '" << field << "' in [" <<
section.name () << "]";
Throw<std::exception> ();
@@ -109,13 +109,13 @@ populate (Section const& section, std::string const& field, std::ostream& log,
if (has_any && ! ips->empty ())
{
log << "IP specified along with " << addr.first.address() <<
log << "IP specified along with " << addr->address() <<
" '" << ip << "' for key '" << field << "' in [" <<
section.name () << "]";
Throw<std::exception> ();
}
auto const& address = addr.first.address();
auto const& address = addr->address();
if (std::find_if (admin_ip.begin(), admin_ip.end(),
[&address] (beast::IP::Address const& a)
{
@@ -128,7 +128,7 @@ populate (Section const& section, std::string const& field, std::ostream& log,
Throw<std::exception> ();
}
ips->emplace_back (addr.first.address ());
ips->emplace_back (addr->address ());
}
}
}