ubus: fix invalid ipv6-prefix json

[project/odhcpd.git] / src / router.c

diff --git a/src/router.c b/src/router.c
index e62282b..79b688a 100644 (file)
--- a/src/router.c
+++ b/src/router.c
@@ -314,11 +314,12 @@ static uint64_t send_router_advert(struct interface *iface, const struct in6_add
        if (hlim > 0)
                adv.h.nd_ra_curhoplimit = hlim;
 
-       if (iface->dhcpv6)
+       if (iface->dhcpv6) {
                adv.h.nd_ra_flags_reserved = ND_RA_FLAG_OTHER;
 
-       if (iface->ra_managed >= RA_MANAGED_MFLAG)
-               adv.h.nd_ra_flags_reserved |= ND_RA_FLAG_MANAGED;
+               if (iface->ra_managed >= RA_MANAGED_MFLAG)
+                       adv.h.nd_ra_flags_reserved |= ND_RA_FLAG_MANAGED;
+       }
 
        if (iface->route_preference < 0)
                adv.h.nd_ra_flags_reserved |= ND_RA_PREF_LOW;
@@ -519,10 +520,10 @@ static uint64_t send_router_advert(struct interface *iface, const struct in6_add
 
        for (ssize_t i = 0; i < ipcnt; ++i) {
                struct odhcpd_ipaddr *addr = &addrs[i];
-               if (addr->dprefix > 64 || addr->dprefix == 0 || addr->valid <= (uint32_t)now ||
-                               (addr->dprefix == 64 && addr->prefix == 64)) {
+               if (addr->dprefix > 64 || addr->dprefix == 0 || addr->valid <= (uint32_t)now)
                        continue; // Address not suitable
-               } else if (addr->dprefix > 32) {
+
+               if (addr->dprefix > 32) {
                        addr->addr.in6.s6_addr32[1] &= htonl(~((1U << (64 - addr->dprefix)) - 1));
                } else if (addr->dprefix <= 32) {
                        addr->addr.in6.s6_addr32[0] &= htonl(~((1U << (32 - addr->dprefix)) - 1));