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

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/NetLib

Files:

• VBoxNetBaseService.cpp (modified) (3 diffs)
• VBoxNetPortForwardString.cpp (modified) (23 diffs)
• VBoxPortForwardString.h (modified) (1 diff)

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

@@ -102 +102 @@
     m_Name                  = "VBoxNetNAT";
     m_Network               = "intnet";
-   
+
     for(unsigned int i = 0; i < RT_ELEMENTS(g_aGetOptDef); ++i)
         m_vecOptionDefs.push_back(&g_aGetOptDef[i]);
@@ -392 +392 @@
     /* Commit */
     IntNetRingCommitFrame(&m_pIfBuf->Send, pHdr);
-   
+
     LogFlowFuncLeaveRC(rc);
     return rc;
@@ -428 +428 @@
         va_list vaCopy;                 /* This dude is *very* special, thus the copy. */
         va_copy(vaCopy, va);
-        RTStrmPrintf(g_pStdErr, "%s: %s: %N\n", 
+        RTStrmPrintf(g_pStdErr, "%s: %s: %N\n",
                      RTProcShortName(),
                      iMinLevel >= 2 ? "debug" : "info",

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

@@ -50 +50 @@
 #define PF_STR_ADDRESS_FIELD_ENDS "]"
 
-static int netPfStrAddressParse(char *pszRaw, int cbRaw, 
+static int netPfStrAddressParse(char *pszRaw, int cbRaw,
                                 char *pszAddress, int cbAddress,
                                 bool fEmptyAcceptable)
@@ -66 +66 @@
         pszRaw++;
         cbRaw--;
-        
+
 
         /* we shouldn't face with ending here */
@@ -72 +72 @@
 
         char *pszEndOfAddress = RTStrStr(pszRaw, PF_STR_ADDRESS_FIELD_ENDS);
-        
+
         /* no pair closing sign */
         AssertPtrReturn(pszEndOfAddress, VERR_INVALID_PARAMETER);
-                        
+
         cbField = pszEndOfAddress - pszRaw;
-        
+
         /* field should be less then the rest of the string */
         AssertReturn(cbField < cbRaw, VERR_INVALID_PARAMETER);
-        
+
         if (cbField != 0)
             RTStrCopy(pszAddress, RT_MIN(cbField + 1, cbAddress), pszRaw);
@@ -89 +89 @@
     AssertReturn(pszRaw[cbField] == PF_ADDRESS_FIELD_ENDS, -1);
 
-    return cbField + 2; /* length of the field and closing braces */ 
+    return cbField + 2; /* length of the field and closing braces */
 }
 
@@ -113 +113 @@
         cbRest = strlen(pszRaw);
 
-        Assert(cbRaw == cbRest); 
-        
+        Assert(cbRaw == cbRest);
+
         /* XXX: Assumption that if string is too big, it will be reported by
          * RTStrToUint16.
@@ -142 +142 @@
     if (!(u16Port = RTStrToUInt16(aszPort)))
         return -1;
-    
+
     *pu16Port = u16Port;
 
@@ -149 +149 @@
 
 
-static int netPfStrAddressPortPairParse(char *pszRaw, int cbRaw, 
-                                        char *pszAddress, int cbAddress, 
+static int netPfStrAddressPortPairParse(char *pszRaw, int cbRaw,
+                                        char *pszAddress, int cbAddress,
                                         bool fEmptyAddressAcceptable,
                                         uint16_t *pu16Port)
@@ -173 +173 @@
     if (pszRaw[0] == PF_ADDRESS_FIELD_STARTS)
     {
-        idxRaw += netPfStrAddressParse(pszRaw, 
-                                       cbRaw - idxRaw, 
+        idxRaw += netPfStrAddressParse(pszRaw,
+                                       cbRaw - idxRaw,
                                        pszAddress,
                                        cbAddress,
@@ -184 +184 @@
     }
     else return -1;
-                    
+
     pszRaw += idxRaw;
     idxRawTotal += idxRaw;
@@ -190 +190 @@
 
     AssertReturn(cbRaw > 0, VERR_INVALID_PARAMETER);
-    
+
     idxRaw = 0;
 
@@ -211 +211 @@
 }
 
-/* XXX: Having fIPv6 we might emprove adress verification comparing address length 
+/* XXX: Having fIPv6 we might emprove adress verification comparing address length
  * with INET[6]_ADDRLEN
  */
@@ -224 +224 @@
     bool fTcpProto = false;
 
-    char *pszRawBegin = NULL; 
+    char *pszRawBegin = NULL;
     char *pszRaw = NULL;
     int idxRaw = 0;
@@ -240 +240 @@
     pszName = &pPfr->aszPfrName[0];
 
-    cbRaw = strlen(pcszStrPortForward); 
+    cbRaw = strlen(pcszStrPortForward);
 
     /* Minimal rule ":tcp:[]:0:[]:0" has got lenght 14 */
     AssertReturn(cbRaw > 14, VERR_INVALID_PARAMETER);
-    
+
     pszRaw = RTStrDup(pcszStrPortForward);
 
@@ -252 +252 @@
 
     /* name */
-    if (pszRaw[idxRaw] == PF_FIELD_SEPARATOR) 
+    if (pszRaw[idxRaw] == PF_FIELD_SEPARATOR)
         idxRaw = 1; /* begin of the next segment */
     else
@@ -263 +263 @@
         /* XXX it's unacceptable to have only name entry in PF */
         AssertReturn(cbToken < cbRaw, VERR_INVALID_PARAMETER);
-        
+
         if (   cbToken < 0
             || (size_t)cbToken >= PF_NAMELEN)
             goto invalid_parameter;
 
-        RTStrCopy(pszName, 
-                  RT_MIN((size_t)cbToken + 1, PF_NAMELEN), 
+        RTStrCopy(pszName,
+                  RT_MIN((size_t)cbToken + 1, PF_NAMELEN),
                   pszRaw);
         pszRaw += cbToken; /* move to separator */
     }
-    
+
     AssertReturn(pszRaw[0] == PF_FIELD_SEPARATOR, VERR_INVALID_PARAMETER);
     /* protocol */
@@ -279 +279 @@
     pszRaw++; /* skip separator */
     idxRaw = 0;
-    
+
     cbRaw--;
 
@@ -291 +291 @@
     else
         goto invalid_parameter;
-                    
+
     pszRaw += idxRaw;
     cbRaw -= idxRaw;
     idxRaw = 0;
-                    
-    idxRaw = netPfStrAddressPortPairParse(pszRaw, cbRaw, 
+
+    idxRaw = netPfStrAddressPortPairParse(pszRaw, cbRaw,
                                          pszHostAddr, INET6_ADDRSTRLEN,
                                          true, &u16HostPort);
@@ -309 +309 @@
     idxRaw = 0;
 
-    idxRaw = netPfStrAddressPortPairParse(pszRaw, cbRaw, 
-                                          pszGuestAddr, 
+    idxRaw = netPfStrAddressPortPairParse(pszRaw, cbRaw,
+                                          pszGuestAddr,
                                           INET6_ADDRSTRLEN,
                                           false,
@@ -322 +322 @@
     pPfr->iPfrProto = proto;
 
-    
+
     if (strlen(pszHostAddr))
     {
@@ -335 +335 @@
             goto invalid_parameter;
     }
-    
+
     pPfr->u16PfrHostPort = u16HostPort;
 
@@ -341 +341 @@
     {
         if (!fIPv6)
-            rc = RTNetStrToIPv4Addr(pszGuestAddr, &pPfr->uPfrGuestAddr.IPv4);       
+            rc = RTNetStrToIPv4Addr(pszGuestAddr, &pPfr->uPfrGuestAddr.IPv4);
 #if 0
         else
@@ -351 +351 @@
     else
         goto invalid_parameter; /* guest address should be defined */
-    
+
     pPfr->u16PfrGuestPort = u16GuestPort;
-    
+
     Log(("name: %s\n"
          "proto: %d\n"
@@ -366 +366 @@
     RTStrFree(pszRawBegin);
     return VINF_SUCCESS;
-    
+
 invalid_parameter:
     RTStrFree(pszRawBegin);

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

@@ -26 +26 @@
 #define PF_NAMELEN 64
 /*
- * TBD: Here is shared implementation of parsing port-forward string 
+ * TBD: Here is shared implementation of parsing port-forward string
  * of format:
  *      name:[ipv4 or ipv6 address]:host-port:[ipv4 or ipv6 guest addr]:guest port
- * 
- * This code supposed to be used in NetService and Frontend and perhaps in corresponding 
+ *
+ * This code supposed to be used in NetService and Frontend and perhaps in corresponding
  * services.
  *