Changeset 65580 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Feb 1, 2017 10:36:52 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

113234

Message:

Main/DHCPServerImpl: use newly introduced RTNetMaskToPrefixIPv4.

File:

• trunk/src/VBox/Main/src-server/DHCPServerImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/DHCPServerImpl.cpp

@@ -276 +276 @@
         return E_INVALIDARG;
 
+    /*
+     * Insist on continuous mask.  May be also accept prefix length
+     * here or address/prefix for aIPAddress?
+     */
+    rc = RTNetMaskToPrefixIPv4(&NetworkMask, NULL);
+    if (RT_FAILURE(rc))
+        return E_INVALIDARG;
+
     /* It's more convenient to convert to host order once */
     IPAddress.u = RT_N2H_U32(IPAddress.u);
@@ -288 +296 @@
     {
         return E_INVALIDARG;
-    }
-
-    /*
-     * Insist on continuous mask.  May be also accept prefix length
-     * here or address/prefix for aIPAddress?
-     */
-    if (NetworkMask.u != 0) {
-        /* TODO: factor out mask<->length to <iptr/cidr.h>? */
-        uint32_t prefixMask = 0xffffffff;
-        int prefixLen = 32;
-
-        while (prefixLen > 0) {
-            if (NetworkMask.u == prefixMask)
-                break;
-            --prefixLen;
-            prefixMask <<= 1;
-        }
-
-        if (prefixLen == 0)
-            return E_INVALIDARG;
     }