Changeset 43214 in vbox for trunk/src/VBox/ExtPacks/VNC

Timestamp:

Sep 6, 2012 9:16:55 AM (12 years ago)

Author:

vboxsync

Message:

RTStrIsIpAddr[46] -> RTNetIsIpv\1AddrStr; made the buggers return bool like predicate functions shall.

File:

• trunk/src/VBox/ExtPacks/VNC/VBoxVNC.cpp (modified) (6 diffs)

trunk/src/VBox/ExtPacks/VNC/VBoxVNC.cpp

@@ -497 +497 @@
     }
 
-    rc = RTStrIsIpAddr4(pszTCPAddress);
-
-    if (RT_SUCCESS(rc))
+    if (RTNetIsIPv4AddrStr(pszTCPAddress))
     {
         pszServerAddress4 = pszTCPAddress;
@@ -511 +509 @@
         }
 
-        rc = RTStrIsIpAddr6(pszVNCAddress6, NULL, 0, true, true);
-
-        if (RT_SUCCESS(rc))
-        {
+        if (RTNetIsIPv6AddrStr(pszVNCAddress6))
             pszServerAddress6 = pszVNCAddress6;
-
-        }
         else
-        {
             pszServerAddress6 = szIPv6ListenAll;
-        }
 
         if (strlen(pszVNCPort6) > 0)
@@ -534 +525 @@
     }
 
-    rc = RTStrIsIpAddr6(pszTCPAddress, NULL, 0, true, true);
-
-    if (RT_SUCCESS(rc))
+    if (RTNetIsIPv6AddrStr(pszTCPAddress))
     {
         pszServerAddress6 = pszTCPAddress;
@@ -548 +537 @@
         }
 
-        rc = RTStrIsIpAddr4(pszVNCAddress4);
-
-        if (RT_SUCCESS(rc))
-        {
+        if (RTNetIsIPv4AddrStr(pszVNCAddress4))
             pszServerAddress4 = pszVNCAddress4;
-
-        }
         else
-        {
             pszServerAddress4 = szIPv4ListenAll;
-        }
 
         if (strlen(pszVNCPort4) > 0)
@@ -637 +619 @@
     if (!pszServerAddress4)
     {
-        rc = RTStrIsIpAddr4(pszVNCAddress4);
-
-        if (RT_SUCCESS(rc))
+        if (RTNetIsIPv4AddrStr(pszVNCAddress4))
             pszServerAddress4 = pszVNCAddress4;
         else
@@ -646 +626 @@
     if (!pszServerAddress6)
     {
-        rc = RTStrIsIpAddr6(pszVNCAddress6, NULL, 0, true, true);
-
-        if (RT_SUCCESS(rc))
+        if (RTNetIsIPv6AddrStr(pszVNCAddress6))
             pszServerAddress6 = pszVNCAddress6;
         else