From: Jo-Philipp Wich <jo@mein.io>
Date: Tue, 14 Nov 2023 13:01:44 +0000 (+0100)
Subject: interface-ip: fix IPv4 route target masking
X-Git-Url: http://git.openwrt.org/feed/telephony.git;master?a=commitdiff_plain;h=8587c074f1eb2064c42adb0a6aa5073f695ab89d;p=project%2Fnetifd.git

interface-ip: fix IPv4 route target masking

A previous commit supposed to mask out excess host bits in route targets
failed to correctly calculate the mask value, causing it to produce
improper results for certain mask lengths.

Fixes: #17
Fixes: 76eb342 ("interface-ip: mask out host bits in IPv4 route targets")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/interface-ip.c b/interface-ip.c
index d2fe385..28e7106 100644
--- a/interface-ip.c
+++ b/interface-ip.c
@@ -448,7 +448,7 @@ interface_ip_add_route(struct interface *iface, struct blob_attr *attr, bool v6)
 
 		/* Mask out IPv4 host bits to avoid "Invalid prefix for given prefix length" */
 		if (af == AF_INET && route->mask < 32)
-			route->addr.in.s_addr &= ((1u << route->mask) - 1);
+			clear_if_addr(&route->addr, route->mask);
 	}
 
 	if ((cur = tb[ROUTE_GATEWAY]) != NULL) {