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

Timestamp:

Jan 24, 2014 8:23:12 AM (11 years ago)

Author:

vboxsync

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

91785

Message:

spaces

Location:

trunk/src/VBox/NetworkServices/DHCP

Files:

• ClientDataInt.h (modified) (2 diffs)
• Config.cpp (modified) (19 diffs)
• Config.h (modified) (2 diffs)
• VBoxNetDHCP.cpp (modified) (5 diffs)

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

@@ -37 +37 @@
     }
     ~ClientData(){}
-    
+
     /* client information */
     RTNETADDRIPV4 m_address;
     RTNETADDRIPV4 m_network;
     RTMAC m_mac;
-    
+
     bool fHasClient;
 
     /* Lease part */
-    bool fHasLease; 
+    bool fHasLease;
     /** lease isn't commited */
     bool fBinding;
@@ -64 +64 @@
     NetworkConfigEntity *pCfg;
 };
+
 #endif

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

@@ -1 +1 @@
 /* $Id$ */
+/** @file
+ * Configuration for DHCP.
+ */
+
+/*
+ * Copyright (C) 2013-2014 Oracle Corporation
+ *
+ * This file is part of VirtualBox Open Source Edition (OSE), as
+ * available from http://www.virtualbox.org. This file is free software;
+ * you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) as published by the Free Software
+ * Foundation, in version 2 as it comes in the "COPYING" file of the
+ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ */
+
 
 /**
@@ -131 +147 @@
     bool                 fFileExists;
 };
-    
+
 ConfigurationManager *ConfigurationManager::getConfigurationManager()
 {
@@ -174 +190 @@
 {
     m->m_leaseStorageFilename = leaseStorageFileName;
-    
+
     xml::XmlFileParser parser;
     xml::Document doc;
@@ -208 +224 @@
         if (!lease->nameEquals(tagXMLLease.c_str()))
             continue;
-        
+
         ClientData *data = new ClientData();
         Lease l(data);
-        if (l.fromXML(lease)) 
+        if (l.fromXML(lease))
         {
 
@@ -242 +258 @@
     if (!root)
         return VERR_INTERNAL_ERROR;
-    
+
     root->setAttribute(tagXMLLeasesAttributeVersion.c_str(), tagXMLLeasesVersion_1_0.c_str());
 
@@ -388 +404 @@
         if (l != Lease::NullLease)
         {
-            /* Here we should take lease from the m_allocation which was feed with leases 
+            /* Here we should take lease from the m_allocation which was feed with leases
              *  on start
              */
@@ -476 +492 @@
     Lease l = client.lease();
     AssertReturn(l != Lease::NullLease, VERR_INTERNAL_ERROR);
-    
+
     if (l.isInBindingPhase())
     {
@@ -491 +507 @@
         return VINF_SUCCESS;
     }
-    
+
     l = Lease(client); /* re-new */
     return VINF_SUCCESS;
@@ -668 +684 @@
         RT_ZERO(BootPReplyMsg);
         cbBooPReplyMsg = 0;
-        
+
         m_OurAddress.u = 0;
         m_OurNetmask.u = 0;
@@ -803 +819 @@
 
     prepareReplyPacket4Client(client, u32Xid);
-    
+
     Lease l = client.lease();
     address = l.getAddress();
@@ -926 +942 @@
     Cursor.optIPv4Addr(RTNET_DHCP_OPT_SERVER_ID, m->m_OurAddress);
 
-    const Lease l = client.lease(); 
+    const Lease l = client.lease();
     const std::map<uint8_t, RawOption>& options = l.options();
 
-    for(std::vector<RawOption>::const_iterator it = extra.begin(); 
+    for(std::vector<RawOption>::const_iterator it = extra.begin();
         it != extra.end(); ++it)
     {
@@ -938 +954 @@
     }
 
-    for(std::map<uint8_t, RawOption>::const_iterator it = options.begin(); 
+    for(std::map<uint8_t, RawOption>::const_iterator it = options.begin();
         it != options.end(); ++it)
     {
@@ -953 +969 @@
 #if 0
     /** @todo need to see someone set this flag to check that it's correct. */
-    if (!(pDhcpMsg->bp_flags & RTNET_DHCP_FLAGS_NO_BROADCAST))  
+    if (!(pDhcpMsg->bp_flags & RTNET_DHCP_FLAGS_NO_BROADCAST))
     {
         rc = VBoxNetUDPUnicast(m_pSession,
@@ -970 +986 @@
         rc = m->m_service->hlpUDPBroadcast(RTNETIPV4_PORT_BOOTPS,               /* sender */
                                            RTNETIPV4_PORT_BOOTPC,
-                                           &m->BootPReplyMsg, 
+                                           &m->BootPReplyMsg,
                                            RTNET_DHCP_NORMAL_SIZE);
 
@@ -979 +995 @@
 
 
-int NetworkManager::processParameterReqList(const Client& client, const uint8_t *pu8ReqList, 
+int NetworkManager::processParameterReqList(const Client& client, const uint8_t *pu8ReqList,
                                             int cReqList, std::vector<RawOption>& extra)
 {
     const Lease l = client.lease();
-    
+
     const NetworkConfigEntity *pNetCfg = l.getConfig();
 
@@ -1224 +1240 @@
     if (!valueAddition) return false;
 
-    xml::ElementNode *address = node->createChild(tagXMLLeaseAddress.c_str()); 
+    xml::ElementNode *address = node->createChild(tagXMLLeaseAddress.c_str());
     if (!address) return false;
 
@@ -1230 +1246 @@
     if (!valueAddition) return false;
 
-    xml::ElementNode *time = node->createChild(tagXMLLeaseTime.c_str()); 
+    xml::ElementNode *time = node->createChild(tagXMLLeaseTime.c_str());
     if (!time) return false;
 
-    valueAddition = time->setAttribute(tagXMLTimeAttributeIssued.c_str(), 
+    valueAddition = time->setAttribute(tagXMLTimeAttributeIssued.c_str(),
                                        m->u64TimestampLeasingStarted);
     if (!valueAddition) return false;
 
-    valueAddition = time->setAttribute(tagXMLTimeAttributeExpiration.c_str(), 
+    valueAddition = time->setAttribute(tagXMLTimeAttributeExpiration.c_str(),
                                        m->u32LeaseExpirationPeriod);
     if (!valueAddition) return false;
@@ -1266 +1282 @@
     if (!valueExists) return false;
     rc = RTNetStrToIPv4Addr(addressValue.c_str(), &m->m_address);
-    
+
     /* Time */
     const xml::ElementNode *time = node->findChildElement(tagXMLLeaseTime.c_str());
     if (!time) return false;
 
-    valueExists = time->getAttributeValue(tagXMLTimeAttributeIssued.c_str(), 
+    valueExists = time->getAttributeValue(tagXMLTimeAttributeIssued.c_str(),
                                           &m->u64TimestampLeasingStarted);
     if (!valueExists) return false;
     m->fBinding = false;
-    
-    valueExists = time->getAttributeValue(tagXMLTimeAttributeExpiration.c_str(), 
+
+    valueExists = time->getAttributeValue(tagXMLTimeAttributeExpiration.c_str(),
                                           &m->u32LeaseExpirationPeriod);
     if (!valueExists) return false;
@@ -1287 +1303 @@
 const Lease Lease::NullLease;
 
-
 const Client Client::NullClient;

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

@@ -17 +17 @@
 
 #ifndef _CONFIG_H_
-# define _CONFIG_H_
+#define _CONFIG_H_
 
 #include <iprt/asm-math.h>
@@ -121 +121 @@
     bool isInBindingPhase() const;
     /* returns 0 if in binding state */
-    uint64_t issued() const; 
+    uint64_t issued() const;
 
     void setExpiration(uint32_t);

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

@@ -254 +254 @@
         case 'l':
         case 'u':
-        case 'g': 
+        case 'g':
         {
             char buf[17];
@@ -287 +287 @@
     netManager->setOurMac(getMacAddress());
     netManager->setService(this);
-    
+
     if (isMainNeeded())
         rc = initWithMain();
@@ -465 +465 @@
             case 'b':
                 break;
-                    
+
         }
     }
-        
+
     ConfigurationManager *confManager = ConfigurationManager::getConfigurationManager();
     AssertPtrReturn(confManager, VERR_INTERNAL_ERROR);
@@ -569 +569 @@
 
         {
-            VBoxNetALock(this);   
+            VBoxNetALock(this);
             ConfigurationManager *confManager = ConfigurationManager::getConfigurationManager();
             confManager->flushAddressList(RTNET_DHCP_OPT_DNS);
@@ -575 +575 @@
             for (AddressList::iterator it = nameservers.begin(); it != nameservers.end(); ++it)
                 confManager->addToAddressList(RTNET_DHCP_OPT_DNS, *it);
-            
+
             confManager->setString(RTNET_DHCP_OPT_DOMAIN_NAME, domain);
         }
     }
-    
+
     return VINF_SUCCESS;
 }