Changeset 38746 in vbox

Timestamp:

Sep 13, 2011 4:45:45 PM (13 years ago)

Author:

vboxsync

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

74017

Message:

Settings: fix initialization with default values of some of the setting types (Medium, DHCPServer, ...)

File:

• trunk/include/VBox/settings.h (modified) (6 diffs)

trunk/include/VBox/settings.h

@@ -115 +115 @@
 struct Medium
 {
+    Medium()
+        : fAutoReset(false),
+          hdType(MediumType_Normal)
+    {}
+
     com::Guid       uuid;
     com::Utf8Str    strLocation;
@@ -238 +243 @@
 struct DHCPServer
 {
+    DHCPServer()
+        : fEnabled(false)
+    {}
+
     com::Utf8Str    strNetworkName,
                     strIPAddress,
@@ -350 +359 @@
  struct NATRule
  {
-     NATRule(): proto(NATProtocol_TCP),
-             u16HostPort(0),
-             u16GuestPort(0){}
+     NATRule()
+         : proto(NATProtocol_TCP),
+           u16HostPort(0),
+           u16GuestPort(0)
+     {}
+
+     bool operator==(const NATRule &r) const
+     {
+         return strName == r.strName
+             && proto == r.proto
+             && u16HostPort == r.u16HostPort
+             && strHostIP == r.strHostIP
+             && u16GuestPort == r.u16GuestPort
+             && strGuestIP == r.strGuestIP;
+     }
+
      com::Utf8Str            strName;
      NATProtocol_T           proto;
@@ -359 +381 @@
      uint16_t                u16GuestPort;
      com::Utf8Str            strGuestIP;
-    bool operator==(const NATRule &r) const
-    {
-        return    strName == r.strName
-               && proto == r.proto
-               && u16HostPort == r.u16HostPort
-               && strHostIP == r.strHostIP
-               && u16GuestPort == r.u16GuestPort
-               && strGuestIP == r.strGuestIP;
-    }
  };
  typedef std::list<NATRule> NATRuleList;
@@ -373 +386 @@
  struct NAT
  {
-     NAT() : u32Mtu(0),
-             u32SockRcv(0),
-             u32SockSnd(0),
-             u32TcpRcv(0),
-             u32TcpSnd(0),
-             fDnsPassDomain(true), /* historically this value is true */
-             fDnsProxy(false),
-             fDnsUseHostResolver(false),
-             fAliasLog(false),
-             fAliasProxyOnly(false),
-             fAliasUseSamePorts(false)
-    {}
-
-     com::Utf8Str            strNetwork;
-     com::Utf8Str            strBindIP;
-     uint32_t                u32Mtu;
-     uint32_t                u32SockRcv;
-     uint32_t                u32SockSnd;
-     uint32_t                u32TcpRcv;
-     uint32_t                u32TcpSnd;
-     com::Utf8Str            strTftpPrefix;
-     com::Utf8Str            strTftpBootFile;
-     com::Utf8Str            strTftpNextServer;
-     bool                    fDnsPassDomain;
-     bool                    fDnsProxy;
-     bool                    fDnsUseHostResolver;
-     bool                    fAliasLog;
-     bool                    fAliasProxyOnly;
-     bool                    fAliasUseSamePorts;
-     NATRuleList             llRules;
+     NAT()
+         : u32Mtu(0),
+           u32SockRcv(0),
+           u32SockSnd(0),
+           u32TcpRcv(0),
+           u32TcpSnd(0),
+           fDnsPassDomain(true), /* historically this value is true */
+           fDnsProxy(false),
+           fDnsUseHostResolver(false),
+           fAliasLog(false),
+           fAliasProxyOnly(false),
+           fAliasUseSamePorts(false)
+     {}
+
      bool operator==(const NAT &n) const
      {
@@ -423 +420 @@
              && llRules             == n.llRules;
      }
+
+     com::Utf8Str            strNetwork;
+     com::Utf8Str            strBindIP;
+     uint32_t                u32Mtu;
+     uint32_t                u32SockRcv;
+     uint32_t                u32SockSnd;
+     uint32_t                u32TcpRcv;
+     uint32_t                u32TcpSnd;
+     com::Utf8Str            strTftpPrefix;
+     com::Utf8Str            strTftpBootFile;
+     com::Utf8Str            strTftpNextServer;
+     bool                    fDnsPassDomain;
+     bool                    fDnsProxy;
+     bool                    fDnsUseHostResolver;
+     bool                    fAliasLog;
+     bool                    fAliasProxyOnly;
+     bool                    fAliasUseSamePorts;
+     NATRuleList             llRules;
  };
 /**