Changeset 97077 in vbox for trunk/src/VBox/NetworkServices/Dhcpd/VBoxNetDhcpd.cpp

Timestamp:

Oct 10, 2022 6:37:12 PM (2 years ago)

Author:

vboxsync

Message:

NetworkServices/Dhcpd: Reduce clutter a bit, bugref:10297

File:

• trunk/src/VBox/NetworkServices/Dhcpd/VBoxNetDhcpd.cpp (modified) (4 diffs)

trunk/src/VBox/NetworkServices/Dhcpd/VBoxNetDhcpd.cpp

@@ -135 +135 @@
                const RTCString &strTrunk = RTCString(),
                INTNETTRUNKTYPE enmTrunkType = kIntNetTrunkType_WhateverNone);
-    int ifOpen(const RTCString &strNetwork,
-               const RTCString &strTrunk,
-               INTNETTRUNKTYPE enmTrunkType);
-    int ifGetBuf();
-    int ifActivate();
 
     int ifProcessInput();
-    int ifFlush();
-
-    int ifClose();
 
     void ifPump();
@@ -182 +174 @@
 VBoxNetDhcpd::~VBoxNetDhcpd()
 {
-    ifClose();
+    if (m_hIf != NULL)
+    {
+        int rc = IntNetR3IfCtxDestroy(m_hIf);
+        AssertRC(rc);
+        m_hIf = NULL;
+    }
 }
 
@@ -227 +224 @@
                          INTNETTRUNKTYPE enmTrunkType)
 {
-    int rc;
-
-    rc = ifOpen(strNetwork, strTrunk, enmTrunkType);
-    if (RT_FAILURE(rc))
-        return rc;
-
-    rc = ifGetBuf();
-    if (RT_FAILURE(rc))
-        return rc;
-
-    rc = ifActivate();
-    if (RT_FAILURE(rc))
-        return rc;
-
-    return VINF_SUCCESS;
-}
-
-
-int VBoxNetDhcpd::ifOpen(const RTCString &strNetwork,
-                         const RTCString &strTrunk,
-                         INTNETTRUNKTYPE enmTrunkType)
-{
-    AssertReturn(m_hIf == NULL, VERR_GENERAL_FAILURE);
-
     if (enmTrunkType == kIntNetTrunkType_Invalid)
         enmTrunkType = kIntNetTrunkType_WhateverNone;
 
-    return IntNetR3IfCtxCreate(&m_hIf, strNetwork.c_str(), enmTrunkType,
-                               strTrunk.c_str(), _128K /*cbSend*/, _256K /*cbRecv*/,
-                               0 /*fFlags*/);
-}
-
-
-int VBoxNetDhcpd::ifGetBuf()
-{
-    AssertReturn(m_hIf != NULL, VERR_GENERAL_FAILURE);
-    AssertReturn(m_pIfBuf == NULL, VERR_GENERAL_FAILURE);
-
-    return IntNetR3IfCtxQueryBufferPtr(m_hIf, &m_pIfBuf);
-}
-
-
-int VBoxNetDhcpd::ifActivate()
-{
-    AssertReturn(m_hIf != NULL, VERR_GENERAL_FAILURE);
-    AssertReturn(m_pIfBuf != NULL, VERR_GENERAL_FAILURE);
-
-    return IntNetR3IfCtxSetActive(m_hIf, true /*fActive*/);
+    int rc = IntNetR3IfCtxCreate(&m_hIf, strNetwork.c_str(), enmTrunkType,
+                                 strTrunk.c_str(), _128K /*cbSend*/, _256K /*cbRecv*/,
+                                 0 /*fFlags*/);
+    if (RT_SUCCESS(rc))
+    {
+        rc = IntNetR3IfCtxQueryBufferPtr(m_hIf, &m_pIfBuf);
+        if (RT_SUCCESS(rc))
+            rc = IntNetR3IfCtxSetActive(m_hIf, true /*fActive*/);
+    }
+
+    return rc;
 }
 
@@ -422 +385 @@
     IntNetRingCommitFrameEx(&m_pIfBuf->Send, pHdr, cbFrame);
 
-    ifFlush();
+    IntNetR3IfSend(m_hIf);
     return ERR_OK;
-}
-
-
-int VBoxNetDhcpd::ifFlush()
-{
-    return IntNetR3IfSend(m_hIf);
-}
-
-
-int VBoxNetDhcpd::ifClose()
-{
-    if (m_hIf == NULL)
-        return VINF_SUCCESS;
-
-    int rc = IntNetR3IfCtxDestroy(m_hIf);
-    m_hIf = NULL;
-    return rc;
 }