Changeset 48413 in vbox for trunk/src/VBox/NetworkServices

Timestamp:

Sep 10, 2013 2:49:33 PM (11 years ago)

Author:

vboxsync

Message:

VBoxNetDHCP: Fix unsigned vs signed comparison.

File:

• trunk/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.cpp (modified) (7 diffs)

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

@@ -71 +71 @@
 #  undef INET_ADDRSTRLEN
 # endif
-# define INET_ADDRSTRLEN 16 
+# define INET_ADDRSTRLEN 16
 #else
 # include <netinet/in.h>
@@ -389 +389 @@
 
         unsigned int i;
-        int count_strs;
+        unsigned int count_strs;
         com::SafeArray<BSTR> strs;
         std::map<RTNETADDRIPV4, uint32_t> MapIp4Addr2Off;
 
         hrc = m_NATNetwork->COMGETTER(LocalMappings)(ComSafeArrayAsOutParam(strs));
-        if (   SUCCEEDED(hrc) 
+        if (   SUCCEEDED(hrc)
             && (count_strs = strs.size()))
         {
@@ -404 +404 @@
                 uint32_t u32Off;
                 const char *pszLo2Off = com::Utf8Str(strs[i]).c_str();
-        
+
                 RT_ZERO(aszAddr);
-                
+
                 pszTerm = RTStrStr(pszLo2Off, "=");
 
@@ -412 +412 @@
                        && (pszTerm - pszLo2Off) <= INET_ADDRSTRLEN)
                 {
-                
+
                     memcpy(aszAddr, pszLo2Off, (pszTerm - pszLo2Off));
                     int rc = RTNetStrToIPv4Addr(aszAddr, &ip4addr);
@@ -445 +445 @@
                             if (MapIp4Addr2Off[addr] != 0)
                             {
-                                addr.u = RT_H2N_U32(RT_N2H_U32(m_Ipv4Address.u & m_Ipv4Netmask.u) 
+                                addr.u = RT_H2N_U32(RT_N2H_U32(m_Ipv4Address.u & m_Ipv4Netmask.u)
                                                     + MapIp4Addr2Off[addr]);
                             }
@@ -451 +451 @@
                                 continue;
                         }
-                        
+
                         confManager->addToAddressList(RTNET_DHCP_OPT_DNS, addr);
                     }
@@ -734 +734 @@
 
         int rc = ConfigurationManager::extractRequestList(pDhcpMsg, cb, opt);
-        
+
         /* 3. Send of offer */
         NetworkManager *networkManager = NetworkManager::getNetworkManager();
-        
+
         lease->fBinding = true;
         lease->u64TimestampBindingStarted = RTTimeMilliTS();