Changeset 79747 in vbox for trunk/src/VBox/Runtime/common/net

Timestamp:

Jul 12, 2019 11:00:54 PM (6 years ago)

Author:

vboxsync

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

132112

Message:

Main: Redoing the IDHCPServer interface, part II. Implemented groups and fixed a couple of bugs. Made RTNetStrToMacAddr understand hexstrings w/o colon separators. bugref:9288

File:

• trunk/src/VBox/Runtime/common/net/macstr.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/common/net/macstr.cpp

@@ -51 +51 @@
 {
     /*
+     * First check if it might be a 12 xdigit string without any separators.
+     */
+    size_t cchValue = strlen(pszValue);
+    if (cchValue >= 12 && memchr(pszValue, ':', 12) == NULL)
+    {
+        bool fOkay = true;
+        for (size_t off = 0; off < 12 && fOkay; off++)
+            fOkay = RT_C_IS_XDIGIT(pszValue[off]);
+        if (fOkay && cchValue > 12)
+            for (size_t off = 12; off < cchValue && fOkay; off++)
+                fOkay = RT_C_IS_SPACE(pszValue[off]);
+        if (fOkay)
+        {
+            int rc = RTStrConvertHexBytes(pszValue, pAddr, sizeof(*pAddr), 0);
+            if (RT_SUCCESS(rc))
+                rc = VINF_SUCCESS;
+            return rc;
+        }
+    }
+
+    /*
      * Not quite sure if I should accept stuff like "08::27:::1" here...
      * The code is accepting "::" patterns now, except for for the first