From 17600d6d6ef0edf60bbf64c5bef594a8a07547cc Mon Sep 17 00:00:00 2001 From: Stefano Brivio Date: Tue, 19 Oct 2021 09:01:27 +0200 Subject: netlink, conf: Actually get prefix/mask length Signed-off-by: Stefano Brivio --- conf.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'conf.c') diff --git a/conf.c b/conf.c index 4287630..8e96368 100644 --- a/conf.c +++ b/conf.c @@ -469,7 +469,11 @@ static void conf_ip(struct ctx *c) nl_route(0, c->ifi, AF_INET, &c->gw4); if (!c->addr4) { - nl_addr(0, c->ifi, AF_INET, &c->addr4, 0, NULL); + int mask_len = 0; + + nl_addr(0, c->ifi, AF_INET, &c->addr4, &mask_len, NULL); + c->mask4 = htonl(0xffffffff << (32 - mask_len)); + if (!c->mask4) { if (IN_CLASSA(ntohl(c->addr4))) c->mask4 = htonl(IN_CLASSA_NET); @@ -492,12 +496,14 @@ static void conf_ip(struct ctx *c) memset(&c->mac_guest, 0xff, sizeof(c->mac_guest)); if (v6 != IP_VERSION_DISABLED) { + int prefix_len = 0; + if (IN6_IS_ADDR_UNSPECIFIED(&c->gw6)) nl_route(0, c->ifi, AF_INET6, &c->gw6); nl_addr(0, c->ifi, AF_INET6, IN6_IS_ADDR_UNSPECIFIED(&c->addr6) ? &c->addr6 : NULL, - 0, &c->addr6_ll); + &prefix_len, &c->addr6_ll); memcpy(&c->addr6_seen, &c->addr6, sizeof(c->addr4_seen)); memcpy(&c->addr6_ll_seen, &c->addr6, sizeof(c->addr4_seen)); -- cgit v1.2.3