Changeset 29855 in vbox for trunk

Timestamp:

May 28, 2010 9:49:58 AM (15 years ago)

Author:

vboxsync

Message:

NAT: nits and a range fix

File:

• trunk/src/VBox/Devices/Network/slirp/slirp.c (modified) (4 diffs)

trunk/src/VBox/Devices/Network/slirp/slirp.c

@@ -420 +420 @@
     char buff2[256];
     RTFILE f;
-    int fFoundNameserver = 0;
+    int cNameserversFound = 0;
     int fWarnTooManyDnsServers = 0;
     struct in_addr tmp_addr;
@@ -469 +469 @@
 
     Log(("NAT: DNS Servers:\n"));
-    while (    RT_SUCCESS(rc = RTFileGets(f, buff, 512, &bytes))
+    while (    RT_SUCCESS(rc = RTFileGets(f, buff, sizeof(buff), &bytes))
             && rc != VERR_EOF)
     {
         struct dns_entry *pDns = NULL;
-        if (   fFoundNameserver == 4 
+        if (   cNameserversFound == 4 
             && fWarnTooManyDnsServers == 0
-            && sscanf(buff, "nameserver%*[ \t]%256s", buff2) == 1)
+            && sscanf(buff, "nameserver%*[ \t]%255s", buff2) == 1)
         {
             fWarnTooManyDnsServers = 1;
             LogRel(("NAT: too many nameservers registered.\n"));
         }
-        if (   sscanf(buff, "nameserver%*[ \t]%256s", buff2) == 1 
-            && fFoundNameserver < 4) /* Unix doesn't accept more than 4 name servers*/
+        if (   sscanf(buff, "nameserver%*[ \t]%255s", buff2) == 1 
+            && cNameserversFound < 4) /* Unix doesn't accept more than 4 name servers*/
         {
             if (!inet_aton(buff2, &tmp_addr))
@@ -501 +501 @@
             }
             TAILQ_INSERT_HEAD(&pData->pDnsList, pDns, de_list);
-            fFoundNameserver++;
+            cNameserversFound++;
         }
         if ((!strncmp(buff, "domain", 6) || !strncmp(buff, "search", 6)))
@@ -534 +534 @@
     }
     RTFileClose(f);
-    if (!fFoundNameserver)
+    if (!cNameserversFound)
         return -1;
     return 0;