ippool: Fix endless loop issue with 32 prefix length

While trying to establish a DUN connection with oFono,
an endless loop was found when requesting an IP block.
The problem was on data connection activation its address
with 32 length prefix was notified through ConnMann using
__connman_ippool_newaddr() but mask address shifting with
32 bits was obsolete. So IP pool was considerating block
0.0.0.0 to 255.255.255.255 was in use.

diff --git a/src/ippool.c b/src/ippool.c
index 58a0d2812a9548cfb2e29dc3b7d5729eac38d9c0..52446cec1b8b7c9c8963ca13f585cd89c589f3fc 100644 (file)
--- a/src/ippool.c
+++ b/src/ippool.c
@@ -258,7 +258,11 @@ void __connman_ippool_newaddr(int index, const char *address,
        if (is_private_address(start) == FALSE)
                return;
 
-       mask = ~(0xffffffff >> prefixlen);
+       if (prefixlen >= 32)
+               mask = 0xffffffff;
+       else
+               mask = ~(0xffffffff >> prefixlen);
+
        start = start & mask;
        end = start | ~mask;