Changeset 107559 in vbox for trunk/src

Timestamp:

Jan 9, 2025 8:55:25 AM (7 weeks ago)

Author:

vboxsync

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

166632

Message:

Main/src-server/NATNetworkImpl.cpp: Missing error checks + two todos, bugref:3409

File:

• trunk/src/VBox/Main/src-server/NATNetworkImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/src-server/NATNetworkImpl.cpp

@@ -958 +958 @@
          */
 
+        /** @todo r=aeichner This comment doen't seem to reflect reality
+         *                   When FindDHCPServerByNetworkName() returns E_INVALIDARG
+         *                   a new DHCP server is created while the comment states that
+         *                   the server should already exist... */
+        /** @todo r=aeichner Returning an error should set an error message! */
         /*
          * Configuration and running DHCP server:
          * 1. find server first createDHCPServer
-         * 2. if return status is E_INVALARG => server already exists just find and start.
-         * 3. if return status neither E_INVALRG nor S_OK => return E_FAIL
+         * 2. if return status is E_INVALIDARG => server already exists just find and start.
+         * 3. if return status neither E_INVALIDARG nor S_OK => return E_FAIL
          * 4. if return status S_OK proceed to DHCP server configuration
          * 5. call setConfiguration() and pass all required parameters
@@ -972 +977 @@
         {
             case E_INVALIDARG:
-                /* server haven't beeen found let create it then */
-                hrc = m->pVirtualBox->CreateDHCPServer(Bstr(m->s.strNetworkName).raw(),
-                                                       m->dhcpServer.asOutParam());
-                if (FAILED(hrc))
-                  return E_FAIL;
-                /* breakthrough */
-
             {
                 LogFunc(("gateway: %s, dhcpserver:%s, dhcplowerip:%s, dhcpupperip:%s\n",
@@ -986 +984 @@
                          m->IPv4DhcpServerUpperIp.c_str()));
 
+                /* server haven't beeen found let create it then */
+                hrc = m->pVirtualBox->CreateDHCPServer(Bstr(m->s.strNetworkName).raw(),
+                                                       m->dhcpServer.asOutParam());
+                if (FAILED(hrc))
+                  return E_FAIL;
+
                 hrc = m->dhcpServer->COMSETTER(Enabled)(true);
+                if (FAILED(hrc))
+                  return setError(hrc, tr("Failed to enable DHCP server for network '%s'"),
+                                          m->s.strNetworkName.c_str());
 
                 hrc = m->dhcpServer->SetConfiguration(Bstr(m->IPv4DhcpServer).raw(),
@@ -992 +999 @@
                                                       Bstr(m->IPv4DhcpServerLowerIp).raw(),
                                                       Bstr(m->IPv4DhcpServerUpperIp).raw());
+                if (FAILED(hrc))
+                  return setError(hrc, tr("Failed to set DHCP server configuration for network '%s'"),
+                                          m->s.strNetworkName.c_str());
+
                 break;
             }