From: Cédric Bosdonnat <cbosdonnat@suse.com>
Date: Thu, 15 Jan 2015 08:13:09 +0000 (+0100)
Subject: virSocketAddrGetIpPrefix 0.0.0.0 and :: special cases
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=3993c2f91cbaab94ceb65557fd1c54dff01d24cc;p=libvirt.git

virSocketAddrGetIpPrefix 0.0.0.0 and :: special cases

If 0.0.0.0  or :: address is provided, then the returned prefix should
be 0, for the default address.
---

diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c
index c5584af86a..91bcadf5f5 100644
--- a/src/util/virsocketaddr.c
+++ b/src/util/virsocketaddr.c
@@ -832,6 +832,12 @@ virSocketAddrGetIpPrefix(const virSocketAddr *address,
          */
         unsigned char octet
             = ntohl(address->data.inet4.sin_addr.s_addr) >> 24;
+
+        /* If address is 0.0.0.0, we surely want to have 0 prefix for
+         * the default route. */
+        if (address->data.inet4.sin_addr.s_addr == 0)
+            return 0;
+
         if ((octet & 0x80) == 0) {
             /* Class A network */
             return 8;
@@ -844,6 +850,8 @@ virSocketAddrGetIpPrefix(const virSocketAddr *address,
         }
         return -1;
     } else if (VIR_SOCKET_ADDR_IS_FAMILY(address, AF_INET6)) {
+        if (address->data.inet6.sin6_addr.s6_addr == 0)
+            return 0;
         return 64;
     }