Changeset 17275 in vbox for trunk/src/VBox/Main/win

Timestamp:

Mar 3, 2009 1:28:12 PM (16 years ago)

Author:

vboxsync

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

43635

Message:

networking API renaming

Location:

trunk/src/VBox/Main/win

Files:

• NetIfList-win.cpp (modified) (7 diffs)
• svchlp.cpp (modified) (1 diff)
• svchlp.h (modified) (1 diff)

trunk/src/VBox/Main/win/NetIfList-win.cpp

@@ -361 +361 @@
 }
 
+static HRESULT VBoxNetCfgWinEnableDHCP(IWbemServices * pSvc, IWbemClassObject *pObj,  in_addr* aIp,  in_addr * aMask, UINT cIp)
+{
+    IWbemClassObject * pClass;
+    BSTR ClassName = SysAllocString(L"Win32_NetworkAdapterConfiguration");
+    HRESULT hr;
+    if(ClassName)
+    {
+        hr = pSvc->GetObject(ClassName, 0, NULL, &pClass, NULL);
+        if(SUCCEEDED(hr))
+        {
+            BSTR ObjPath;
+            hr = netIfAdapterConfigPath(pObj, &ObjPath);
+            if(SUCCEEDED(hr))
+            {
+                IWbemClassObject * pOutParams;
+
+                hr = netIfExecMethod(pSvc, pClass, ObjPath,
+                                bstr_t(L"EnableDHCP"), NULL, NULL, 0, &pOutParams);
+                if(SUCCEEDED(hr))
+                {
+                }
+                SysFreeString(ObjPath);
+            }
+            pClass->Release();
+        }
+        SysFreeString(ClassName);
+    }
+    else
+    {
+        DWORD dwError = GetLastError();
+        Assert(0);
+        hr = HRESULT_FROM_WIN32( dwError );
+    }
+
+    return hr;
+}
 
 static int collectNetIfInfo(Bstr &strName, PNETIFINFO pInfo)
@@ -448 +484 @@
                     else
                         memcpy(pInfo->MACAddress.au8, pAdapter->PhysicalAddress, sizeof(pInfo->MACAddress));
-                    pInfo->enmType = NETIF_T_ETHERNET;
+                    pInfo->enmMediumType = NETIF_T_ETHERNET;
                     pInfo->enmStatus = pAdapter->OperStatus == IfOperStatusUp ? NETIF_S_UP : NETIF_S_DOWN;
                     RTStrFree(pszUuid);
@@ -464 +500 @@
 # define VBOX_APP_NAME L"VirtualBox"
 
-static int vboxNetWinAddComponent(std::list <ComObjPtr <HostNetworkInterface> > * pPist, INetCfgComponent * pncc, bool bReal)
+static int vboxNetWinAddComponent(std::list <ComObjPtr <HostNetworkInterface> > * pPist, INetCfgComponent * pncc, HostNetworkInterfaceType enmType)
 {
     LPWSTR              lpszName;
@@ -496 +532 @@
             iface.createObject();
             /* remove the curly bracket at the end */
-            if (SUCCEEDED (iface->init (name, bReal, &Info)))
+            if (SUCCEEDED (iface->init (name, enmType, &Info)))
             {
                 pPist->push_back (iface);
@@ -624 +660 @@
                             if(!_wcsnicmp(pId, L"sun_VBoxNetAdp", sizeof(L"sun_VBoxNetAdp")/2))
                             {
-                                vboxNetWinAddComponent(&list, pMpNcc, false);
+                                vboxNetWinAddComponent(&list, pMpNcc, HostNetworkInterfaceType_HostOnly);
                             }
                             CoTaskMemFree(pId);
@@ -765 +801 @@
                     }
 
-                    if (SUCCEEDED (iface->init (name, TRUE, &Info)))
+                    if (SUCCEEDED (iface->init (name, HostNetworkInterfaceType_Bridged, &Info)))
                         list.push_back (iface);
                 }
@@ -841 +877 @@
                                         if(uComponentStatus == 0)
                                         {
-                                            vboxNetWinAddComponent(&list, pMpNcc, true);
+                                            vboxNetWinAddComponent(&list, pMpNcc, HostNetworkInterfaceType_Bridged);
                                         }
                                     }

trunk/src/VBox/Main/win/svchlp.cpp

@@ -272 +272 @@
         switch (msgCode)
         {
-            case SVCHlpMsg::CreateHostNetworkInterface:
-            case SVCHlpMsg::RemoveHostNetworkInterface:
+            case SVCHlpMsg::CreateHostOnlyNetworkInterface:
+            case SVCHlpMsg::RemoveHostOnlyNetworkInterface:
             {
                 vrc = Host::networkInterfaceHelperServer (this, msgCode);

trunk/src/VBox/Main/win/svchlp.h

@@ -38 +38 @@
         Error, /* Utf8Str string (may be null but must present) */
 
-        CreateHostNetworkInterface = 100, /* see usage in code */
-        CreateHostNetworkInterface_OK, /* see usage in code */
-        RemoveHostNetworkInterface, /* see usage in code */
+        CreateHostOnlyNetworkInterface = 100, /* see usage in code */
+        CreateHostOnlyNetworkInterface_OK, /* see usage in code */
+        RemoveHostOnlyNetworkInterface, /* see usage in code */
     };
 };