Changeset 33827 in vbox

Timestamp:

Nov 8, 2010 10:46:45 AM (14 years ago)

Author:

vboxsync

Message:

Main,xml: win build fix.

Location:

trunk

Files:

• include/VBox/settings.h (modified) (2 diffs)
• src/VBox/Main/NATEngineImpl.cpp (modified) (3 diffs)
• src/VBox/Main/xml/Settings.cpp (modified) (2 diffs)

trunk/include/VBox/settings.h

@@ -358 +358 @@
  struct NATRule
  {
-     NATRule(): u32Proto(0),
+     NATRule(): proto(NATProtocol_TCP),
              u16HostPort(0),
              u16GuestPort(0){}
      com::Utf8Str            strName;
-     uint32_t                u32Proto;
+     NATProtocol_T           proto;
      uint16_t                u16HostPort;
      com::Utf8Str            strHostIP;
@@ -370 +370 @@
     {
         return    strName == r.strName
-               && u32Proto == r.u32Proto
+               && proto == r.proto
                && u16HostPort == r.u16HostPort
                && strHostIP == r.strHostIP

trunk/src/VBox/Main/NATEngineImpl.cpp

@@ -246 +246 @@
         BstrFmt bstr("%s,%d,%s,%d,%s,%d",
                      r.strName.c_str(),
-                     r.u32Proto,
+                     r.proto,
                      r.strHostIP.c_str(),
                      r.u16HostPort,
@@ -283 +283 @@
         name = Utf8StrFmt("%s_%d_%d", proto, aHostPort, aGuestPort);
     r.strName = name.c_str();
-    r.u32Proto = aProto;
+    r.proto = aProto;
     r.strHostIP = aBindIp;
     r.u16HostPort = aHostPort;
@@ -310 +310 @@
     Utf8Str strHostIP = r.strHostIP;
     Utf8Str strGuestIP = r.strGuestIP;
-    NATProtocol_T proto = r.u32Proto;
+    NATProtocol_T proto = r.proto;
     uint16_t u16HostPort = r.u16HostPort;
     uint16_t u16GuestPort = r.u16GuestPort;

trunk/src/VBox/Main/xml/Settings.cpp

@@ -2036 +2036 @@
             uint32_t port = 0;
             (*pf)->getAttributeValue("name", rule.strName);
-            (*pf)->getAttributeValue("proto", rule.u32Proto);
+            (*pf)->getAttributeValue("proto", rule.proto);
             (*pf)->getAttributeValue("hostip", rule.strHostIP);
             (*pf)->getAttributeValue("hostport", port);
@@ -3886 +3886 @@
                 if ((*rule).strName.length())
                     pelmPF->setAttribute("name", (*rule).strName);
-                pelmPF->setAttribute("proto", (*rule).u32Proto);
+                pelmPF->setAttribute("proto", (*rule).proto);
                 if ((*rule).strHostIP.length())
                     pelmPF->setAttribute("hostip", (*rule).strHostIP);