Changeset 21018 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Jun 29, 2009 10:07:11 AM (16 years ago)

Author:

vboxsync

Message:

NAT: GETIP isn't local macro

File:

• trunk/src/VBox/Devices/Network/DrvNAT.cpp (modified) (5 diffs)

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

@@ -92 +92 @@
 #define GET_S32_STRICT(rc, node, drv_inst, name, var) \
     GET_ED_STRICT(node, drv_inst, name, (rc), S32, int, (var))
+
+
+
+#define DOGETIP(rc, node, instance, status, x)                                      \
+do {                                                                                \
+        char    sz##x[32];                                                          \
+        GET_STRING((rc), (node), (instance), #x, sz ## x[0],  sizeof(sz ## x));     \
+        if (rc != VERR_CFGM_VALUE_NOT_FOUND)                                        \
+            (status) = inet_aton(sz ## x, &x);                                      \
+}while(0)
+
+#define GETIP_DEF(rc, node, instance, x, def)           \
+do                                                      \
+{                                                       \
+    int status = 0;                                     \
+    DOGETIP((rc), (node), (instance),  status, x);      \
+    if (status == 0 || rc == VERR_CFGM_VALUE_NOT_FOUND) \
+        x.s_addr = def;                                 \
+}while(0)
 
 /*******************************************************************************
@@ -700 +719 @@
                     iInstance, szProtocol);
         }
-
-#define DOGETIP(rc, status, x)                                                      \
-do {                                                                                \
-        char    sz##x[32];                                                          \
-        GET_STRING(rc, pNode, iInstance, #x, sz ## x[0],  sizeof(sz ## x));         \
-        if (rc == VERR_CFGM_VALUE_NOT_FOUND)                                        \
-            RTStrPrintf(sz ## x, sizeof(sz ## x), "%d.%d.%d.%d",                    \
-                        (Network & 0xFF000000) >> 24, (Network & 0xFF0000) >> 16,   \
-                        (Network & 0xFF00) >> 8, (Network & 0xE0) | 15);            \
-        status = inet_aton(sz ## x, &x);                                            \
-}while(0)
-
-#define GETIP(x)                                                                        \
-do                                                                                      \
-{                                                                                       \
-    int status = 0;                                                                     \
-    DOGETIP(rc, status, x);                                                             \
-    if (status == 0)                                                                    \
-        return PDMDrvHlpVMSetError(pThis->pDrvIns, VERR_NAT_REDIR_GUEST_IP, RT_SRC_POS, \
-                                   N_("NAT#%d: configuration error: invalid \"" #x      \
-                                   "\" inet_aton failed"), iInstance);                  \
-}while(0)
-
-#define GETIP_DEF(x, def)                               \
-do                                                      \
-{                                                       \
-    int status = 0;                                     \
-    DOGETIP(rc, status, x);                             \
-    if (status == 0 || rc == VERR_CFGM_VALUE_NOT_FOUND) \
-        x.s_addr = def;                                 \
-}while(0)
         /* host port */
         int32_t iHostPort;
@@ -741 +729 @@
         /* guest address */
         struct in_addr GuestIP;
-        GETIP(GuestIP);
+        /* @todo (vvl) use CTL_* */
+        GETIP_DEF(rc, pNode, iInstance, GuestIP, htonl(ntohl(Network) | 15));
 
         /*
@@ -747 +736 @@
          */
         struct in_addr BindIP;
-        GETIP_DEF(BindIP, INADDR_ANY);
+        GETIP_DEF(rc, pNode, iInstance, BindIP, INADDR_ANY);
         if (slirp_redir(pThis->pNATState, fUDP, BindIP, iHostPort, GuestIP, iGuestPort) < 0)
             return PDMDrvHlpVMSetError(pThis->pDrvIns, VERR_NAT_REDIR_SETUP, RT_SRC_POS,
@@ -754 +743 @@
                                        "existing services or other rules"), iInstance, iHostPort, 
                                        iGuestPort);
-#undef GETIP    
     } /* for each redir rule */