Changeset 54106 in vbox

Timestamp:

Feb 8, 2015 12:43:35 AM (10 years ago)

Author:

vboxsync

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

98104

Message:

NAT: Introduce PDMINETWORKNATCONFIG::pfnNotifyDnsChanged and call it
on IHostNameResolutionConfigurationChangeEvent. This is just the
plumbing so far, there's no actual callback yet.

Location:

trunk

Files:

• include/VBox/vmm/pdmnetifs.h (modified) (1 diff)
• src/VBox/Devices/Network/DrvNAT.cpp (modified) (1 diff)
• src/VBox/Main/include/ConsoleImpl.h (modified) (2 diffs)
• src/VBox/Main/src-client/ConsoleImpl.cpp (modified) (3 diffs)

trunk/include/VBox/vmm/pdmnetifs.h

@@ -426 +426 @@
                                                        bool fUdp, const char *pHostIp, uint16_t u16HostPort,
                                                        const char *pGuestIp, uint16_t u16GuestPort));
+    /**
+     * Inform NAT about host DNS settings change.
+     *
+     * IHostNameResolutionConfigurationChangeEvent.
+     */
+    DECLR3CALLBACKMEMBER(void, pfnNotifyDnsChanged, (PPDMINETWORKNATCONFIG pInterface));
 
 } PDMINETWORKNATCONFIG;
 /** PDMINETWORKNATCONFIG interface ID. */
-#define PDMINETWORKNATCONFIG_IID                "0f001d62-4d2f-11df-93b3-2fd0b3a36a6b"
+#define PDMINETWORKNATCONFIG_IID                "dc961028-3523-4b52-a93b-e38168a4a9fa"
 /** @} */
 

trunk/src/VBox/Devices/Network/DrvNAT.cpp

@@ -1402 +1402 @@
     /* NAT engine configuration */
     pThis->INetworkNATCfg.pfnRedirectRuleCommand = drvNATNetworkNatConfig_RedirectRuleCommand;
+    pThis->INetworkNATCfg.pfnNotifyDnsChanged = NULL;
 
     /*

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

@@ -262 +262 @@
     HRESULT i_onNATRedirectRuleChange(ULONG ulInstance, BOOL aNatRuleRemove,
                                       NATProtocol_T aProto, IN_BSTR aHostIp, LONG aHostPort, IN_BSTR aGuestIp, LONG aGuestPort);
+    HRESULT i_onNATDnsChanged();
 
     // Mouse interface
@@ -350 +351 @@
                      ULONG aMaxDowntime,
                      ComPtr<IProgress> &aProgress);
+
+    void notifyNatDnsChange(PUVM pUVM, const char *pszDevice, ULONG ulInstanceMax);
 
     /**

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -350 +350 @@
             }
             break;
+
+            case VBoxEventType_OnHostNameResolutionConfigurationChange:
+            {
+                mConsole->i_onNATDnsChanged();
+                break;
+            }
 
             case VBoxEventType_OnHostPCIDevicePlug:
@@ -630 +636 @@
             com::SafeArray<VBoxEventType_T> eventTypes;
             eventTypes.push_back(VBoxEventType_OnNATRedirect);
+            eventTypes.push_back(VBoxEventType_OnHostNameResolutionConfigurationChange);
             eventTypes.push_back(VBoxEventType_OnHostPCIDevicePlug);
             eventTypes.push_back(VBoxEventType_OnExtraDataChanged);
@@ -4292 +4299 @@
     return rc;
 }
+
+
+/*
+ * IHostNameResolutionConfigurationChangeEvent
+ *
+ * Currently this event doesn't carry actual resolver configuration,
+ * so we have to go back to VBoxSVC and ask...  This is not ideal.
+ */
+HRESULT Console::i_onNATDnsChanged()
+{
+    HRESULT hrc;
+
+    AutoCaller autoCaller(this);
+    AssertComRCReturnRC(autoCaller.rc());
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    ComPtr<IVirtualBox> pVirtualBox;
+    hrc = mMachine->COMGETTER(Parent)(pVirtualBox.asOutParam());
+    if (FAILED(hrc))
+        return S_OK;
+
+    ComPtr<IHost> pHost;
+    hrc = pVirtualBox->COMGETTER(Host)(pHost.asOutParam());
+    if (FAILED(hrc))
+        return S_OK;
+
+    SafeArray<BSTR> aNameServers;
+    hrc = pHost->COMGETTER(NameServers)(ComSafeArrayAsOutParam(aNameServers));
+    if (FAILED(hrc))
+        return S_OK;
+
+    const size_t cNameServers = aNameServers.size();
+    Log(("DNS change - %zu nameservers\n", cNameServers));
+
+    for (size_t i = 0; i < cNameServers; ++i)
+    {
+        com::Utf8Str strNameServer(aNameServers[i]);
+        Log(("- nameserver[%zu] = \"%s\"\n", i, strNameServer.c_str()));
+    }
+
+    com::Bstr domain;
+    pHost->COMGETTER(DomainName)(domain.asOutParam());
+    Log(("domain name = \"%s\"\n", com::Utf8Str(domain).c_str()));
+
+
+    ChipsetType_T enmChipsetType;
+    hrc = mMachine->COMGETTER(ChipsetType)(&enmChipsetType);
+    if (!FAILED(hrc))
+    {
+        SafeVMPtrQuiet ptrVM(this);
+        if (ptrVM.isOk())
+        {
+            ULONG ulInstanceMax = (ULONG)Global::getMaxNetworkAdapters(enmChipsetType);
+
+            notifyNatDnsChange(ptrVM.rawUVM(), "pcnet", ulInstanceMax);
+            notifyNatDnsChange(ptrVM.rawUVM(), "e1000", ulInstanceMax);
+            notifyNatDnsChange(ptrVM.rawUVM(), "virtio-net", ulInstanceMax);
+        }
+    }
+
+    return S_OK;
+}
+
+
+/*
+ * This routine walks over all network device instances, checking if
+ * device instance has DrvNAT attachment and triggering DrvNAT DNS
+ * change callback.
+ */
+void Console::notifyNatDnsChange(PUVM pUVM, const char *pszDevice, ULONG ulInstanceMax)
+{
+    Log(("notifyNatDnsChange: looking for DrvNAT attachment on %s device instances\n", pszDevice));
+    for (ULONG ulInstance = 0; ulInstance < ulInstanceMax; ulInstance++)
+    {
+        PPDMIBASE pBase;
+        int rc = PDMR3QueryDriverOnLun(pUVM, pszDevice, ulInstance, 0 /* iLun */, "NAT", &pBase);
+        if (RT_FAILURE(rc))
+            continue;
+
+        Log(("Instance %s#%d has DrvNAT attachment; do actual notify\n", pszDevice, ulInstance));
+        if (pBase)
+        {
+            PPDMINETWORKNATCONFIG pNetNatCfg = NULL;
+            pNetNatCfg = (PPDMINETWORKNATCONFIG)pBase->pfnQueryInterface(pBase, PDMINETWORKNATCONFIG_IID);
+            if (pNetNatCfg && pNetNatCfg->pfnNotifyDnsChanged)
+                pNetNatCfg->pfnNotifyDnsChanged(pNetNatCfg);
+        }
+    }
+}
+
 
 VMMDevMouseInterface *Console::i_getVMMDevMouseInterface()