Changeset 63266 in vbox for trunk/src/VBox/NetworkServices/DHCP

Timestamp:

Aug 10, 2016 1:21:48 PM (9 years ago)

Author:

vboxsync

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

109898

Message:

NetworkServices: warnings

Location:

trunk/src/VBox/NetworkServices/DHCP

Files:

• Config.h (modified) (1 diff)
• NetworkManagerDhcp.cpp (modified) (3 diffs)
• VBoxNetDHCP.cpp (modified) (4 diffs)

trunk/src/VBox/NetworkServices/DHCP/Config.h

@@ -40 +40 @@
     RawOption()
     {
+        /** @todo r=bird: this is crazy. */
         RT_ZERO(*this);
     }

trunk/src/VBox/NetworkServices/DHCP/NetworkManagerDhcp.cpp

@@ -67 +67 @@
 
     int rc = ConfigurationManager::extractRequestList(pDhcpMsg, cb, opt);
+    NOREF(rc); /** @todo check */
 
     /* 3. Send of offer */
@@ -75 +76 @@
     offer4Client(client, pDhcpMsg->bp_xid, opt.au8RawOpt, opt.cbRawOpt);
 
-    return VINF_SUCCESS;
+    return true;
 }
 
@@ -107 +108 @@
             return true;
         }
-        else {
-            /* XXX: Validate request */
-            RawOption opt;
-            RT_ZERO(opt);
+        /* XXX: Validate request */
+        RawOption opt;
+        RT_ZERO(opt);
 
-            Client c(client);
-            int rc = confManager->commitLease4Client(c);
-            AssertRCReturn(rc, false);
+        Client c(client);
+        int rc = confManager->commitLease4Client(c);
+        AssertRCReturn(rc, false);
 
-            rc = ConfigurationManager::extractRequestList(pDhcpMsg, cb, opt);
-            AssertRCReturn(rc, false);
+        rc = ConfigurationManager::extractRequestList(pDhcpMsg, cb, opt);
+        AssertRCReturn(rc, false);
 
-            ack(client, pDhcpMsg->bp_xid, opt.au8RawOpt, opt.cbRawOpt);
-        }
+        ack(client, pDhcpMsg->bp_xid, opt.au8RawOpt, opt.cbRawOpt);
     }
     else

trunk/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.cpp

@@ -55 +55 @@
 #include <VBox/version.h>
 
-
 #include "../NetLib/VBoxNetLib.h"
 #include "../NetLib/shared_ptr.h"
@@ -345 +344 @@
  * Handles a DHCP message.
  *
- * @returns true if handled, false if not.
+ * @returns true if handled, false if not.  (IGNORED BY CALLER)
  * @param   uMsgType        The message type.
  * @param   pDhcpMsg        The DHCP message.
@@ -611 +610 @@
 HRESULT VBoxNetDhcp::HandleEvent(VBoxEventType_T aEventType, IEvent *pEvent)
 {
-    switch(aEventType)
+    switch (aEventType)
     {
         case VBoxEventType_OnHostNameResolutionConfigurationChange:
@@ -640 +639 @@
             break;
         }
+
+        default: break; /* Shut up MSC. */
     }