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

Timestamp:

Oct 7, 2013 10:00:27 PM (11 years ago)

Author:

vboxsync

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

89653

Message:

NetworkServices: Whitespace (including tabs!) and svn:keywords cleanups by scm.

Location:

trunk/src/VBox/NetworkServices/DHCP

Files:

• Config.cpp (modified) (11 diffs)
• Config.h (modified) (4 diffs)
• Makefile.kmk (modified) (1 diff)
• VBoxNetDHCP.cpp (modified) (1 diff)

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

@@ -124 +124 @@
     bool fDhcpValid = false;
     uint8_t uMsgType = 0;
-    
+
     fDhcpValid = RTNetIPv4IsDHCPValid(NULL, pDhcpMsg, cbDhcpMsg, &uMsgType);
     AssertReturn(fDhcpValid, NULL);
@@ -230 +230 @@
      */
     AssertPtrReturn(client, NULL);
-    
+
     /**
      * This mean that client has already bound or commited lease.
-     * If we've it happens it means that we received DHCPDISCOVER twice. 
+     * If we've it happens it means that we received DHCPDISCOVER twice.
      */
     if (client->m_lease)
@@ -265 +265 @@
     }
 
-    if (   hintAddress.u 
+    if (   hintAddress.u
         && !isAddressTaken(hintAddress, NULL))
     {
@@ -295 +295 @@
         }
     }
-   
+
     return NULL;
 }
@@ -318 +318 @@
     delete client->m_lease;
     client->m_lease = NULL;
-    
+
     return VINF_SUCCESS;
 }
@@ -325 +325 @@
 {
     MapLease2Ip4AddressIterator it;
-    
+
     for (it = m_allocations.begin();
          it != m_allocations.end();
@@ -334 +334 @@
             if (ppLease)
                 *ppLease = it->first;
-            
+
             return true;
         }
@@ -477 +477 @@
  * Network manager creates DHCPOFFER datagramm
  */
-int NetworkManager::offer4Client(Client *client, uint32_t u32Xid, 
+int NetworkManager::offer4Client(Client *client, uint32_t u32Xid,
                                  uint8_t *pu8ReqList, int cReqList)
 {
@@ -485 +485 @@
     prepareReplyPacket4Client(client, u32Xid);
 
-    
+
     RTNETADDRIPV4 address = client->m_lease->m_address;
     BootPReplyMsg.BootPHeader.bp_yiaddr =  address;
@@ -579 +579 @@
 {
     AssertPtrReturn(client, VERR_INTERNAL_ERROR);
-    
-    if (!client->m_lease) 
+
+    if (!client->m_lease)
         return VERR_INTERNAL_ERROR;
 
@@ -740 +740 @@
             case RTNET_DHCP_OPT_DNS:
                 {
-                    const Ipv4AddressContainer lst = 
+                    const Ipv4AddressContainer lst =
                       g_ConfigurationManager->getAddressList(pReqList[idxParam]);
                     PRTNETADDRIPV4 pAddresses = (PRTNETADDRIPV4)&opt.au8RawOpt[0];

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

@@ -366 +366 @@
 
     /**
-     * 
+     *
      */
     Client* getClientByDhcpPacket(const RTNETBOOTP *pDhcpMsg, size_t cbDhcpMsg);
@@ -382 +382 @@
      */
     int commitLease4Client(Client *client);
-    
+
     /**
      * Expires client lease.
@@ -487 +487 @@
     }
     virtual ~Lease(){}
-    
+
     bool isExpired()
     {
         if (!fBinding)
-            return (ASMDivU64ByU32RetU32(RTTimeMilliTS() - u64TimestampLeasingStarted, 1000) 
+            return (ASMDivU64ByU32RetU32(RTTimeMilliTS() - u64TimestampLeasingStarted, 1000)
                     > u32LeaseExpirationPeriod);
         else
-            return (ASMDivU64ByU32RetU32(RTTimeMilliTS() - u64TimestampBindingStarted, 1000) 
+            return (ASMDivU64ByU32RetU32(RTTimeMilliTS() - u64TimestampBindingStarted, 1000)
                     > u32BindExpirationPeriod);
 
@@ -501 +501 @@
     /* XXX private: */
     RTNETADDRIPV4 m_address;
-    
+
     /** lease isn't commited */
     bool fBinding;
-    
+
     /** Timestamp when lease commited. */
     uint64_t u64TimestampLeasingStarted;

trunk/src/VBox/NetworkServices/DHCP/Makefile.kmk

@@ -57 +57 @@
 
 #
-# VBOXMAINCLIENT here only to use DhcpOpt_T type. 
+# VBOXMAINCLIENT here only to use DhcpOpt_T type.
 tstDhcpConfig_TEMPLATE = VBOXMAINCLIENTEXE
 #XXX: enable condtionally if user is vvl

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

@@ -467 +467 @@
             if (SUCCEEDED(host->COMGETTER(DomainName)(domain.asOutParam())))
                 confManager->setString(RTNET_DHCP_OPT_DOMAIN_NAME, std::string(com::Utf8Str(domain).c_str()));
-            
+
 
         }