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

Timestamp:

Feb 25, 2013 6:30:42 PM (12 years ago)

Author:

vboxsync

Message:

Network-service for lwip-driven proxy.
additionally enables SrvNat trunk type for Nat services.
Note: all changes disabled by default.

File:

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

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

@@ -4997 +4997 @@
         case kIntNetTrunkType_None:
         case kIntNetTrunkType_WhateverNone:
+#ifdef VBOX_WITH_NAT_SERVICE
+            /* 
+             * Well, here we don't want load anything special,
+             * just communicate between processes via internal network. 
+             */
+        case kIntNetTrunkType_SrvNat:
+#endif
             return VINF_SUCCESS;
 
@@ -5016 +5023 @@
 #endif /* VBOXNETADP_DO_NOT_USE_NETFLT */
             break;
-        case kIntNetTrunkType_SrvNat:
-            pszName = "VBoxSrvNat";
+#ifndef VBOX_WITH_NAT_SERVICE   
+        case kIntNetTrunkType_SrvNat:
+            pszName = "VBoxSrvNat";
             break;
+#endif
     }
 
@@ -5477 +5486 @@
              */
             int rc;
-            if (    enmTrunkType == kIntNetTrunkType_WhateverNone
-                ||  (   pCur->enmTrunkType == enmTrunkType
-                     && !strcmp(pCur->szTrunk, pszTrunk)))
+            if (   enmTrunkType == kIntNetTrunkType_WhateverNone
+#ifdef VBOX_WITH_NAT_SERVICE
+                || enmTrunkType == kIntNetTrunkType_SrvNat /* @todo: what does it mean */
+#endif
+                || (   pCur->enmTrunkType == enmTrunkType
+                    && !strcmp(pCur->szTrunk, pszTrunk)))
             {
                 rc = intnetR0CheckOpenNetworkFlags(pCur, fFlags);
@@ -5575 +5587 @@
                        | INTNET_OPEN_FLAGS_TRUNK_WIRE_CHASTE_MODE;
     if (   enmTrunkType == kIntNetTrunkType_WhateverNone
+#ifdef VBOX_WITH_NAT_SERVICE
+        || enmTrunkType == kIntNetTrunkType_SrvNat /* simialar security */
+#endif
         || enmTrunkType == kIntNetTrunkType_None)
         fDefFlags |= INTNET_OPEN_FLAGS_ACCESS_RESTRICTED;
@@ -5740 +5755 @@
         case kIntNetTrunkType_None:
         case kIntNetTrunkType_WhateverNone:
+#ifdef VBOX_WITH_NAT_SERVICE
+        case kIntNetTrunkType_SrvNat:
+#endif
             if (*pszTrunk)
                 return VERR_INVALID_PARAMETER;