Changeset 63913 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Sep 20, 2016 12:31:51 PM (8 years ago)

Author:

vboxsync

Message:

NAT: don't stop parsing if we are out of buffer space for search
domains. LogRel search domains we've dropped b/c we didn't have
buffer space for them.

File:

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

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

@@ -362 +362 @@
         if (RTStrCmp(tok, "search") == 0)
         {
-            if (cbSearchBuf == 0)
-            {
-                LogRel(("NAT: resolv.conf: no buffer space, ignoring search list %s\n", s));
-                break;
-            }
-
             while ((tok = getToken(NULL, &s)) && !NO_VALUE(tok))
             {
@@ -377 +371 @@
                 }
 
-                Log2(("NAT: resolv.conf: saving search @%td,+%zu\n",
-                      pszSearchBuf - state->rcps_searchlist_buffer, cbSearchBuf));
+                Log2(("NAT: resolv.conf: saving search %s @%td,+%zu\n",
+                      tok, pszSearchBuf - state->rcps_searchlist_buffer, cbSearchBuf));
                 state->rcps_searchlist[i] = pszSearchBuf;
                 rc = RTStrCopyP(&pszSearchBuf, &cbSearchBuf, tok);
@@ -390 +384 @@
                 else
                 {
-                    Log2(("NAT: resolv.conf: truncated: %s\n", tok));
+                    LogRel(("NAT: resolv.conf: no buffer space, ignoring search domain %s\n", tok));
                     pszSearchBuf = state->rcps_searchlist[i];
                     cbSearchBuf = sizeof(state->rcps_searchlist_buffer)