mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-30 13:37:55 +00:00
Code Issues Releases Wiki Activity

[#1121] Remove inefficient comparator wrapper methods from IOAddress

Browse Source 
src/lib/asiolink/io_address.h
    IOAddress::lessThan()
    IOAddress::smallerEqual() - removed these altogether
    IOAddress operators now simply use boost::ip_address operators

src/lib/dhcpsrv/pool.cc
    Pool::inRange() - replace use of IOAddress::smallerEqual() with
    direct <= expresssion.
This commit is contained in:
Thomas Markwalder
2020-02-14 08:51:39 -05:00
parent 24e7b45ce2
commit 26a036b17a
2 changed files with 3 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/lib/asiolink/io_address.h
View File

@@ -188,51 +188,16 @@ public:
///
/// \param other Address to compare against.
///
/// \return true if this address is smaller than the other address.
///
/// It is useful for comparing which address is bigger.
/// Operations within one protocol family are obvious.
/// Comparisons between v4 and v6 will always return v4
/// being smaller. This follows boost::boost::asio::ip implementation
bool lessThan(const IOAddress& other) const {
if (this->getFamily() == other.getFamily()) {
if (this->getFamily() == AF_INET6) {
return (this->asio_address_.to_v6() < other.asio_address_.to_v6());
} else {
return (this->asio_address_.to_v4() < other.asio_address_.to_v4());
}
}
return (this->getFamily() < other.getFamily());
}
/// \brief Checks if one address is smaller or equal than the other
///
/// \param other Address to compare against.
///
/// \return true if this address is smaller than the other address.
bool smallerEqual(const IOAddress& other) const {
if (equals(other)) {
return (true);
}
return (lessThan(other));
}
/// \brief Checks if one address is smaller than the other
///
/// \param other Address to compare against.
///
/// See \ref lessThan method for details.
bool operator<(const IOAddress& other) const {
return (lessThan(other));
return (asio_address_ < other.asio_address_);
}
/// \brief Checks if one address is smaller or equal than the other
///
/// \param other Address to compare against.
///
/// See \ref smallerEqual method for details.
bool operator<=(const IOAddress& other) const {
return (smallerEqual(other));
return (asio_address_ <= other.asio_address_);
}
/// \brief Compare addresses for inequality

2
src/lib/dhcpsrv/pool.cc
View File

@@ -26,7 +26,7 @@ Pool::Pool(Lease::Type type, const isc::asiolink::IOAddress& first,
}
bool Pool::inRange(const isc::asiolink::IOAddress& addr) const {
return (first_.smallerEqual(addr) && addr.smallerEqual(last_));
return (first_ <= addr && addr <= last_);
}
bool Pool::clientSupported(const ClientClasses& classes) const {