Changeset 93472 in vbox for trunk

Timestamp:

Jan 28, 2022 12:01:55 PM (3 years ago)

Author:

vboxsync

Message:

VBoxNetAdpCtl: (bugref:8093) Replaced adhoc IP address conversions with calls to IPRT functions

File:

• trunk/src/VBox/HostDrivers/adpctl/VBoxNetAdpCtl.cpp (modified) (3 diffs)

trunk/src/VBox/HostDrivers/adpctl/VBoxNetAdpCtl.cpp

@@ -277 +277 @@
 /*
  * Helper class to incapsulate IPv4 address conversion.
+ *
+ * Note that this class relies on NetworkAddress to have been used for
+ * checking validity of IP addresses prior calling any methods of this
+ * class.
  */
 class AddressIPv4
@@ -283 +287 @@
     AddressIPv4(const char *pcszAddress, const char *pcszNetmask = 0)
         {
+            m_Prefix = 0;
+            memset(&m_Address, 0, sizeof(m_Address));
+
             if (pcszNetmask)
                 m_Prefix = maskToPrefix(pcszNetmask);
@@ -294 +301 @@
                 m_Prefix = 24;
             }
-            inet_pton(AF_INET, pcszAddress, &(m_Address.sin_addr));
+            int rc = RTNetStrToIPv4Addr(pcszAddress, &m_Address);
+            AssertRCReturnVoid(rc);
             snprintf(m_szAddressAndMask, sizeof(m_szAddressAndMask), "%s/%d", pcszAddress, m_Prefix);
-            m_Broadcast.sin_addr.s_addr = computeBroadcast(m_Address.sin_addr.s_addr, m_Prefix);
-            inet_ntop(AF_INET, &(m_Broadcast.sin_addr), m_szBroadcast, sizeof(m_szBroadcast));
+            deriveBroadcast(&m_Address, m_Prefix);
         }
     const char *getBroadcast() const { return m_szBroadcast; };
     const char *getAddressAndMask() const { return m_szAddressAndMask; };
 private:
-    unsigned int maskToPrefix(const char *pcszNetmask);
-    unsigned long computeBroadcast(unsigned long ulAddress, unsigned int uPrefix);
-
-    unsigned int       m_Prefix;
-    struct sockaddr_in m_Address;
-    struct sockaddr_in m_Broadcast;
+    int maskToPrefix(const char *pcszNetmask);
+    void deriveBroadcast(PCRTNETADDRIPV4 pcAddress, int uPrefix);
+
+    int           m_Prefix;
+    RTNETADDRIPV4 m_Address;
     char m_szAddressAndMask[INET_ADDRSTRLEN + 3]; /* e.g. 192.168.56.101/24 */
     char m_szBroadcast[INET_ADDRSTRLEN];
 };
 
-unsigned int AddressIPv4::maskToPrefix(const char *pcszNetmask)
-{
-    unsigned cBits = 0;
-    unsigned m[4];
-
-    if (sscanf(pcszNetmask, "%u.%u.%u.%u", &m[0], &m[1], &m[2], &m[3]) == 4)
-    {
-        for (int i = 0; i < 4 && m[i]; ++i)
-        {
-            int mask = m[i];
-            while (mask & 0x80)
-            {
-                cBits++;
-                mask <<= 1;
-            }
-        }
-    }
-    return cBits;
-}
-
-unsigned long AddressIPv4::computeBroadcast(unsigned long ulAddress, unsigned int uPrefix)
+int AddressIPv4::maskToPrefix(const char *pcszNetmask)
+{
+    RTNETADDRIPV4 mask;
+    int prefix = 0;
+
+    int rc = RTNetStrToIPv4Addr(pcszNetmask, &mask);
+    AssertRCReturn(rc, 0);
+    rc = RTNetMaskToPrefixIPv4(&mask, &prefix);
+    AssertRCReturn(rc, 0);
+
+    return prefix;
+}
+
+void AddressIPv4::deriveBroadcast(PCRTNETADDRIPV4 pcAddress, int iPrefix)
 {
     /* Note: the address is big-endian. */
-    unsigned long ulNetworkMask = (1l << uPrefix) - 1;
-    return (ulAddress & ulNetworkMask) | ~ulNetworkMask;
+    RTNETADDRIPV4 mask, broadcast;
+    int rc = RTNetPrefixToMaskIPv4(iPrefix, &mask);
+    AssertRCReturnVoid(rc);
+    broadcast.au32[0] = (pcAddress->au32[0] & mask.au32[0]) | ~mask.au32[0];
+    inet_ntop(AF_INET, broadcast.au32, m_szBroadcast, sizeof(m_szBroadcast));
 }