Changeset 91872 in vbox

Timestamp:

Oct 20, 2021 9:07:44 AM (3 years ago)

Author:

vboxsync

Message:

Devices/Network: Change the network drivers to access the CFGM API through the driver helper callback table only, bugref:10074

Location:

trunk/src/VBox/Devices/Network

Files:

• DrvIntNet.cpp (modified) (14 diffs)
• DrvNAT.cpp (modified) (14 diffs)
• DrvNetShaper.cpp (modified) (2 diffs)
• DrvNetSniffer.cpp (modified) (3 diffs)
• DrvTAP.cpp (modified) (6 diffs)
• DrvUDPTunnel.cpp (modified) (5 diffs)
• DrvVDE.cpp (modified) (3 diffs)

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

@@ -1292 +1292 @@
                                    uint32_t fFixedFlag, uint32_t *pfFlags)
 {
+    PCPDMDRVHLPR3 pHlp = pDrvIns->pHlpR3;
+
     char szValue[64];
-    int rc = CFGMR3QueryString(pDrvIns->pCfg, pszName, szValue, sizeof(szValue));
+    int rc = pHlp->pfnCFGMQueryString(pDrvIns->pCfg, pszName, szValue, sizeof(szValue));
     if (RT_FAILURE(rc))
     {
@@ -1354 +1356 @@
     RT_NOREF(fFlags);
     PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
-    PDRVINTNET pThis = PDMINS_2_DATA(pDrvIns, PDRVINTNET);
+    PDRVINTNET      pThis = PDMINS_2_DATA(pDrvIns, PDRVINTNET);
+    PCPDMDRVHLPR3   pHlp = pDrvIns->pHlpR3;
     bool f;
 
@@ -1441 +1444 @@
      * The name of the internal network to connect to.
      */
-    int rc = CFGMR3QueryString(pCfg, "Network", OpenReq.szNetwork, sizeof(OpenReq.szNetwork));
+    int rc = pHlp->pfnCFGMQueryString(pCfg, "Network", OpenReq.szNetwork, sizeof(OpenReq.szNetwork));
     if (RT_FAILURE(rc))
         return PDMDRV_SET_ERROR(pDrvIns, rc,
@@ -1451 +1454 @@
      */
     uint32_t u32TrunkType;
-    rc = CFGMR3QueryU32(pCfg, "TrunkType", &u32TrunkType);
+    rc = pHlp->pfnCFGMQueryU32(pCfg, "TrunkType", &u32TrunkType);
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         u32TrunkType = kIntNetTrunkType_None;
@@ -1462 +1465 @@
      * The name of the trunk connection.
      */
-    rc = CFGMR3QueryString(pCfg, "Trunk", OpenReq.szTrunk, sizeof(OpenReq.szTrunk));
+    rc = pHlp->pfnCFGMQueryString(pCfg, "Trunk", OpenReq.szTrunk, sizeof(OpenReq.szTrunk));
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         OpenReq.szTrunk[0] = '\0';
@@ -1476 +1479 @@
      */
     bool fSharedMacOnWire;
-    rc = CFGMR3QueryBoolDef(pCfg, "SharedMacOnWire", &fSharedMacOnWire, false);
+    rc = pHlp->pfnCFGMQueryBoolDef(pCfg, "SharedMacOnWire", &fSharedMacOnWire, false);
     if (RT_FAILURE(rc))
         return PDMDRV_SET_ERROR(pDrvIns, rc,
@@ -1488 +1491 @@
      * @deprecated Use AccessPolicy instead.
      */
-    rc = CFGMR3QueryBool(pCfg, "RestrictAccess", &f);
+    rc = pHlp->pfnCFGMQueryBool(pCfg, "RestrictAccess", &f);
     if (RT_SUCCESS(rc))
     {
@@ -1507 +1510 @@
      * restrictions from being lifted.  If no further policy changes are
      * desired, apply the relevant fixed flags. */
-    rc = CFGMR3QueryBoolDef(pCfg, "RequireExactPolicyMatch", &f, false);
+    rc = pHlp->pfnCFGMQueryBoolDef(pCfg, "RequireExactPolicyMatch", &f, false);
     if (RT_FAILURE(rc))
         return PDMDRV_SET_ERROR(pDrvIns, rc,
@@ -1519 +1522 @@
      * and prevent them  being lifted later on.
      */
-    rc = CFGMR3QueryBoolDef(pCfg, "RequireAsRestrictivePolicy", &f, false);
+    rc = pHlp->pfnCFGMQueryBoolDef(pCfg, "RequireAsRestrictivePolicy", &f, false);
     if (RT_FAILURE(rc))
         return PDMDRV_SET_ERROR(pDrvIns, rc,
@@ -1627 +1630 @@
      * The size of the receive buffer.
      */
-    rc = CFGMR3QueryU32(pCfg, "ReceiveBufferSize", &OpenReq.cbRecv);
+    rc = pHlp->pfnCFGMQueryU32(pCfg, "ReceiveBufferSize", &OpenReq.cbRecv);
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         OpenReq.cbRecv = 318 * _1K ;
@@ -1642 +1645 @@
      * side of it and the code will get very upset about it all.
      */
-    rc = CFGMR3QueryU32(pCfg, "SendBufferSize", &OpenReq.cbSend);
+    rc = pHlp->pfnCFGMQueryU32(pCfg, "SendBufferSize", &OpenReq.cbSend);
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         OpenReq.cbSend = RT_ALIGN_Z(VBOX_MAX_GSO_SIZE * 3, _1K);
@@ -1658 +1661 @@
      * a service such as LWIP/iSCSI it shouldn't suspend immediately like for a NIC.
      */
-    rc = CFGMR3QueryBool(pCfg, "IsService", &pThis->fActivateEarlyDeactivateLate);
+    rc = pHlp->pfnCFGMQueryBool(pCfg, "IsService", &pThis->fActivateEarlyDeactivateLate);
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         pThis->fActivateEarlyDeactivateLate = false;
@@ -1670 +1673 @@
      * network. */
     bool fIgnoreConnectFailure;
-    rc = CFGMR3QueryBoolDef(pCfg, "IgnoreConnectFailure", &fIgnoreConnectFailure, false);
+    rc = pHlp->pfnCFGMQueryBoolDef(pCfg, "IgnoreConnectFailure", &fIgnoreConnectFailure, false);
     if (RT_FAILURE(rc))
         return PDMDRV_SET_ERROR(pDrvIns, rc,
@@ -1692 +1695 @@
     }
 #endif
-    rc = CFGMR3QueryBoolDef(pCfg, "Workaround1", &fWorkaround1, fWorkaround1);
+    rc = pHlp->pfnCFGMQueryBoolDef(pCfg, "Workaround1", &fWorkaround1, fWorkaround1);
     if (RT_FAILURE(rc))
         return PDMDRV_SET_ERROR(pDrvIns, rc,

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

@@ -78 +78 @@
 #define VBOX_NAT_DELAY_HACK
 
-#define GET_EXTRADATA(pthis, node, name, rc, type, type_name, var)                                  \
+#define GET_EXTRADATA(pdrvins, node, name, rc, type, type_name, var)                                  \
 do {                                                                                                \
-    (rc) = CFGMR3Query ## type((node), name, &(var));                                               \
+    (rc) = (pdrvins)->pHlpR3->pfnCFGMQuery ## type((node), name, &(var));                                               \
     if (RT_FAILURE((rc)) && (rc) != VERR_CFGM_VALUE_NOT_FOUND)                                      \
-        return PDMDrvHlpVMSetError((pthis)->pDrvIns, (rc), RT_SRC_POS, N_("NAT#%d: configuration query for \"" name "\" " #type_name " failed"), \
-                                   (pthis)->pDrvIns->iInstance);                                    \
+        return PDMDrvHlpVMSetError((pdrvins), (rc), RT_SRC_POS, N_("NAT#%d: configuration query for \"" name "\" " #type_name " failed"), \
+                                   (pdrvins)->iInstance);                                    \
 } while (0)
 
-#define GET_ED_STRICT(pthis, node, name, rc, type, type_name, var)                                  \
+#define GET_ED_STRICT(pdrvins, node, name, rc, type, type_name, var)                                  \
 do {                                                                                                \
-    (rc) = CFGMR3Query ## type((node), name, &(var));                                               \
+    (rc) = (pdrvins)->pHlpR3->pfnCFGMQuery ## type((node), name, &(var));                                               \
     if (RT_FAILURE((rc)))                                                                           \
-        return PDMDrvHlpVMSetError((pthis)->pDrvIns, (rc), RT_SRC_POS, N_("NAT#%d: configuration query for \"" name "\" " #type_name " failed"), \
-                                  (pthis)->pDrvIns->iInstance);                                     \
+        return PDMDrvHlpVMSetError((pdrvins), (rc), RT_SRC_POS, N_("NAT#%d: configuration query for \"" name "\" " #type_name " failed"), \
+                                  (pdrvins)->iInstance);                                     \
 } while (0)
 
-#define GET_EXTRADATA_N(pthis, node, name, rc, type, type_name, var, var_size)                      \
+#define GET_EXTRADATA_N(pdrvins, node, name, rc, type, type_name, var, var_size)                      \
 do {                                                                                                \
-    (rc) = CFGMR3Query ## type((node), name, &(var), var_size);                                     \
+    (rc) = (pdrvins)->pHlpR3->pfnCFGMQuery ## type((node), name, &(var), var_size);                                     \
     if (RT_FAILURE((rc)) && (rc) != VERR_CFGM_VALUE_NOT_FOUND)                                      \
-        return PDMDrvHlpVMSetError((pthis)->pDrvIns, (rc), RT_SRC_POS, N_("NAT#%d: configuration query for \"" name "\" " #type_name " failed"), \
-                                  (pthis)->pDrvIns->iInstance);                                     \
+        return PDMDrvHlpVMSetError((pdrvins), (rc), RT_SRC_POS, N_("NAT#%d: configuration query for \"" name "\" " #type_name " failed"), \
+                                  (pdrvins)->iInstance);                                     \
 } while (0)
 
-#define GET_BOOL(rc, pthis, node, name, var) \
-    GET_EXTRADATA(pthis, node, name, (rc), Bool, bolean, (var))
-#define GET_STRING(rc, pthis, node, name, var, var_size) \
-    GET_EXTRADATA_N(pthis, node, name, (rc), String, string, (var), (var_size))
-#define GET_STRING_ALLOC(rc, pthis, node, name, var) \
-    GET_EXTRADATA(pthis, node, name, (rc), StringAlloc, string, (var))
-#define GET_S32(rc, pthis, node, name, var) \
-    GET_EXTRADATA(pthis, node, name, (rc), S32, int, (var))
-#define GET_S32_STRICT(rc, pthis, node, name, var) \
-    GET_ED_STRICT(pthis, node, name, (rc), S32, int, (var))
+#define GET_BOOL(rc, pdrvins, node, name, var) \
+    GET_EXTRADATA(pdrvins, node, name, (rc), Bool, bolean, (var))
+#define GET_STRING(rc, pdrvins, node, name, var, var_size) \
+    GET_EXTRADATA_N(pdrvins, node, name, (rc), String, string, (var), (var_size))
+#define GET_STRING_ALLOC(rc, pdrvins, node, name, var) \
+    GET_EXTRADATA(pdrvins, node, name, (rc), StringAlloc, string, (var))
+#define GET_S32(rc, pdrvins, node, name, var) \
+    GET_EXTRADATA(pdrvins, node, name, (rc), S32, int, (var))
+#define GET_S32_STRICT(rc, pdrvins, node, name, var) \
+    GET_ED_STRICT(pdrvins, node, name, (rc), S32, int, (var))
 
 
@@ -1320 +1320 @@
 static int drvNATConstructDNSMappings(unsigned iInstance, PDRVNAT pThis, PCFGMNODE pMappingsCfg)
 {
+    PPDMDRVINS pDrvIns = pThis->pDrvIns;
+    PCPDMDRVHLPR3 pHlp = pDrvIns->pHlpR3;
+
     RT_NOREF(iInstance);
     int rc = VINF_SUCCESS;
     LogFlowFunc(("ENTER: iInstance:%d\n", iInstance));
-    for (PCFGMNODE pNode = CFGMR3GetFirstChild(pMappingsCfg); pNode; pNode = CFGMR3GetNextChild(pNode))
-    {
-        if (!CFGMR3AreValuesValid(pNode, "HostName\0HostNamePattern\0HostIP\0"))
+    for (PCFGMNODE pNode = pHlp->pfnCFGMGetFirstChild(pMappingsCfg); pNode; pNode = pHlp->pfnCFGMGetNextChild(pNode))
+    {
+        if (!pHlp->pfnCFGMAreValuesValid(pNode, "HostName\0HostNamePattern\0HostIP\0"))
             return PDMDRV_SET_ERROR(pThis->pDrvIns, VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES,
                                     N_("Unknown configuration in dns mapping"));
@@ -1331 +1334 @@
         bool fPattern = false;
         RT_ZERO(szHostNameOrPattern);
-        GET_STRING(rc, pThis, pNode, "HostName", szHostNameOrPattern[0], sizeof(szHostNameOrPattern));
+        GET_STRING(rc, pDrvIns, pNode, "HostName", szHostNameOrPattern[0], sizeof(szHostNameOrPattern));
         if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         {
-            GET_STRING(rc, pThis, pNode, "HostNamePattern", szHostNameOrPattern[0], sizeof(szHostNameOrPattern));
+            GET_STRING(rc, pDrvIns, pNode, "HostNamePattern", szHostNameOrPattern[0], sizeof(szHostNameOrPattern));
             if (rc == VERR_CFGM_VALUE_NOT_FOUND)
             {
                 char szNodeName[225];
                 RT_ZERO(szNodeName);
-                CFGMR3GetName(pNode, szNodeName, sizeof(szNodeName));
+                pHlp->pfnCFGMGetName(pNode, szNodeName, sizeof(szNodeName));
                 LogRel(("NAT: Neither 'HostName' nor 'HostNamePattern' is specified for mapping %s\n", szNodeName));
                 continue;
@@ -1347 +1350 @@
         struct in_addr HostIP;
         RT_ZERO(HostIP);
-        GETIP_DEF(rc, pThis, pNode, HostIP, INADDR_ANY);
+        GETIP_DEF(rc, pDrvIns, pNode, HostIP, INADDR_ANY);
         if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         {
@@ -1369 +1372 @@
 static int drvNATConstructRedir(unsigned iInstance, PDRVNAT pThis, PCFGMNODE pCfg, PRTNETADDRIPV4 pNetwork)
 {
+    PPDMDRVINS pDrvIns = pThis->pDrvIns;
+    PCPDMDRVHLPR3 pHlp = pDrvIns->pHlpR3;
+
     RT_NOREF(pNetwork); /** @todo figure why pNetwork isn't used */
 
@@ -1378 +1384 @@
      * Enumerate redirections.
      */
-    for (PCFGMNODE pNode = CFGMR3GetFirstChild(pPFTree); pNode; pNode = CFGMR3GetNextChild(pNode))
+    for (PCFGMNODE pNode = pHlp->pfnCFGMGetFirstChild(pPFTree); pNode; pNode = pHlp->pfnCFGMGetNextChild(pNode))
     {
         /*
          * Validate the port forwarding config.
          */
-        if (!CFGMR3AreValuesValid(pNode, "Name\0Protocol\0UDP\0HostPort\0GuestPort\0GuestIP\0BindIP\0"))
-            return PDMDRV_SET_ERROR(pThis->pDrvIns, VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES,
+        if (!pHlp->pfnCFGMAreValuesValid(pNode, "Name\0Protocol\0UDP\0HostPort\0GuestPort\0GuestIP\0BindIP\0"))
+            return PDMDRV_SET_ERROR(pDrvIns, VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES,
                                     N_("Unknown configuration in port forwarding"));
 
@@ -1391 +1397 @@
         char szProtocol[32];
         int rc;
-        GET_STRING(rc, pThis, pNode, "Protocol", szProtocol[0], sizeof(szProtocol));
+        GET_STRING(rc, pDrvIns, pNode, "Protocol", szProtocol[0], sizeof(szProtocol));
         if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         {
             fUDP = false;
-            GET_BOOL(rc, pThis, pNode, "UDP", fUDP);
+            GET_BOOL(rc, pDrvIns, pNode, "UDP", fUDP);
         }
         else if (RT_SUCCESS(rc))
@@ -1404 +1410 @@
                 fUDP = true;
             else
-                return PDMDrvHlpVMSetError(pThis->pDrvIns, VERR_INVALID_PARAMETER, RT_SRC_POS,
+                return PDMDrvHlpVMSetError(pDrvIns, VERR_INVALID_PARAMETER, RT_SRC_POS,
                     N_("NAT#%d: Invalid configuration value for \"Protocol\": \"%s\""),
                     iInstance, szProtocol);
         }
         else
-            return PDMDrvHlpVMSetError(pThis->pDrvIns, rc, RT_SRC_POS,
+            return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,
                                        N_("NAT#%d: configuration query for \"Protocol\" failed"),
                                        iInstance);
         /* host port */
         int32_t iHostPort;
-        GET_S32_STRICT(rc, pThis, pNode, "HostPort", iHostPort);
+        GET_S32_STRICT(rc, pDrvIns, pNode, "HostPort", iHostPort);
 
         /* guest port */
         int32_t iGuestPort;
-        GET_S32_STRICT(rc, pThis, pNode, "GuestPort", iGuestPort);
+        GET_S32_STRICT(rc, pDrvIns, pNode, "GuestPort", iGuestPort);
 
         /* host address ("BindIP" name is rather unfortunate given "HostPort" to go with it) */
         struct in_addr BindIP;
         RT_ZERO(BindIP);
-        GETIP_DEF(rc, pThis, pNode, BindIP, INADDR_ANY);
+        GETIP_DEF(rc, pDrvIns, pNode, BindIP, INADDR_ANY);
 
         /* guest address */
         struct in_addr GuestIP;
         RT_ZERO(GuestIP);
-        GETIP_DEF(rc, pThis, pNode, GuestIP, INADDR_ANY);
+        GETIP_DEF(rc, pDrvIns, pNode, GuestIP, INADDR_ANY);
 
         /*
@@ -1524 +1530 @@
     RT_NOREF(fFlags);
     PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
-    PDRVNAT pThis = PDMINS_2_DATA(pDrvIns, PDRVNAT);
+    PDRVNAT         pThis = PDMINS_2_DATA(pDrvIns, PDRVNAT);
+
     LogFlow(("drvNATConstruct:\n"));
 
@@ -1574 +1581 @@
      * Validate the config.
      */
-    if (!CFGMR3AreValuesValid(pCfg,
-                              "PassDomain\0TFTPPrefix\0BootFile\0Network"
-                              "\0NextServer\0DNSProxy\0BindIP\0UseHostResolver\0"
-                              "SlirpMTU\0AliasMode\0"
-                              "SockRcv\0SockSnd\0TcpRcv\0TcpSnd\0"
-                              "ICMPCacheLimit\0"
-                              "SoMaxConnection\0"
-#ifdef VBOX_WITH_DNSMAPPING_IN_HOSTRESOLVER
-                              "HostResolverMappings\0"
-#endif
-                            ))
-        return PDMDRV_SET_ERROR(pDrvIns, VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES,
-                                N_("Unknown NAT configuration option, only supports PassDomain,"
-                                " TFTPPrefix, BootFile and Network"));
+    PDMDRV_VALIDATE_CONFIG_RETURN(pDrvIns,
+                                  "PassDomain"
+                                  "|TFTPPrefix"
+                                  "|BootFile"
+                                  "|Network"
+                                  "|NextServer"
+                                  "|DNSProxy"
+                                  "|BindIP"
+                                  "|UseHostResolver"
+                                  "|SlirpMTU"
+                                  "|AliasMode"
+                                  "|SockRcv"
+                                  "|SockSnd"
+                                  "|TcpRcv"
+                                  "|TcpSnd"
+                                  "|ICMPCacheLimit"
+                                  "|SoMaxConnection"
+//#ifdef VBOX_WITH_DNSMAPPING_IN_HOSTRESOLVER
+                                  "|HostResolverMappings"
+//#endif
+                                  , "");
 
     /*
@@ -1594 +1608 @@
     int rc;
     bool fPassDomain = true;
-    GET_BOOL(rc, pThis, pCfg, "PassDomain", fPassDomain);
-
-    GET_STRING_ALLOC(rc, pThis, pCfg, "TFTPPrefix", pThis->pszTFTPPrefix);
-    GET_STRING_ALLOC(rc, pThis, pCfg, "BootFile", pThis->pszBootFile);
-    GET_STRING_ALLOC(rc, pThis, pCfg, "NextServer", pThis->pszNextServer);
+    GET_BOOL(rc, pDrvIns, pCfg, "PassDomain", fPassDomain);
+
+    GET_STRING_ALLOC(rc, pDrvIns, pCfg, "TFTPPrefix", pThis->pszTFTPPrefix);
+    GET_STRING_ALLOC(rc, pDrvIns, pCfg, "BootFile", pThis->pszBootFile);
+    GET_STRING_ALLOC(rc, pDrvIns, pCfg, "NextServer", pThis->pszNextServer);
 
     int fDNSProxy = 0;
-    GET_S32(rc, pThis, pCfg, "DNSProxy", fDNSProxy);
+    GET_S32(rc, pDrvIns, pCfg, "DNSProxy", fDNSProxy);
     int fUseHostResolver = 0;
-    GET_S32(rc, pThis, pCfg, "UseHostResolver", fUseHostResolver);
+    GET_S32(rc, pDrvIns, pCfg, "UseHostResolver", fUseHostResolver);
     int MTU = 1500;
-    GET_S32(rc, pThis, pCfg, "SlirpMTU", MTU);
+    GET_S32(rc, pDrvIns, pCfg, "SlirpMTU", MTU);
     int i32AliasMode = 0;
     int i32MainAliasMode = 0;
-    GET_S32(rc, pThis, pCfg, "AliasMode", i32MainAliasMode);
+    GET_S32(rc, pDrvIns, pCfg, "AliasMode", i32MainAliasMode);
     int iIcmpCacheLimit = 100;
-    GET_S32(rc, pThis, pCfg, "ICMPCacheLimit", iIcmpCacheLimit);
+    GET_S32(rc, pDrvIns, pCfg, "ICMPCacheLimit", iIcmpCacheLimit);
 
     i32AliasMode |= (i32MainAliasMode & 0x1 ? 0x1 : 0);
@@ -1616 +1630 @@
     i32AliasMode |= (i32MainAliasMode & 0x4 ? 0x4 : 0);
     int i32SoMaxConn = 10;
-    GET_S32(rc, pThis, pCfg, "SoMaxConnection", i32SoMaxConn);
+    GET_S32(rc, pDrvIns, pCfg, "SoMaxConnection", i32SoMaxConn);
     /*
      * Query the network port interface.
@@ -1633 +1647 @@
     /* Generate a network address for this network card. */
     char szNetwork[32]; /* xxx.xxx.xxx.xxx/yy */
-    GET_STRING(rc, pThis, pCfg, "Network", szNetwork[0], sizeof(szNetwork));
+    GET_STRING(rc, pDrvIns, pCfg, "Network", szNetwork[0], sizeof(szNetwork));
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, N_("NAT%d: Configuration error: missing network"),
@@ -1662 +1676 @@
 
         char *pszBindIP = NULL;
-        GET_STRING_ALLOC(rc, pThis, pCfg, "BindIP", pszBindIP);
+        GET_STRING_ALLOC(rc, pDrvIns, pCfg, "BindIP", pszBindIP);
         slirp_set_binding_address(pThis->pNATState, pszBindIP);
         if (pszBindIP != NULL)

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

@@ -415 +415 @@
 static DECLCALLBACK(int) drvR3NetShaperConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
 {
+    PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
     PDRVNETSHAPER pThis = PDMINS_2_DATA(pDrvIns, PDRVNETSHAPER);
+    PCPDMDRVHLPR3 pHlp  = pDrvIns->pHlpR3;
+
     LogFlow(("drvNetShaperConstruct:\n"));
-    PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
 
     /*
@@ -460 +462 @@
      * Validate the config.
      */
-    if (!CFGMR3AreValuesValid(pCfg, "BwGroup\0"))
-        return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
+    PDMDRV_VALIDATE_CONFIG_RETURN(pDrvIns, "BwGroup", "");
 
     /*
      * Find the bandwidth group we have to attach to.
      */
-    rc = CFGMR3QueryStringAlloc(pCfg, "BwGroup", &pThis->pszBwGroup);
+    rc = pHlp->pfnCFGMQueryStringAlloc(pCfg, "BwGroup", &pThis->pszBwGroup);
     if (RT_FAILURE(rc) && rc != VERR_CFGM_VALUE_NOT_FOUND)
     {

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

@@ -374 +374 @@
 static DECLCALLBACK(int) drvNetSnifferConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
 {
-    PDRVNETSNIFFER pThis = PDMINS_2_DATA(pDrvIns, PDRVNETSNIFFER);
+    PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
+    PDRVNETSNIFFER  pThis = PDMINS_2_DATA(pDrvIns, PDRVNETSNIFFER);
+    PCPDMDRVHLPR3   pHlp  = pDrvIns->pHlpR3;
+
     LogFlow(("drvNetSnifferConstruct:\n"));
-    PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
 
     /*
@@ -415 +417 @@
      * Validate the config.
      */
-    if (!CFGMR3AreValuesValid(pCfg, "File\0"))
-        return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
-
-    if (CFGMR3GetFirstChild(pCfg))
+    PDMDRV_VALIDATE_CONFIG_RETURN(pDrvIns, "File", "");
+
+    if (pHlp->pfnCFGMGetFirstChild(pCfg))
         LogRel(("NetSniffer: Found child config entries -- are you trying to redirect ports?\n"));
 
@@ -424 +425 @@
      * Get the filename.
      */
-    rc = CFGMR3QueryString(pCfg, "File", pThis->szFilename, sizeof(pThis->szFilename));
+    rc = pHlp->pfnCFGMQueryString(pCfg, "File", pThis->szFilename, sizeof(pThis->szFilename));
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
     {

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

@@ -854 +854 @@
     RT_NOREF(fFlags);
     PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
-    PDRVTAP pThis = PDMINS_2_DATA(pDrvIns, PDRVTAP);
+    PDRVTAP         pThis = PDMINS_2_DATA(pDrvIns, PDRVTAP);
+    PCPDMDRVHLPR3   pHlp  = pDrvIns->pHlpR3;
 
     /*
@@ -897 +898 @@
      * Validate the config.
      */
-    if (!CFGMR3AreValuesValid(pCfg, "Device\0InitProg\0TermProg\0FileHandle\0TAPSetupApplication\0TAPTerminateApplication\0MAC"))
-        return PDMDRV_SET_ERROR(pDrvIns, VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES, "");
+    PDMDRV_VALIDATE_CONFIG_RETURN(pDrvIns, "Device"
+                                           "|FileHandle"
+                                           "|TAPSetupApplication"
+                                           "|TAPTerminateApplication"
+                                           "|MAC",
+                                           "");
 
     /*
@@ -920 +925 @@
     int rc;
 #if defined(RT_OS_SOLARIS)   /** @todo Other platforms' TAP code should be moved here from ConsoleImpl. */
-    rc = CFGMR3QueryStringAlloc(pCfg, "TAPSetupApplication", &pThis->pszSetupApplication);
+    rc = pHlp->pfnCFGMQueryStringAlloc(pCfg, "TAPSetupApplication", &pThis->pszSetupApplication);
     if (RT_SUCCESS(rc))
     {
@@ -930 +935 @@
         return PDMDRV_SET_ERROR(pDrvIns, rc, N_("Configuration error: failed to query \"TAPTerminateApplication\""));
 
-    rc = CFGMR3QueryStringAlloc(pCfg, "TAPTerminateApplication", &pThis->pszTerminateApplication);
+    rc = pHlp->pfnCFGMQueryStringAlloc(pCfg, "TAPTerminateApplication", &pThis->pszTerminateApplication);
     if (RT_SUCCESS(rc))
     {
@@ -940 +945 @@
         return PDMDRV_SET_ERROR(pDrvIns, rc, N_("Configuration error: failed to query \"TAPTerminateApplication\""));
 
-    rc = CFGMR3QueryStringAlloc(pCfg, "Device", &pThis->pszDeviceName);
+    rc = pHlp->pfnCFGMQueryStringAlloc(pCfg, "Device", &pThis->pszDeviceName);
     if (RT_FAILURE(rc))
         pThis->fStatic = false;
@@ -963 +968 @@
 
     uint64_t u64File;
-    rc = CFGMR3QueryU64(pCfg, "FileHandle", &u64File);
+    rc = pHlp->pfnCFGMQueryU64(pCfg, "FileHandle", &u64File);
     if (RT_FAILURE(rc))
         return PDMDRV_SET_ERROR(pDrvIns, rc,

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

@@ -454 +454 @@
     PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
     PDRVUDPTUNNEL pThis = PDMINS_2_DATA(pDrvIns, PDRVUDPTUNNEL);
+    PCPDMDRVHLPR3 pHlp  = pDrvIns->pHlpR3;
 
     /*
@@ -488 +489 @@
      * Validate the config.
      */
-    if (!CFGMR3AreValuesValid(pCfg, "sport\0dest\0dport"))
-        return PDMDRV_SET_ERROR(pDrvIns, VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES, "");
+    PDMDRV_VALIDATE_CONFIG_RETURN(pDrvIns,  "sport"
+                                            "|dest"
+                                            "|dport",
+                                            "");
 
     /*
@@ -511 +514 @@
     int rc;
     char szVal[16];
-    rc = CFGMR3QueryStringDef(pCfg, "sport", szVal, sizeof(szVal), "4444");
+    rc = pHlp->pfnCFGMQueryStringDef(pCfg, "sport", szVal, sizeof(szVal), "4444");
     if (RT_FAILURE(rc))
         rc = PDMDRV_SET_ERROR(pDrvIns, rc,
@@ -522 +525 @@
         pThis->uSrcPort = 4444;
 
-    rc = CFGMR3QueryStringDef(pCfg, "dport", szVal, sizeof(szVal), "4445");
+    rc = pHlp->pfnCFGMQueryStringDef(pCfg, "dport", szVal, sizeof(szVal), "4445");
     if (RT_FAILURE(rc))
         rc = PDMDRV_SET_ERROR(pDrvIns, rc,
@@ -533 +536 @@
         pThis->uDestPort = 4445;
 
-    rc = CFGMR3QueryStringAllocDef(pCfg, "dest", &pThis->pszDestIP, "127.0.0.1");
+    rc = pHlp->pfnCFGMQueryStringAllocDef(pCfg, "dest", &pThis->pszDestIP, "127.0.0.1");
     if (RT_FAILURE(rc))
         rc = PDMDRV_SET_ERROR(pDrvIns, rc,

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

@@ -540 +540 @@
     RT_NOREF(fFlags);
     PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
-    PDRVVDE pThis = PDMINS_2_DATA(pDrvIns, PDRVVDE);
+    PDRVVDE         pThis = PDMINS_2_DATA(pDrvIns, PDRVVDE);
+    PCPDMDRVHLPR3   pHlp  = pDrvIns->pHlpR3;
 
     /*
@@ -576 +577 @@
      * Validate the config.
      */
-    if (!CFGMR3AreValuesValid(pCfg, "network"))
-        return PDMDRV_SET_ERROR(pDrvIns, VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES, "");
+    PDMDRV_VALIDATE_CONFIG_RETURN(pDrvIns, "network", "");
 
     /*
@@ -599 +599 @@
     int rc;
     char szNetwork[RTPATH_MAX];
-    rc = CFGMR3QueryString(pCfg, "network", szNetwork, sizeof(szNetwork));
+    rc = pHlp->pfnCFGMQueryString(pCfg, "network", szNetwork, sizeof(szNetwork));
     if (RT_FAILURE(rc))
         *szNetwork=0;