vbox的更動 63274 路徑 trunk/src/VBox/NetworkServices

時間撮記:

2016-8-10 下午02:17:15 (8 年 以前)

作者:

vboxsync

訊息:

VBoxNetPortForwardString.cpp: Kicked the code into being warning free (still ugly)

位置:

trunk/src/VBox/NetworkServices

檔案:

• NAT/VBoxNetLwipNAT.cpp (修改) (1 筆差異)
• NetLib/VBoxNetPortForwardString.cpp (修改) (9 筆差異)
• NetLib/VBoxPortForwardString.h (修改) (1 筆差異)

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

@@ -1341 +1341 @@
         RT_ZERO(Rule);
 
-        int rc = netPfStrToPf(com::Utf8Str(rules[idxRules]).c_str(),
-                              fIsIPv6, &Rule.Pfr);
+        int rc = netPfStrToPf(com::Utf8Str(rules[idxRules]).c_str(), fIsIPv6,
+                              &Rule.Pfr);
         if (RT_FAILURE(rc))
             continue;

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

@@ -51 +51 @@
 #define PF_STR_ADDRESS_FIELD_ENDS "]"
 
-static int netPfStrAddressParse(char *pszRaw, int cbRaw,
+
+static int netPfStrAddressParse(char *pszRaw, size_t cbRaw,
                                 char *pszAddress, int cbAddress,
                                 bool fEmptyAcceptable)
@@ -100 +101 @@
  * @param   pszRaw          The zero terminated string to parse.  Points a field
  *                          separator.
- * @param   cbRaw           Number of valid bytes in the buffer @a pszRaw points
- *                          at.  (Ignored since pszRaw is terminated.)
  * @param   pu16Port        Where to store the port number on success.
  */
-static int netPfStrPortParse(char *pszRaw, int cbRaw, uint16_t *pu16Port)
+static int netPfStrPortParse(char *pszRaw, uint16_t *pu16Port)
 {
 #if 1
@@ -121 +120 @@
     if (*pu16Port == 0)
         return -1;
-    Assert((uinpttr_t)pszNext <= (uintptr_t)&pszRaw[cbRaw]); NOREF(cbRaw);
     return (int)(pszNext - pszRaw);
 
@@ -180 +178 @@
 
 
-static int netPfStrAddressPortPairParse(char *pszRaw, int cbRaw,
+static int netPfStrAddressPortPairParse(char *pszRaw, size_t cbRaw,
                                         char *pszAddress, int cbAddress,
                                         bool fEmptyAddressAcceptable,
@@ -228 +226 @@
     if (pszRaw[0] == PF_FIELD_SEPARATOR)
     {
-        idxRaw = netPfStrPortParse(pszRaw, strlen(pszRaw), pu16Port);
+        idxRaw = netPfStrPortParse(pszRaw, pu16Port);
 
         Assert(strlen(&pszRaw[idxRaw]) == 0 || pszRaw[idxRaw] == PF_FIELD_SEPARATOR);
@@ -244 +242 @@
 /* XXX: Having fIPv6 we might emprove adress verification comparing address length
  * with INET[6]_ADDRLEN
+ *
  */
-int netPfStrToPf(const char *pcszStrPortForward, int fIPv6, PPORTFORWARDRULE pPfr)
+int netPfStrToPf(const char *pcszStrPortForward, bool fIPv6, PPORTFORWARDRULE pPfr)
 {
-    char *pszName;
+/** r=bird: Redo from scratch?  This is very hard to read. */
+
     int  proto;
-    char *pszHostAddr;
-    char *pszGuestAddr;
     uint16_t u16HostPort;
     uint16_t u16GuestPort;
     bool fTcpProto = false;
 
-    char *pszRawBegin = NULL;
-    char *pszRaw = NULL;
     int idxRaw = 0;
     int cbToken = 0;
-    int cbRaw = 0;
-    int rc = VINF_SUCCESS;
 
     AssertPtrReturn(pcszStrPortForward, VERR_INVALID_PARAMETER);
@@ -267 +261 @@
     RT_ZERO(*pPfr);
 
-    pszHostAddr = &pPfr->szPfrHostAddr[0];
-    pszGuestAddr = &pPfr->szPfrGuestAddr[0];
-    pszName = &pPfr->szPfrName[0];
-
-    cbRaw = strlen(pcszStrPortForward);
+    char *pszHostAddr = &pPfr->szPfrHostAddr[0];
+    char *pszGuestAddr = &pPfr->szPfrGuestAddr[0];
+    char *pszName = &pPfr->szPfrName[0];
+
+    size_t cbRaw = strlen(pcszStrPortForward);
 
     /* Minimal rule ":tcp:[]:0:[]:0" has got lenght 14 */
     AssertReturn(cbRaw > 14, VERR_INVALID_PARAMETER);
 
-    pszRaw = RTStrDup(pcszStrPortForward);
+    char *pszRaw = RTStrDup(pcszStrPortForward);
     AssertReturn(pszRaw, VERR_NO_MEMORY);
 
-    pszRawBegin = pszRaw;
+    char *pszRawBegin = pszRaw;
 
     /* name */
@@ -290 +284 @@
             goto invalid_parameter;
 
-        cbToken = (pszEndOfName) - pszRaw; /* don't take : into account */
+        cbToken = pszEndOfName - pszRaw; /* don't take : into account */
         /* XXX it's unacceptable to have only name entry in PF */
         AssertReturn(cbToken < cbRaw, VERR_INVALID_PARAMETER);
@@ -326 +320 @@
 
     idxRaw = netPfStrAddressPortPairParse(pszRaw, cbRaw,
-                                         pszHostAddr, INET6_ADDRSTRLEN,
-                                         true, &u16HostPort);
+                                          pszHostAddr, INET6_ADDRSTRLEN,
+                                          true, &u16HostPort);
     if (idxRaw < 0)
         return VERR_INVALID_PARAMETER;

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

@@ -49 +49 @@
 } PORTFORWARDRULE, *PPORTFORWARDRULE;
 
-int netPfStrToPf(const char *pcszStrPortForward,int fIPv6, PPORTFORWARDRULE pPfr);
+int netPfStrToPf(const char *pszStrPortForward, bool fIPv6, PPORTFORWARDRULE pPfr);
 
 RT_C_DECLS_END