aboutsummaryrefslogtreecommitdiff
path: root/net/owipcalc
diff options
context:
space:
mode:
authorNick Hainke <vincent@systemli.org>2021-01-23 13:48:11 +0100
committerNick Hainke <vincent@systemli.org>2021-01-23 17:48:18 +0100
commite974acaac78d8b90bd9e5cbd81010593ec725cbb (patch)
tree74049c7e23b0a5f02e1bd6c3a4090694873f87ef /net/owipcalc
parent64c917b702c70d1c5193c8cb85ebfe3b3485082c (diff)
owipcalc: fix contains not respect default route
In IPv4 the default route can be written as 0.0.0.0/0 In IPv6 the default route can be written as ::/0 If u try owipcalc 0.0.0.0/0 contains 1.1.1.1 or owipcalc ::/0 contains ::1 owipcalc will respond with 0 meaning that the "default prefixes" do not contain the routes. That is why we check now for 0 prefix. Furthermore, if the prefix is 0, i will be 16. We will access a negative array entry in the line: uint8_t net1 = x->s6_addr[15-i] & m; Divide by % 16 to prevent i becoming 16: uint8_t i = ((128 - a->prefix) / 8) % 16; Signed-off-by: Nick Hainke <vincent@systemli.org>
Diffstat (limited to 'net/owipcalc')
2 files changed, 6 insertions, 5 deletions
diff --git a/net/owipcalc/Makefile b/net/owipcalc/Makefile
index dc68a0346..c7857f5c8 100644
--- a/net/owipcalc/Makefile
+++ b/net/owipcalc/Makefile
@@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=owipcalc
-PKG_RELEASE:=5
+PKG_RELEASE:=6
PKG_LICENSE:=Apache-2.0
include $(INCLUDE_DIR)/package.mk
diff --git a/net/owipcalc/src/owipcalc.c b/net/owipcalc/src/owipcalc.c
index 5ed609f15..fa656948b 100644
--- a/net/owipcalc/src/owipcalc.c
+++ b/net/owipcalc/src/owipcalc.c
@@ -227,7 +227,7 @@ static bool cidr_contains4(struct cidr *a, struct cidr *b)
if (printed)
qprintf(" ");
- if ((b->prefix >= a->prefix) && (net1 == net2))
+ if ((a->prefix == 0) || ((b->prefix >= a->prefix) && (net1 == net2)))
{
qprintf("1");
return true;
@@ -529,7 +529,7 @@ static bool cidr_contains6(struct cidr *a, struct cidr *b)
{
struct in6_addr *x = &a->addr.v6;
struct in6_addr *y = &b->addr.v6;
- uint8_t i = (128 - a->prefix) / 8;
+ uint8_t i = ((128 - a->prefix) / 8) % 16;
uint8_t m = ~((1 << ((128 - a->prefix) % 8)) - 1);
uint8_t net1 = x->s6_addr[15-i] & m;
uint8_t net2 = y->s6_addr[15-i] & m;
@@ -537,8 +537,9 @@ static bool cidr_contains6(struct cidr *a, struct cidr *b)
if (printed)
qprintf(" ");
- if ((b->prefix >= a->prefix) && (net1 == net2) &&
- ((i == 15) || !memcmp(&x->s6_addr, &y->s6_addr, 15-i)))
+ if ((a->prefix == 0) ||
+ ((b->prefix >= a->prefix) && (net1 == net2) &&
+ ((i == 15) || !memcmp(&x->s6_addr, &y->s6_addr, 15-i))))
{
qprintf("1");
return true;
Powered by cgit, Themed by Ted Yin.