Changeset 85235 in vbox

Timestamp:

Jul 11, 2020 4:34:10 PM (5 years ago)

Author:

vboxsync

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

139212

Message:

Main/DHCPServerImpl: Fixed error code mixup in findLeaseByMAC() and corrected a signedness issue with the slot argument for i_vmNameToIdAndValidateSlot and i_vmNameAndSlotToConfig. bugref:9790

Location:

trunk/src/VBox/Main

Files:

• include/DHCPServerImpl.h (modified) (1 diff)
• src-server/DHCPServerImpl.cpp (modified) (4 diffs)

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

@@ -107 +107 @@
     HRESULT i_writeDhcpdConfig(const char *pszFilename, uint32_t uMACAddressVersion) RT_NOEXCEPT;
 
-    HRESULT i_vmNameToIdAndValidateSlot(const com::Utf8Str &aVmName, LONG aSlot, com::Guid &idMachine);
-    HRESULT i_vmNameAndSlotToConfig(const com::Utf8Str &a_strVmName, LONG a_uSlot, bool a_fCreateIfNeeded,
+    HRESULT i_vmNameToIdAndValidateSlot(const com::Utf8Str &aVmName, ULONG a_uSlot, com::Guid &idMachine);
+    HRESULT i_vmNameAndSlotToConfig(const com::Utf8Str &a_strVmName, ULONG a_uSlot, bool a_fCreateIfNeeded,
                                     ComObjPtr<DHCPIndividualConfig> &a_rPtrConfig);
     /** @} */

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

@@ -582 +582 @@
  * @returns COM status code.
  * @param   aVmName             The VM name or UUID.
- * @param   aSlot               The slot.
+ * @param   a_uSlot             The slot.
  * @param   idMachine           Where to return the VM UUID.
  */
-HRESULT DHCPServer::i_vmNameToIdAndValidateSlot(const com::Utf8Str &aVmName, LONG aSlot, com::Guid &idMachine)
-{
-    if ((ULONG)aSlot <= 32)
+HRESULT DHCPServer::i_vmNameToIdAndValidateSlot(const com::Utf8Str &aVmName, ULONG a_uSlot, com::Guid &idMachine)
+{
+    if (a_uSlot <= 32)
     {
         /* Is it a UUID? */
@@ -601 +601 @@
         return hrc;
     }
-    return setError(E_INVALIDARG, tr("NIC slot number (%d) is out of range (0..32)"), aSlot);
+    return setError(E_INVALIDARG, tr("NIC slot number (%d) is out of range (0..32)"), a_uSlot);
 }
 
@@ -618 +618 @@
  * @note    Caller must not be holding any locks!
  */
-HRESULT DHCPServer::i_vmNameAndSlotToConfig(const com::Utf8Str &a_strVmName, LONG a_uSlot, bool a_fCreateIfNeeded,
+HRESULT DHCPServer::i_vmNameAndSlotToConfig(const com::Utf8Str &a_strVmName, ULONG a_uSlot, bool a_fCreateIfNeeded,
                                             ComObjPtr<DHCPIndividualConfig> &a_rPtrConfig)
 {
@@ -1081 +1081 @@
                         if (   (aState.equals("acked") || aState.equals("offered") || aState.isEmpty())
                             && secIssued + cSecsToLive < RTTimeSpecGetSeconds(RTTimeNow(&Now)))
-                            hrc = aState.assignNoThrow("expired");
+                            hrc = RT_SUCCESS(aState.assignNoThrow("expired")) ? S_OK : E_OUTOFMEMORY;
                         return hrc;
                     }