Changeset 23155 in vbox

Timestamp:

09/19/2009 11:40:34 AM (8 years ago)

Author:

vboxsync

Message:

NAT: alias_dns doesn't require dtom any more, update of
corresponded mbufs happens on LibAliasIn exits

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• ip_input.c (modified) (1 diff)
• libalias/alias_dns.c (modified) (4 diffs)

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

@@ -112 +112 @@
         STAM_PROFILE_STOP(&pData->StatALIAS_input, a);
         Log2(("NAT: LibAlias return %d\n", rc));
+        if (m->m_len != ntohs(ip->ip_len))
+        {
+            m->m_len = ntohs(ip->ip_len);
+        }
     }
 

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

@@ -73 +73 @@
     else
     {
-        /*!!! We need to be sure that */
-        struct mbuf *m = NULL;
         char *query;
         char *answers;
@@ -83 +81 @@
         uint16_t addr_off = (uint16_t)~0;
         
-#ifndef VBOX_WITH_SLIRP_BSD_MBUF
-        m = dtom(la->pData, hdr); 
-#else
-        AssertMsgFailed(("Unimplemented"));
-#endif
-        Assert((m));
-        
 #if 0
         /*here is no compressed names+answers + new query*/
@@ -96 +87 @@
         packet_len = (pip->ip_hl << 2) + sizeof(struct udphdr) + sizeof(union dnsmsg_header) 
             + strlen(qname) +  2 * sizeof(uint16_t); /* ip + udp + header + query */
-        fprintf(stderr,"got %d addresses for target:%s (m_len: %d)\n", h->h_length, h->h_name, m->m_len);
         query = (char *)&hdr[1];
 
@@ -156 +146 @@
         HTONS(hdr->X.ancount);
         /*don't forget update m_len*/
-        m->m_len = packet_len;
-        pip->ip_len = htons(m->m_len);
+        pip->ip_len = htons(packet_len);
     }
 }