Changeset 17835 in vbox for trunk/src

Timestamp:

Mar 13, 2009 3:18:59 PM (16 years ago)

Author:

vboxsync

Message:

NetIf/win: DhcpRediscover

Location:

trunk/src/VBox/Main

Files:

• HostNetworkInterfaceImpl.cpp (modified) (2 diffs)
• generic/NetIf-generic.cpp (modified) (1 diff)
• idl/VirtualBox.xidl (modified) (2 diffs)
• include/HostNetworkInterfaceImpl.h (modified) (1 diff)
• include/netif.h (modified) (1 diff)
• os2/NetIfList-os2.cpp (modified) (1 diff)
• win/NetIfList-win.cpp (modified) (5 diffs)
• win/svchlp.cpp (modified) (1 diff)
• win/svchlp.h (modified) (1 diff)

trunk/src/VBox/Main/HostNetworkInterfaceImpl.cpp

@@ -447 +447 @@
     if (RT_FAILURE(rc))
     {
-        LogRel(("Failed to EnableStaticIpConfigV6 with rc=%Vrc\n", rc));
+        LogRel(("Failed to EnableDynamicIpConfig with rc=%Vrc\n", rc));
         return rc == VERR_NOT_IMPLEMENTED ? E_NOTIMPL : E_FAIL;
     }
@@ -454 +454 @@
 }
 
+STDMETHODIMP HostNetworkInterface::DhcpRediscover ()
+{
+#ifndef VBOX_WITH_HOSTNETIF_API
+    return E_NOTIMPL;
+#else
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    int rc = NetIfDhcpRediscover(mVBox, this);
+    if (RT_FAILURE(rc))
+    {
+        LogRel(("Failed to DhcpRediscover with rc=%Vrc\n", rc));
+        return rc == VERR_NOT_IMPLEMENTED ? E_NOTIMPL : E_FAIL;
+    }
+    return S_OK;
+#endif
+}
+
 HRESULT HostNetworkInterface::setVirtualBox(VirtualBox *pVBox)
 {

trunk/src/VBox/Main/generic/NetIf-generic.cpp

@@ -118 +118 @@
     return VERR_NOT_IMPLEMENTED;
 }
+
+int NetIfDhcpRediscover(VirtualBox *pVbox, HostNetworkInterface * pIf)
+{
+    return VERR_NOT_IMPLEMENTED;
+}
+

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -6537 +6537 @@
   <interface
      name="IHostNetworkInterface" extends="$unknown"
-     uuid="09de36e8-2588-4050-a791-655240b556e0"
+     uuid="bcc99385-71ad-4887-90fc-15a3f2cad0a5"
      wsmap="managed"
      >
@@ -6624 +6624 @@
     <method name="enableDynamicIpConfig">
       <desc>enables the dynamic IP configuration.</desc>
+    </method>
+
+    <method name="dhcpRediscover">
+      <desc>refreshes the IP configuration for dhcp-enabled interface.</desc>
     </method>
 

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

@@ -84 +84 @@
     STDMETHOD(EnableStaticIpConfigV6) (IN_BSTR aIPV6Address, ULONG aIPV6MaskPrefixLength);
     STDMETHOD(EnableDynamicIpConfig) ();
+    STDMETHOD(DhcpRediscover) ();
 
     // for VirtualBoxSupportErrorInfoImpl

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

@@ -84 +84 @@
 int NetIfRemoveHostOnlyNetworkInterface (VirtualBox *pVbox, IN_GUID aId, IHostNetworkInterface **aHostNetworkInterface, IProgress **aProgress);
 int NetIfGetConfig(HostNetworkInterface * pIf, NETIFINFO *);
+int NetIfDhcpRediscover(VirtualBox *pVbox, HostNetworkInterface * pIf);
 
 DECLINLINE(Bstr) composeIPv6Address(PRTNETADDRIPV6 aAddrPtr)

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

@@ -53 +53 @@
 }
 
+
+int NetIfDhcpRediscover(VirtualBox *pVbox, HostNetworkInterface * pIf)
+{
+    return VERR_NOT_IMPLEMENTED;
+}

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

@@ -567 +567 @@
                         hr = HRESULT_FROM_WIN32( winEr );
                         break;
+                    }
+                }
+            }
+        }
+        SysFreeString(ClassName);
+    }
+    else
+    {
+        DWORD dwError = GetLastError();
+        Assert(0);
+        hr = HRESULT_FROM_WIN32( dwError );
+    }
+
+    return hr;
+}
+
+static HRESULT netIfWinDhcpRediscover(IWbemServices * pSvc, BSTR ObjPath)
+{
+    ComPtr<IWbemClassObject> pClass;
+    BSTR ClassName = SysAllocString(L"Win32_NetworkAdapterConfiguration");
+    HRESULT hr;
+    if(ClassName)
+    {
+        hr = pSvc->GetObject(ClassName, 0, NULL, pClass.asOutParam(), NULL);
+        if(SUCCEEDED(hr))
+        {
+            ComPtr<IWbemClassObject> pOutParams;
+
+            hr = netIfExecMethod(pSvc, pClass, ObjPath,
+                                bstr_t(L"ReleaseDHCPLease"), NULL, NULL, 0, pOutParams.asOutParam());
+            if(SUCCEEDED(hr))
+            {
+                VARIANT varReturnValue;
+                hr = pOutParams->Get(bstr_t(L"ReturnValue"), 0,
+                    &varReturnValue, NULL, 0);
+                Assert(SUCCEEDED(hr));
+                if(SUCCEEDED(hr))
+                {
+//                    Assert(varReturnValue.vt == VT_UINT);
+                    int winEr = varReturnValue.uintVal;
+                    if(winEr == 0)
+                    {
+                        hr = netIfExecMethod(pSvc, pClass, ObjPath,
+                                            bstr_t(L"RenewDHCPLease"), NULL, NULL, 0, pOutParams.asOutParam());
+                        if(SUCCEEDED(hr))
+                        {
+                            VARIANT varReturnValue;
+                            hr = pOutParams->Get(bstr_t(L"ReturnValue"), 0,
+                                &varReturnValue, NULL, 0);
+                            Assert(SUCCEEDED(hr));
+                            if(SUCCEEDED(hr))
+                            {
+            //                    Assert(varReturnValue.vt == VT_UINT);
+                                int winEr = varReturnValue.uintVal;
+                                if(winEr == 0)
+                                {
+                                    hr = S_OK;
+                                }
+                                else
+                                {
+                                    hr = HRESULT_FROM_WIN32( winEr );
+                                }
+                            }
+                        }
+                    }
+                    else
+                    {
+                        hr = HRESULT_FROM_WIN32( winEr );
                     }
                 }
@@ -832 +900 @@
 }
 
+static HRESULT netIfDhcpRediscover(const Guid &guid)
+{
+    HRESULT hr;
+        ComPtr <IWbemServices> pSvc;
+        hr = netIfWinCreateIWbemServices(pSvc.asOutParam());
+        if(SUCCEEDED(hr))
+        {
+            ComPtr <IWbemClassObject> pAdapterConfig;
+            hr = netIfWinFindAdapterClassById(pSvc, guid, pAdapterConfig.asOutParam());
+            if(SUCCEEDED(hr))
+            {
+                BSTR ObjPath;
+                hr = netIfWinAdapterConfigPath(pAdapterConfig, &ObjPath);
+                if(SUCCEEDED(hr))
+                {
+                    hr = netIfWinEnableDHCP(pSvc, ObjPath);
+                    if(SUCCEEDED(hr))
+                    {
+//                        hr = netIfWinUpdateConfig(pIf);
+                    }
+                    SysFreeString(ObjPath);
+                }
+            }
+        }
+
+
+    return hr;
+}
+
 /* svc helper func */
 
@@ -1131 +1228 @@
             if (RT_FAILURE (vrc)) break;
             vrc = aClient->write (d->u.StaticIPV6.IPV6NetMaskLength);
+            if (RT_FAILURE (vrc)) break;
+
+            /* wait for a reply */
+            bool endLoop = false;
+            while (!endLoop)
+            {
+                SVCHlpMsg::Code reply = SVCHlpMsg::Null;
+
+                vrc = aClient->read (reply);
+                if (RT_FAILURE (vrc)) break;
+
+                switch (reply)
+                {
+                    case SVCHlpMsg::OK:
+                    {
+                        /* no parameters */
+                        rc = d->iface->updateConfig();
+                        endLoop = true;
+                        break;
+                    }
+                    case SVCHlpMsg::Error:
+                    {
+                        /* read the error message */
+                        Utf8Str errMsg;
+                        vrc = aClient->read (errMsg);
+                        if (RT_FAILURE (vrc)) break;
+
+                        rc = E_FAIL; // TODO: setError (E_FAIL, errMsg);
+                        endLoop = true;
+                        break;
+                    }
+                    default:
+                    {
+                        endLoop = true;
+                        rc = E_FAIL; // TODO: ComAssertMsgFailedBreak ((
+                            //"Invalid message code %d (%08lX)\n",
+                            //reply, reply),
+                            //rc = E_FAIL);
+                    }
+                }
+            }
+
+            break;
+        }
+        case SVCHlpMsg::DhcpRediscover: /* see usage in code */
+        {
+            LogFlowFunc (("DhcpRediscover:\n"));
+            LogFlowFunc (("Network connection name = '%ls'\n", d->name.raw()));
+
+            /* write message and parameters */
+            vrc = aClient->write (d->msgCode);
+            if (RT_FAILURE (vrc)) break;
+            vrc = aClient->write (d->guid);
             if (RT_FAILURE (vrc)) break;
 
@@ -1939 +2089 @@
             break;
         }
+        case SVCHlpMsg::DhcpRediscover:
+        {
+            LogFlowFunc (("DhcpRediscover:\n"));
+
+            Guid guid;
+            vrc = aClient->read (guid);
+            if (RT_FAILURE (vrc)) break;
+
+            Utf8Str errMsg;
+            vrc = netIfDhcpRediscover (guid);
+
+            if (RT_SUCCESS (vrc))
+            {
+                /* write success followed by GUID */
+                vrc = aClient->write (SVCHlpMsg::OK);
+                if (RT_FAILURE (vrc)) break;
+            }
+            else
+            {
+                /* write failure followed by error message */
+                if (errMsg.isEmpty())
+                    errMsg = Utf8StrFmt ("Unspecified error (%Rrc)", vrc);
+                vrc = aClient->write (SVCHlpMsg::Error);
+                if (RT_FAILURE (vrc)) break;
+                vrc = aClient->write (errMsg);
+                if (RT_FAILURE (vrc)) break;
+            }
+
+            break;
+        }
         default:
             AssertMsgFailedBreakStmt (
@@ -2353 +2533 @@
 
 int NetIfEnableDynamicIpConfig(VirtualBox *vBox, HostNetworkInterface * pIf)
+{
+    HRESULT rc;
+    GUID guid;
+    rc = pIf->COMGETTER(Id) (&guid);
+    if(SUCCEEDED(rc))
+    {
+//        ComPtr<VirtualBox> vBox;
+//        rc = pIf->getVirtualBox (vBox.asOutParam());
+//        if(SUCCEEDED(rc))
+        {
+            /* create a progress object */
+            ComObjPtr <Progress> progress;
+            progress.createObject();
+//            ComPtr<IHost> host;
+//            HRESULT rc = vBox->COMGETTER(Host)(host.asOutParam());
+//            if(SUCCEEDED(rc))
+            {
+                rc = progress->init (vBox, (IHostNetworkInterface*)pIf,
+                                    Bstr ("Enabling Dynamic Ip Configuration"),
+                                    FALSE /* aCancelable */);
+                if(SUCCEEDED(rc))
+                {
+                    CheckComRCReturnRC (rc);
+//                    progress.queryInterfaceTo (aProgress);
+
+                    /* create the networkInterfaceHelperClient() argument */
+                    std::auto_ptr <NetworkInterfaceHelperClientData>
+                        d (new NetworkInterfaceHelperClientData());
+                    AssertReturn (d.get(), E_OUTOFMEMORY);
+
+                    d->msgCode = SVCHlpMsg::EnableDynamicIpConfig;
+                    d->guid = guid;
+                    d->iface = pIf;
+
+                    rc = vBox->startSVCHelperClient (
+                        IsUACEnabled() == TRUE /* aPrivileged */,
+                        netIfNetworkInterfaceHelperClient,
+                        static_cast <void *> (d.get()),
+                        progress);
+
+                    if (SUCCEEDED (rc))
+                    {
+                        /* d is now owned by netIfNetworkInterfaceHelperClient(), so release it */
+                        d.release();
+
+                        progress->WaitForCompletion(-1);
+                    }
+                }
+            }
+        }
+    }
+
+    return SUCCEEDED(rc) ? VINF_SUCCESS : VERR_GENERAL_FAILURE;
+}
+
+int NetIfDhcpRediscover(VirtualBox *vBox, HostNetworkInterface * pIf)
 {
     HRESULT rc;

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

@@ -280 +280 @@
             case SVCHlpMsg::EnableStaticIpConfig:
             case SVCHlpMsg::EnableStaticIpConfigV6:
+            case SVCHlpMsg::DhcpRediscover:
             {
                 vrc = netIfNetworkInterfaceHelperServer (this, msgCode);

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

@@ -44 +44 @@
         EnableStaticIpConfig, /* see usage in code */
         EnableStaticIpConfigV6, /* see usage in code */
+        DhcpRediscover, /* see usage in code */
     };
 };