mirrors/fort
1
0
Fork 0
mirror of https://github.com/tnodir/fort synced 2024-11-15 08:35:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: IpRange: Simpllify parseIp*AddressMaskPrefix()

Browse Source
This commit is contained in:
Nodir Temirkhodjaev 2023-05-10 12:03:42 +03:00
parent 945998bf23
commit 2d8f27d6ad
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ui/util/conf/confutil.cpp
View File

@ -25,7 +25,7 @@ using namespace Qt::StringLiterals;
namespace {
bool checkIpRangeSize(const IpRange &range)
inline bool checkIpRangeSize(const IpRange &range)
{
return (range.ip4Size() + range.pair4Size()) < FORT_CONF_IP_MAX
&& (range.ip6Size() + range.pair6Size()) < FORT_CONF_IP_MAX;

14
src/ui/util/net/iprange.cpp
View File

@ -9,6 +9,16 @@
namespace {
inline bool checkIp4MaskBitsCount(const int nbits)
{
return (nbits >= 0 && nbits <= 32);
}
inline bool checkIp6MaskBitsCount(const int nbits)
{
return (nbits >= 0 && nbits <= 128);
}
bool compareLessIp6(const ip6_addr_t &l, const ip6_addr_t &r)
{
return memcmp(&l, &r, sizeof(ip6_addr_t)) < 0;
@ -256,7 +266,7 @@ IpRange::ParseError IpRange::parseIp4AddressMaskPrefix(
bool ok = true;
const int nbits = mask.isEmpty() ? emptyNetMask : mask.toInt(&ok);
if (!ok || nbits < 0 || nbits > 32) {
if (!ok || !checkIp4MaskBitsCount(nbits)) {
setErrorMessage(tr("Bad mask"));
setErrorDetails(QString("IPv4 mask='%1' nbits='%2'").arg(mask, QString::number(nbits)));
return ErrorBadMask;
@ -331,7 +341,7 @@ IpRange::ParseError IpRange::parseIp6AddressMaskPrefix(
bool ok;
const int nbits = mask.toInt(&ok);
if (!ok || nbits < 0 || nbits > 128) {
if (!ok || !checkIp6MaskBitsCount(nbits)) {
setErrorMessage(tr("Bad mask"));
setErrorDetails(QString("IPv6 mask='%1' nbits='%2'").arg(mask, QString::number(nbits)));
return ErrorBadMask;