Changeset 63921 in vbox for trunk/src/VBox/Devices/Network/slirp

Timestamp:

Sep 21, 2016 1:06:12 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

110804

Message:

NAT: strip comment before processing resolv.conf line to simplify
things a bit.

Note: This is not how ad-hoc parser in bind's res_init.c does it, btw,
so this code will accept more input as valid compared to res_init.
E.g. "nameserver 1.1.1.1; comment" is misparsed by res_init.

File:

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

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

@@ -157 +157 @@
         }
 
+        /*
+         * Strip comment if present.
+         *
+         * This is not how ad-hoc parser in bind's res_init.c does it,
+         * btw, so this code will accept more input as valid compared
+         * to res_init.  (e.g. "nameserver 1.1.1.1; comment" is
+         * misparsed by res_init).
+         */
+        for (s = buf; *s != '\0'; ++s)
+        {
+            if (*s == '#' || *s == ';')
+            {
+                *s = '\0';
+                break;
+            }
+        }
 
         tok = getToken(buf, &s);
-
-        /* no more tokens or a comment */
-#       define NO_VALUE(tok)  (tok == NULL || tok[0] == '#' || tok[0] == ';')
-
-        if (NO_VALUE(tok))
+        if (tok == NULL)
             continue;
 
@@ -194 +206 @@
              */
             tok = getToken(NULL, &s);
-            if (NO_VALUE(tok))
+            if (tok == NULL)
             {
                 LogRel(("NAT: resolv.conf: nameserver line without value\n"));
@@ -252 +264 @@
 
             tok = getToken(NULL, &s);
-            if (!NO_VALUE(tok))
+            if (tok != NULL)
                 LogRel(("NAT: resolv.conf: ignoring unexpected trailer on the nameserver line\n"));
 
@@ -304 +316 @@
 
             tok = getToken(NULL, &s);
-            if (NO_VALUE(tok))
+            if (tok == NULL)
             {
                 LogRel(("NAT: resolv.conf: port line without value\n"));
@@ -336 +348 @@
 
             tok = getToken(NULL, &s);
-            if (NO_VALUE(tok))
+            if (tok == NULL)
             {
                 LogRel(("NAT: resolv.conf: domain line without value\n"));
@@ -362 +374 @@
         if (RTStrCmp(tok, "search") == 0)
         {
-            while ((tok = getToken(NULL, &s)) && !NO_VALUE(tok))
+            while ((tok = getToken(NULL, &s)) && tok != NULL)
             {
                 i = state->rcps_num_searchlist;