Changeset 28864 in vbox

Timestamp:

Apr 28, 2010 12:59:54 PM (15 years ago)

Author:

vboxsync

Message:

Main/Nat: fixed uninitialized variable

Location:

trunk/src/VBox/Main

Files:

• NATEngineImpl.cpp (modified) (1 diff)
• include/NATEngineImpl.h (modified) (2 diffs)

trunk/src/VBox/Main/NATEngineImpl.cpp

@@ -328 +328 @@
     mData->mDnsUseHostResolver = data.fDnsUseHostResolver;
     /* Alias */
-    mData->mAliasMode |= (data.fAliasLog ? NATAliasMode_AliasLog : 0);
-    mData->mAliasMode |= (data.fAliasProxyOnly ? NATAliasMode_AliasProxyOnly : 0);
-    mData->mAliasMode = (data.fAliasUseSamePorts ? NATAliasMode_AliasUseSamePorts : 0);
+    mData->mAliasMode  = (data.fAliasUseSamePorts ? NATAliasMode_AliasUseSamePorts : 0);
+    mData->mAliasMode |= (data.fAliasLog          ? NATAliasMode_AliasLog          : 0);
+    mData->mAliasMode |= (data.fAliasProxyOnly    ? NATAliasMode_AliasProxyOnly    : 0);
     /* port forwarding */
     mNATRules.clear();

trunk/src/VBox/Main/include/NATEngineImpl.h

@@ -40 +40 @@
     struct Data
     {
-        Data(): mMtu(0),
-               mSockRcv(0),
-               mSockSnd(0),
-               mTcpRcv(0),
-               mTcpSnd(0),
-               mDnsPassDomain(TRUE),
-               mDnsProxy(FALSE),
-               mDnsUseHostResolver(FALSE) {}
+        Data() : mMtu(0),
+                 mSockRcv(0),
+                 mSockSnd(0),
+                 mTcpRcv(0),
+                 mTcpSnd(0),
+                 mDnsPassDomain(TRUE),
+                 mDnsProxy(FALSE),
+                 mDnsUseHostResolver(FALSE),
+                 mAliasMode(0)
+        {}
 
         com::Utf8Str mNetwork;
@@ -65 +67 @@
         BOOL     mDnsUseHostResolver;
         /* Alias service */
-        ULONG     mAliasMode;
+        ULONG    mAliasMode;
     };
     VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT (NATEngine)