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

Timestamp:

Apr 27, 2010 6:36:48 AM (15 years ago)

Author:

vboxsync

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

60675

Message:

NAT: introduces management routines of NAT libalias core. (see xTracker/#4843 for details)

Location:

trunk/src/VBox/Devices/Network

Files:

• DrvNAT.cpp (modified) (3 diffs)
• slirp/ext.h (modified) (2 diffs)
• slirp/libslirp.h (modified) (1 diff)
• slirp/slirp.c (modified) (4 diffs)
• slirp/slirp_state.h (modified) (1 diff)

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

@@ -1081 +1081 @@
                               "PassDomain\0TFTPPrefix\0BootFile\0Network"
                               "\0NextServer\0DNSProxy\0BindIP\0UseHostResolver\0"
-                              "SlirpMTU\0"
+                              "SlirpMTU\0AliasMode\0"
                               "SockRcv\0SockSnd\0TcpRcv\0TcpSnd\0"))
         return PDMDRV_SET_ERROR(pDrvIns, VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES,
@@ -1131 +1131 @@
     GET_S32(rc, pThis, pCfg, "SlirpMTU", MTU);
 #endif
-
+    int i32AliasMode = 0;
+    int i32MainAliasMode = 0;
+    GET_S32(rc, pThis, pCfg, "AliasMode", i32MainAliasMode);
+
+    i32AliasMode |= (i32MainAliasMode & 0x1 ? 0x1 : 0);
+    i32AliasMode |= (i32MainAliasMode & 0x2 ? 0x40 : 0);
+    i32AliasMode |= (i32MainAliasMode & 0x4 ? 0x4 : 0);
     /*
      * Query the network port interface.
@@ -1166 +1172 @@
      */
     rc = slirp_init(&pThis->pNATState, RT_H2N_U32(Network), Netmask,
-                    fPassDomain, !!fUseHostResolver, pThis);
+                    fPassDomain, !!fUseHostResolver, i32AliasMode, pThis);
     if (RT_SUCCESS(rc))
     {

trunk/src/VBox/Devices/Network/slirp/ext.h

@@ -62 +62 @@
 static void vbox_slirp_printV(char *format, va_list args)
 {
-# ifdef LOG_ENABLED
     char buffer[1024];
     memset(buffer, 0, 1024);
     RTStrPrintfV(buffer, 1024, format, args);
 
-    Log2(("NAT:EXT: %s\n", buffer));
-# endif
+    LogRel(("NAT:EXT: %s\n", buffer));
 }
 #endif
@@ -75 +73 @@
 static void vbox_slirp_printf(char *format, ...)
 {
-# ifdef LOG_ENABLED
     va_list args;
     va_start(args, format);
     vbox_slirp_printV(format, args);
     va_end(args);
-# endif
 }
 #endif

trunk/src/VBox/Devices/Network/slirp/libslirp.h

@@ -50 +50 @@
 #endif
 
-int slirp_init(PNATState *, uint32_t, uint32_t, bool, bool, void *);
+int slirp_init(PNATState *, uint32_t, uint32_t, bool, bool, int, void *);
 void slirp_register_statistics(PNATState pData, PPDMDRVINS pDrvIns);
 void slirp_deregister_statistics(PNATState pData, PPDMDRVINS pDrvIns);

trunk/src/VBox/Devices/Network/slirp/slirp.c

@@ -571 +571 @@
 
 int slirp_init(PNATState *ppData, uint32_t u32NetAddr, uint32_t u32Netmask,
-               bool fPassDomain, bool fUseHostResolver, void *pvUser)
+               bool fPassDomain, bool fUseHostResolver, int i32AliasMode, void *pvUser)
 {
     int fNATfailed = 0;
@@ -641 +641 @@
         dnsproxy_init(pData);
     }
-
+    if (i32AliasMode & ~(PKT_ALIAS_LOG|PKT_ALIAS_SAME_PORTS|PKT_ALIAS_PROXY_ONLY))
+    {
+        LogRel(("NAT: alias mode %x is ignored\n", i32AliasMode));
+        i32AliasMode = 0;
+    }
+    pData->i32AliasMode = i32AliasMode;
     getouraddr(pData);
     {
@@ -656 +661 @@
         flags |= PKT_ALIAS_PUNCH_FW;
 #endif
-        flags |= PKT_ALIAS_PROXY_ONLY; /* do transparent proxying */
-        flags |= PKT_ALIAS_LOG; /* set logging */
+        flags |= pData->i32AliasMode; /* do transparent proxying */
         flags = LibAliasSetMode(pData->proxy_alias, flags, ~0);
         proxy_addr.s_addr = RT_H2N_U32(RT_N2H_U32(pData->special_addr.s_addr) | CTL_ALIAS);
@@ -1781 +1785 @@
         lib = LibAliasInit(pData, NULL);
         flags = LibAliasSetMode(lib, 0, 0);
-        flags |= PKT_ALIAS_LOG; /* set logging */
-        flags |= PKT_ALIAS_PROXY_ONLY; /* do transparent proxying */
-        flags |= PKT_ALIAS_REVERSE; /* set logging */
+        flags |= pData->i32AliasMode; 
+        flags |= PKT_ALIAS_REVERSE; /* set reverse  */
         flags = LibAliasSetMode(lib, flags, ~0);
 

trunk/src/VBox/Devices/Network/slirp/slirp_state.h

@@ -313 +313 @@
 
     LIST_HEAD(RT_NOTHING, libalias) instancehead;
+    int    i32AliasMode;
     struct libalias *proxy_alias;
     struct libalias *dns_alias;