Changeset 39774 in vbox for trunk/src/VBox/Devices

Timestamp:

Jan 17, 2012 4:13:45 AM (13 years ago)

Author:

vboxsync

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

75719

Message:

NAT: backed out r75718.

File:

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

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

@@ -30 +30 @@
 #define DNS_CONTROL_PORT_NUMBER 53
 /* see RFC 1035(4.1.1) */
-#pragma pack(1)
 union dnsmsg_header
 {
     struct
     {
-        uint16_t id;
+        unsigned id:16;
         unsigned rd:1;
         unsigned tc:1;
@@ -49 +48 @@
         uint16_t arcount;
     } X;
-    uint16_t raw[5];
+    uint16_t raw[6];
 };
-#pragma pack()
 AssertCompileSize(union dnsmsg_header, 12);
 
@@ -101 +99 @@
 {
     int i;
-    LogFlowFunc(("ENTER: pszQname:%s\n", pszQname));
-    pHdr->X.qr = 1; /* response */
+
     if (!pHostent)
     {
+        pHdr->X.qr = 1; /* response */
         pHdr->X.aa = 1;
         pHdr->X.rd = 1;
@@ -191 +189 @@
         pIp->ip_len = htons(packet_len);
     }
-    LogFlowFuncLeave();
 }
 
@@ -207 +204 @@
     struct udphdr *udp = NULL;
     union dnsmsg_header *pHdr = NULL;
-    LogFlowFuncEnter();
     NOREF(la);
     NOREF(ah);
@@ -214 +210 @@
 
     if (pHdr->X.qr == 1)
-    {
-        LogFlowFunc(("pHdr(X.qr:%d, raw:%RX16)\n", pHdr->X.qr, pHdr->raw));
-        LogFlowFuncLeave();
         return 0; /* this is respose */
-    }
 
     memset(pszCname, 0, sizeof(pszCname));
@@ -231 +223 @@
             fMultiWarn = true;
         }
-        LogFlowFuncLeave();
         return 1;
     }
@@ -272 +263 @@
     pIp->ip_sum = 0;
     pIp->ip_sum = LibAliasInternetChecksum(la, (uint16_t *)pIp, pIp->ip_hl << 2);
-    LogFlowFuncLeave();
     return 0;
 }
@@ -404 +394 @@
             if (!strcmp(pDNSMapingEntry->pszCName, *pszAlias))
             {
-                /*
-                 * we need add mappings for real host name, instead of using alias.
-                 * DNS server doesn't return alias list on real name request.
-                 */
+
                 PDNSMAPPINGENTRY pDnsMapping = RTMemAllocZ(sizeof(DNSMAPPINGENTRY));
                 fMatch = true;