Changeset 63266 in vbox for trunk/src/VBox/NetworkServices/DHCP/NetworkManagerDhcp.cpp

Timestamp:

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

Author:

vboxsync

Message:

NetworkServices: warnings

File:

• trunk/src/VBox/NetworkServices/DHCP/NetworkManagerDhcp.cpp (modified) (3 diffs)

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