Changeset 33953 in vbox

Timestamp:

Nov 11, 2010 7:47:27 AM (14 years ago)

Author:

vboxsync

Message:

NAT/libalias: fixes issue with wrong type of query header in DNS respose, when host resolver mode is switched on (please see vbox/#7679 for details).

File:

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

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

@@ -86 +86 @@
 }
 
-static void doanswer(struct libalias *la, union dnsmsg_header *hdr,char *qname, struct ip *pip, struct hostent *h)
+static void doanswer(struct libalias *la, union dnsmsg_header *hdr, uint16_t qtype, uint16_t qclass, char *qname, struct ip *pip, struct hostent *h)
 {
     int i;
@@ -121 +121 @@
         query += strlen(qname) + 1;
 
-        *(uint16_t *)query = htons(1);
-        ((uint16_t *)query)[1] = htons(1);
+        *(uint16_t *)query = qtype;
+        ((uint16_t *)query)[1] = qclass;
         answers = (char *)&((uint16_t *)query)[2];
 
@@ -199 +199 @@
     qw_qname = (char *)&hdr[1];
     Assert((ntohs(hdr->X.qdcount) == 1));
+    if ((ntohs(hdr->X.qdcount) != 1))
+    {
+        LogRel(("NAT:alias_dns: multiple quieries isn't supported\n"));
+        return 1;
+    }
 
     for (i = 0; i < ntohs(hdr->X.qdcount); ++i)
@@ -206 +211 @@
         fprintf(stderr, "qname:%s qtype:%hd qclass:%hd\n",
             qw_qname, ntohs(*qw_qtype), ntohs(*qw_qclass));
-    }
-
-    QStr2CStr(qw_qname, cname, sizeof(cname));
-    cname_len = RTStrNLen(cname, sizeof(cname));
-    /* Some guests like win-xp adds _dot_ after host name
-     * and after domain name (not passed with host resolver)
-     * that confuses host resolver.
-     */
-    if (   cname_len > 2
-        && cname[cname_len - 1] == '.'
-        && cname[cname_len - 2] == '.')
-    {
-        cname[cname_len - 1] = 0;
-        cname[cname_len - 2] = 0;
-    }
-    h = gethostbyname(cname);
-    fprintf(stderr, "cname:%s\n", cname);
-    doanswer(la, hdr, qw_qname, pip, h);
+
+        QStr2CStr(qw_qname, cname, sizeof(cname));
+        cname_len = RTStrNLen(cname, sizeof(cname));
+        /* Some guests like win-xp adds _dot_ after host name
+         * and after domain name (not passed with host resolver)
+         * that confuses host resolver.
+         */
+        if (   cname_len > 2
+            && cname[cname_len - 1] == '.'
+            && cname[cname_len - 2] == '.')
+        {
+            cname[cname_len - 1] = 0;
+            cname[cname_len - 2] = 0;
+        }
+        h = gethostbyname(cname);
+        fprintf(stderr, "cname:%s\n", cname);
+        doanswer(la, hdr, *qw_qtype, *qw_qclass, qw_qname, pip, h);
+    }
 
     /*