Changeset 45047 in vbox

Timestamp:

Mar 15, 2013 9:19:16 AM (12 years ago)

Author:

vboxsync

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

84297

Message:

iprt/cidr.h: RTIPV4ADDR -> RTNETADDRIPV4.
the dependencies are modified as well.

Location:

trunk

Files:

• include/iprt/cidr.h (modified) (3 diffs)
• src/VBox/Devices/Network/DrvNAT.cpp (modified) (5 diffs)
• src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsPortForwardingDlg.cpp (modified) (1 diff)
• src/VBox/Runtime/common/misc/cidr.cpp (modified) (2 diffs)
• src/VBox/Runtime/testcase/tstRTCidr.cpp (modified) (2 diffs)

trunk/include/iprt/cidr.h

@@ -30 +30 @@
 #include <iprt/cdefs.h>
 #include <iprt/types.h>
+#include <iprt/net.h>
 
 /** @defgroup grp_rt_cidr   RTCidr - Classless Inter-Domain Routing notation
@@ -36 +37 @@
  */
 RT_C_DECLS_BEGIN
-
-/** An IPv4 address. */
-typedef uint32_t RTIPV4ADDR;
-/** Pointer to an IPv4 address. */
-typedef RTIPV4ADDR *PRTIPV4ADDR;
-/** Pointer to a const IPv4 address. */
-typedef RTIPV4ADDR const *PCRTIPV4ADDR;
-
 
 /**
@@ -54 +47 @@
  * @param   pNetmask    The determined netmask.
  */
-RTDECL(int) RTCidrStrToIPv4(const char *pszAddress, PRTIPV4ADDR pNetwork, PRTIPV4ADDR pNetmask);
+RTDECL(int) RTCidrStrToIPv4(const char *pszAddress, PRTNETADDRIPV4 pNetwork, PRTNETADDRIPV4 pNetmask);
 
 RT_C_DECLS_END

trunk/src/VBox/Devices/Network/DrvNAT.cpp

@@ -1030 +1030 @@
  * @param   pCfg            The configuration handle.
  */
-static int drvNATConstructRedir(unsigned iInstance, PDRVNAT pThis, PCFGMNODE pCfg, RTIPV4ADDR Network)
+static int drvNATConstructRedir(unsigned iInstance, PDRVNAT pThis, PCFGMNODE pCfg, PRTNETADDRIPV4 pNetwork)
 {
     RTMAC Mac;
@@ -1089 +1089 @@
         /* guest address */
         struct in_addr GuestIP;
-        /* @todo (vvl) use CTL_* */
-        GETIP_DEF(rc, pThis, pNode, GuestIP, htonl(Network | CTL_GUEST));
+        GETIP_DEF(rc, pThis, pNode, GuestIP, RT_H2N_U32(pNetwork->u | CTL_GUEST));
 
         /* Store the guest IP for re-establishing the port-forwarding rules. Note that GuestIP
@@ -1267 +1266 @@
                                    pDrvIns->iInstance, szNetwork);
 
-    RTIPV4ADDR Network;
-    RTIPV4ADDR Netmask;
+    RTNETADDRIPV4 Network, Netmask;
+
     rc = RTCidrStrToIPv4(szNetwork, &Network, &Netmask);
     if (RT_FAILURE(rc))
@@ -1278 +1277 @@
      * Initialize slirp.
      */
-    rc = slirp_init(&pThis->pNATState, RT_H2N_U32(Network), Netmask,
+    rc = slirp_init(&pThis->pNATState, RT_H2N_U32(Network.u), Netmask.u,
                     fPassDomain, !!fUseHostResolver, i32AliasMode,
                     iIcmpCacheLimit, pThis);
@@ -1327 +1326 @@
         }
 #endif
-        rc = drvNATConstructRedir(pDrvIns->iInstance, pThis, pCfg, Network);
+        rc = drvNATConstructRedir(pDrvIns->iInstance, pThis, pCfg, &Network);
         if (RT_SUCCESS(rc))
         {

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsPortForwardingDlg.cpp

@@ -63 +63 @@
         QString strDigits("(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]?|0)");
         QRegExp intRegExp(QString("^(%1?(%2(%1?(%2(%1?(%2%1?)?)?)?)?)?)?$").arg(strDigits).arg(strDot));
-        uint uNetwork, uMask;
-        if (strStringToValidate == "..." || RTCidrStrToIPv4(strStringToValidate.toLatin1().constData(), &uNetwork, &uMask) == VINF_SUCCESS)
+        RTNETADDRIPV4 Network, Mask;
+        if (strStringToValidate == "..." || RTCidrStrToIPv4(strStringToValidate.toLatin1().constData(), &Network, &Mask) == VINF_SUCCESS)
             return QValidator::Acceptable;
         else if (intRegExp.indexIn(strStringToValidate) != -1)

trunk/src/VBox/Runtime/common/misc/cidr.cpp

@@ -38 +38 @@
 
 
-RTDECL(int) RTCidrStrToIPv4(const char *pszAddress, PRTIPV4ADDR pNetwork, PRTIPV4ADDR pNetmask)
+RTDECL(int) RTCidrStrToIPv4(const char *pszAddress, PRTNETADDRIPV4 pNetwork, PRTNETADDRIPV4 pNetmask)
 {
     uint8_t cBits;
@@ -111 +111 @@
         return VERR_INVALID_PARAMETER;
 
-    *pNetmask = u32Netmask;
-    *pNetwork = u32Network;
+    pNetmask->u = u32Netmask;
+    pNetwork->u = u32Network;
     return VINF_SUCCESS;
 }

trunk/src/VBox/Runtime/testcase/tstRTCidr.cpp

@@ -41 +41 @@
 #define CHECKNETWORK(String, rcExpected, ExpectedNetwork, ExpectedNetMask) \
     do { \
-        RTIPV4ADDR Network, NetMask; \
+        RTNETADDRIPV4 Network, NetMask; \
         int rc2 = RTCidrStrToIPv4(String, &Network, &NetMask); \
         if ((rcExpected) && !rc2) \
@@ -50 +50 @@
         else if (   (rcExpected) != rc2 \
                  || (   rc2 == VINF_SUCCESS \
-                     && (   (ExpectedNetwork) != Network \
-                         || (ExpectedNetMask) != NetMask))) \
+                     && (   (ExpectedNetwork) != Network.u \
+                         || (ExpectedNetMask) != NetMask.u))) \
         { \
-            RTTestIFailed("at line %d: '%s': expected %Rrc got %Rrc, expected network %08x got %08x, expected netmask %08x got %08x\n", \
-                          __LINE__, String, rcExpected, rc2, (ExpectedNetwork), Network, (ExpectedNetMask), NetMask); \
+            RTTestIFailed("at line %d: '%s': expected %Rrc got %Rrc, expected network %RTnaipv4 got %RTnaipv4, expected netmask %RTnaipv4 got %RTnaipv4\n", \
+                          __LINE__, String, rcExpected, rc2, (ExpectedNetwork), Network.u, (ExpectedNetMask), NetMask.u); \
         } \
     } while (0)