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

Timestamp:

Oct 15, 2013 9:36:22 AM (11 years ago)

Author:

vboxsync

Message:

NetworkServices: coding style

Location:

trunk/src/VBox/NetworkServices

Files:

• DHCP/VBoxNetDHCP.cpp (modified) (3 diffs)
• NAT/VBoxNetLwipNAT.cpp (modified) (9 diffs)
• NetLib/VBoxNetPortForwardString.cpp (modified) (2 diffs)
• NetLib/VBoxPortForwardString.h (modified) (1 diff)

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

@@ -399 +399 @@
             for (i = 0; i < count_strs; ++i)
             {
-                char aszAddr[17];
+                char szAddr[17];
                 RTNETADDRIPV4 ip4addr;
                 char *pszTerm;
@@ -406 +406 @@
                 const char *pszLo2Off = strLo2Off.c_str();
 
-                RT_ZERO(aszAddr);
+                RT_ZERO(szAddr);
 
                 pszTerm = RTStrStr(pszLo2Off, "=");
@@ -413 +413 @@
                     && (pszTerm - pszLo2Off) <= INET_ADDRSTRLEN)
                 {
-                    memcpy(aszAddr, pszLo2Off, (pszTerm - pszLo2Off));
-                    int rc = RTNetStrToIPv4Addr(aszAddr, &ip4addr);
+                    memcpy(szAddr, pszLo2Off, (pszTerm - pszLo2Off));
+                    int rc = RTNetStrToIPv4Addr(szAddr, &ip4addr);
                     if (RT_SUCCESS(rc))
                     {

trunk/src/VBox/NetworkServices/NAT/VBoxNetLwipNAT.cpp

@@ -295 +295 @@
             RT_ZERO(r);
 
-            if (name.length() > RT_ELEMENTS(r.Pfr.aszPfrName))
+            if (name.length() > sizeof(r.Pfr.szPfrName))
             {
                 hrc = E_INVALIDARG;
@@ -314 +314 @@
 
 
-            RTStrPrintf(r.Pfr.aszPfrName, RT_ELEMENTS(r.Pfr.aszPfrName),
-                      "%s",
-                      com::Utf8Str(name).c_str());
-
-            RTStrPrintf(r.Pfr.aszPfrHostAddr, RT_ELEMENTS(r.Pfr.aszPfrHostAddr),
-                      "%s",
-                      com::Utf8Str(strHostAddr).c_str());
+            RTStrPrintf(r.Pfr.szPfrName, sizeof(r.Pfr.szPfrName),
+                      "%s", com::Utf8Str(name).c_str());
+
+            RTStrPrintf(r.Pfr.szPfrHostAddr, sizeof(r.Pfr.szPfrHostAddr),
+                      "%s", com::Utf8Str(strHostAddr).c_str());
 
             /* XXX: limits should be checked */
             r.Pfr.u16PfrHostPort = (uint16_t)lHostPort;
 
-            RTStrPrintf(r.Pfr.aszPfrGuestAddr, RT_ELEMENTS(r.Pfr.aszPfrGuestAddr),
-                      "%s",
-                      com::Utf8Str(strGuestAddr).c_str());
+            RTStrPrintf(r.Pfr.szPfrGuestAddr, sizeof(r.Pfr.szPfrGuestAddr),
+                      "%s", com::Utf8Str(strGuestAddr).c_str());
 
             /* XXX: limits should be checked */
@@ -347 +344 @@
                     if (   natFw.Pfr.iPfrProto == r.Pfr.iPfrProto
                         && natFw.Pfr.u16PfrHostPort == r.Pfr.u16PfrHostPort
-                        && (strncmp(natFw.Pfr.aszPfrHostAddr, r.Pfr.aszPfrHostAddr, INET6_ADDRSTRLEN) == 0)
+                        && (strncmp(natFw.Pfr.szPfrHostAddr, r.Pfr.szPfrHostAddr, INET6_ADDRSTRLEN) == 0)
                         && natFw.Pfr.u16PfrGuestPort == r.Pfr.u16PfrGuestPort
-                        && (strncmp(natFw.Pfr.aszPfrGuestAddr, r.Pfr.aszPfrGuestAddr, INET6_ADDRSTRLEN) == 0))
+                        && (strncmp(natFw.Pfr.szPfrGuestAddr, r.Pfr.szPfrGuestAddr, INET6_ADDRSTRLEN) == 0))
                     {
                         fwspec *pFwCopy = (fwspec *)RTMemAllocZ(sizeof(fwspec));
@@ -815 +812 @@
     }
 
-    pszHostAddr = natPf.Pfr.aszPfrHostAddr;
+    pszHostAddr = natPf.Pfr.szPfrHostAddr;
 
     /* XXX: workaround for inet_pton and an empty ipv4 address
@@ -830 +827 @@
                      pszHostAddr,
                      natPf.Pfr.u16PfrHostPort,
-                     natPf.Pfr.aszPfrGuestAddr,
+                     natPf.Pfr.szPfrGuestAddr,
                      natPf.Pfr.u16PfrGuestPort);
 
@@ -860 +857 @@
         if (RT_FAILURE(rc))
         {
-            LogRel(("PF: %s is ignored\n", (*it).Pfr.aszPfrName));
+            LogRel(("PF: %s is ignored\n", (*it).Pfr.szPfrName));
             continue;
         }
@@ -980 +977 @@
         for (i = 0; i < count_strs && j < RT_ELEMENTS(m_lo2off); ++i)
         {
-            char aszAddr[17];
+            char szAddr[17];
             RTNETADDRIPV4 ip4addr;
             char *pszTerm;
@@ -987 +984 @@
             const char *pszLo2Off = strLo2Off.c_str();
 
-            RT_ZERO(aszAddr);
+            RT_ZERO(szAddr);
 
             pszTerm = RTStrStr(pszLo2Off, "=");
@@ -995 +992 @@
                 continue;
 
-            memcpy(aszAddr, pszLo2Off, (pszTerm - pszLo2Off));
-            rc = RTNetStrToIPv4Addr(aszAddr, &ip4addr);
+            memcpy(szAddr, pszLo2Off, (pszTerm - pszLo2Off));
+            rc = RTNetStrToIPv4Addr(szAddr, &ip4addr);
             if (RT_FAILURE(rc))
                 continue;

trunk/src/VBox/NetworkServices/NetLib/VBoxNetPortForwardString.cpp

@@ -134 +134 @@
     Assert(cbRest || pszRaw[idxRaw - 1] == PF_FIELD_SEPARATOR); /* we are 1 char ahead */
 
-    char aszPort[10];
-    RT_ZERO(aszPort);
+    char szPort[10];
+    RT_ZERO(szPort);
 
     Assert(idxRaw > 0);
-    RTStrCopy(aszPort, RT_MIN(RT_ELEMENTS(aszPort), (size_t)(cbPort) + 1), pszRaw);
-
-    if (!(u16Port = RTStrToUInt16(aszPort)))
+    RTStrCopy(szPort, RT_MIN(sizeof(szPort), (size_t)(cbPort) + 1), pszRaw);
+
+    if (!(u16Port = RTStrToUInt16(szPort)))
         return -1;
 
@@ -236 +236 @@
     memset(pPfr, 0, sizeof(PORTFORWARDRULE));
 
-    pszHostAddr = &pPfr->aszPfrHostAddr[0];
-    pszGuestAddr = &pPfr->aszPfrGuestAddr[0];
-    pszName = &pPfr->aszPfrName[0];
+    pszHostAddr = &pPfr->szPfrHostAddr[0];
+    pszGuestAddr = &pPfr->szPfrGuestAddr[0];
+    pszName = &pPfr->szPfrName[0];
 
     cbRaw = strlen(pcszStrPortForward);

trunk/src/VBox/NetworkServices/NetLib/VBoxPortForwardString.h

@@ -38 +38 @@
 typedef struct PORTFORWARDRULE
 {
-    char aszPfrName[PF_NAMELEN];
+    char       szPfrName[PF_NAMELEN];
     /* true if ipv6 and false otherwise */
-    int fPfrIPv6;
+    int        fPfrIPv6;
     /* IPPROTO_{UDP,TCP} */
-    int iPfrProto;
+    int        iPfrProto;
     RTNETADDRU uPfrHostAddr;
-    char       aszPfrHostAddr[INET6_ADDRSTRLEN];
+    char       szPfrHostAddr[INET6_ADDRSTRLEN];
     uint16_t   u16PfrHostPort;
     RTNETADDRU uPfrGuestAddr;
-    char       aszPfrGuestAddr[INET6_ADDRSTRLEN];
+    char       szPfrGuestAddr[INET6_ADDRSTRLEN];
     uint16_t   u16PfrGuestPort;
 } PORTFORWARDRULE, *PPORTFORWARDRULE;