Changeset 49198 in vbox for trunk/src/VBox/NetworkServices/NAT

Timestamp:

Oct 20, 2013 11:13:50 PM (12 years ago)

Author:

vboxsync

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

90081

Message:

Rename VBoxNetLwipNAT::net to m_net

File:

• trunk/src/VBox/NetworkServices/NAT/VBoxNetLwipNAT.cpp (modified) (7 diffs)

trunk/src/VBox/NetworkServices/NAT/VBoxNetLwipNAT.cpp

@@ -185 +185 @@
 
     /* Our NAT network descriptor in Main */
-    ComPtr<INATNetwork> net;
+    ComPtr<INATNetwork> m_net;
     ComPtr<NATNetworkListenerImpl> m_listener;
     STDMETHOD(HandleEvent)(VBoxEventType_T aEventType, IEvent *pEvent);
@@ -877 +877 @@
     HRESULT hrc;
     hrc = virtualbox->FindNATNetworkByName(com::Bstr(m_Network.c_str()).raw(),
-                                                  net.asOutParam());
+                                                  m_net.asOutParam());
     AssertComRCReturn(hrc, VERR_NOT_FOUND);
 
     BOOL fIPv6Enabled = FALSE;
-    hrc = net->COMGETTER(IPv6Enabled)(&fIPv6Enabled);
+    hrc = m_net->COMGETTER(IPv6Enabled)(&fIPv6Enabled);
     AssertComRCReturn(hrc, VERR_NOT_FOUND);
 
@@ -887 +887 @@
     if (fIPv6Enabled)
     {
-        hrc = net->COMGETTER(AdvertiseDefaultIPv6RouteEnabled)(&fIPv6DefaultRoute);
+        hrc = m_net->COMGETTER(AdvertiseDefaultIPv6RouteEnabled)(&fIPv6DefaultRoute);
         AssertComRCReturn(hrc, VERR_NOT_FOUND);
     }
@@ -894 +894 @@
     m_ProxyOptions.ipv6_defroute = fIPv6DefaultRoute;
 
-    /* XXX: Temporaly disabled this code on Windows for further debugging */
     ComPtr<IEventSource> pES;
-
-    hrc = net->COMGETTER(EventSource)(pES.asOutParam());
+    hrc = m_net->COMGETTER(EventSource)(pES.asOutParam());
     AssertComRC(hrc);
 
@@ -938 +936 @@
         /* XXX: extract function and do not duplicate */
         com::SafeArray<BSTR> rules;
-        hrc = net->COMGETTER(PortForwardRules4)(ComSafeArrayAsOutParam(rules));
+        hrc = m_net->COMGETTER(PortForwardRules4)(ComSafeArrayAsOutParam(rules));
         Assert(SUCCEEDED(hrc));
 
@@ -953 +951 @@
 
         rules.setNull();
-        hrc = net->COMGETTER(PortForwardRules6)(ComSafeArrayAsOutParam(rules));
+        hrc = m_net->COMGETTER(PortForwardRules6)(ComSafeArrayAsOutParam(rules));
         Assert(SUCCEEDED(hrc));
 
@@ -967 +965 @@
     com::SafeArray<BSTR> strs;
     int count_strs;
-    hrc = net->COMGETTER(LocalMappings)(ComSafeArrayAsOutParam(strs));
+    hrc = m_net->COMGETTER(LocalMappings)(ComSafeArrayAsOutParam(strs));
     if (   SUCCEEDED(hrc)
            && (count_strs = strs.size()))