Refactor ipv4VerifyIpAndGetBitcount
Boost has a number of ip related functions that can do a lot of this
parsing for us, we should make use of them.
Unfortunately, boost::asio::network_v4[1] doesn't have a no-throw
variant of this constructor. It's not clear if this was an intentional
omission, but for the moment, this patchset chooses to reimplement the
mask code in-place for the moment. Even with this, the code is still
simpler than what was present.
[1] https://www.boost.org/doc/libs/1_80_0/doc/html/boost_asio/reference/ip__network_v4/network_v4.html
Tested: Unit tests pass. Pretty good coverage.
Signed-off-by: Ed Tanous <edtanous@google.com>
Change-Id: Ia50b50ce0096a5acbb9da814ee15aa8edbfe0e31
diff --git a/redfish-core/include/utils/ip_utils.hpp b/redfish-core/include/utils/ip_utils.hpp
index 2d9b138..9b18fcc 100644
--- a/redfish-core/include/utils/ip_utils.hpp
+++ b/redfish-core/include/utils/ip_utils.hpp
@@ -1,7 +1,5 @@
#pragma once
-#include <boost/algorithm/string/classification.hpp>
-#include <boost/algorithm/string/split.hpp>
#include <boost/asio/ip/address.hpp>
#include <boost/asio/ip/address_v4.hpp>
#include <boost/asio/ip/address_v6.hpp>
@@ -43,80 +41,72 @@
* @return true in case of success, false otherwise
*/
inline bool ipv4VerifyIpAndGetBitcount(const std::string& ip,
- uint8_t* bits = nullptr)
+ uint8_t* prefixLength = nullptr)
{
- std::vector<std::string> bytesInMask;
-
- boost::split(bytesInMask, ip, boost::is_any_of("."));
-
- static const constexpr int ipV4AddressSectionsCount = 4;
- if (bytesInMask.size() != ipV4AddressSectionsCount)
+ boost::system::error_code ec;
+ boost::asio::ip::address_v4 addr = boost::asio::ip::make_address_v4(ip, ec);
+ if (ec)
{
return false;
}
- if (bits != nullptr)
+ if (prefixLength != nullptr)
{
- *bits = 0;
- }
-
- char* endPtr = nullptr;
- long previousValue = 255;
- bool firstZeroInByteHit = false;
- for (const std::string& byte : bytesInMask)
- {
- if (byte.empty())
+ uint8_t prefix = 0;
+ boost::asio::ip::address_v4::bytes_type maskBytes = addr.to_bytes();
+ bool maskFinished = false;
+ for (unsigned char byte : maskBytes)
{
- return false;
- }
-
- // Use strtol instead of stroi to avoid exceptions
- long value = std::strtol(byte.c_str(), &endPtr, 10);
-
- // endPtr should point to the end of the string, otherwise given string
- // is not 100% number
- if (*endPtr != '\0')
- {
- return false;
- }
-
- // Value should be contained in byte
- if (value < 0 || value > 255)
- {
- return false;
- }
-
- if (bits != nullptr)
- {
- // Mask has to be continuous between bytes
- if (previousValue != 255 && value != 0)
+ if (maskFinished)
{
- return false;
+ if (byte != 0U)
+ {
+ return false;
+ }
+ continue;
}
-
- // Mask has to be continuous inside bytes
- firstZeroInByteHit = false;
-
- // Count bits
- for (long bitIdx = 7; bitIdx >= 0; bitIdx--)
+ switch (byte)
{
- if ((value & (1L << bitIdx)) != 0)
- {
- if (firstZeroInByteHit)
- {
- // Continuity not preserved
- return false;
- }
- (*bits)++;
- }
- else
- {
- firstZeroInByteHit = true;
- }
+ case 255:
+ prefix += 8;
+ break;
+ case 254:
+ prefix += 7;
+ maskFinished = true;
+ break;
+ case 252:
+ prefix += 6;
+ maskFinished = true;
+ break;
+ case 248:
+ prefix += 5;
+ maskFinished = true;
+ break;
+ case 240:
+ prefix += 4;
+ maskFinished = true;
+ break;
+ case 224:
+ prefix += 3;
+ maskFinished = true;
+ break;
+ case 192:
+ prefix += 2;
+ maskFinished = true;
+ break;
+ case 128:
+ prefix += 1;
+ maskFinished = true;
+ break;
+ case 0:
+ maskFinished = true;
+ break;
+ default:
+ // Invalid netmask
+ return false;
}
}
-
- previousValue = value;
+ *prefixLength = prefix;
}
return true;