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

Timestamp:

May 25, 2009 2:29:12 AM (16 years ago)

Author:

vboxsync

Message:

NAT: fix of vbox.org/4091 change list to queue to feed dhcp client with

rigth order of DNS servers

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• bootp.c (modified) (1 diff)
• dnsproxy/dnsproxy.c (modified) (2 diffs)
• slirp.c (modified) (3 diffs)
• slirp_state.h (modified) (1 diff)

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

@@ -331 +331 @@
 
 
-        if (!LIST_EMPTY(&pData->dns_list_head)) 
-        {
-            de = LIST_FIRST(&pData->dns_list_head);
+        if (!TAILQ_EMPTY(&pData->dns_list_head)) 
+        {
+            de = TAILQ_LAST(&pData->dns_list_head, dns_list_head);
             q_dns_header = q;
             FILL_BOOTP_EXT(q, RFC1533_DNS, 4, &de->de_addr.s_addr);
         }
 
-        LIST_FOREACH(de, &pData->dns_list_head, de_list)
-        {
-            if (LIST_FIRST(&pData->dns_list_head) == de)
+        TAILQ_FOREACH_REVERSE(de, &pData->dns_list_head, dns_list_head, de_list)
+        {
+            if (TAILQ_LAST(&pData->dns_list_head, dns_list_head) == de)
                 continue; /* first value with head we've ingected before */
             FILL_BOOTP_APP(q_dns_header, q, RFC1533_DNS, 4, &de->de_addr.s_addr);

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

@@ -106 +106 @@
     struct request *req = (struct request *)arg;
     struct dns_entry *de;
-    de = LIST_NEXT(req->dns_server, de_list);
+    de = TAILQ_PREV(req->dns_server, dns_list_head, de_list);
     /* here we should check if we reached the end of the DNS server list */
     if (de == NULL)
@@ -269 +269 @@
         memcpy(&req->client, &fromaddr, sizeof(struct sockaddr_in));
         memcpy(&req->clientid, &buf[0], 2);
-        req->dns_server = LIST_FIRST(&pData->dns_list_head);
+        req->dns_server = TAILQ_LAST(&pData->dns_list_head, dns_list_head);
         if (req->dns_server == NULL)
         {

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

@@ -377 +377 @@
                 da->de_addr.s_addr = ((struct sockaddr_in *)saddr)->sin_addr.s_addr;
             }
-            LIST_INSERT_HEAD(&pData->dns_list_head, da, de_list);
+            TAILQ_INSERT_HEAD(&pData->dns_list_head, da, de_list);
 
             if (addr->DnsSuffix == NULL)
@@ -583 +583 @@
 static int slirp_init_dns_list(PNATState pData)
 {
-    LIST_INIT(&pData->dns_list_head);
+    TAILQ_INIT(&pData->dns_list_head);
     LIST_INIT(&pData->dns_domain_list_head);
     return get_dns_addr_domain(pData, true, NULL, NULL);
@@ -592 +592 @@
     struct dns_entry *de = NULL;
     struct dns_domain_entry *dd = NULL;
-    while(!LIST_EMPTY(&pData->dns_domain_list_head)) {
-        dd = LIST_FIRST(&pData->dns_domain_list_head);
-        LIST_REMOVE(dd, dd_list);
-        if (dd->dd_pszDomain != NULL)
-            RTStrFree(dd->dd_pszDomain);
-        RTMemFree(dd);
+    while(!TAILQ_EMPTY(&pData->dns_list_head)) {
+        de = TAILQ_FIRST(&pData->dns_list_head);
+        TAILQ_REMOVE(&pData->dns_list_head, de, de_list);
+        RTMemFree(de);
     }
     while(!LIST_EMPTY(&pData->dns_domain_list_head)) {

trunk/src/VBox/Devices/Network/slirp/slirp_state.h

@@ -70 +70 @@
 {
         struct in_addr de_addr;
-        LIST_ENTRY(dns_entry) de_list;
+        TAILQ_ENTRY(dns_entry) de_list;
 };
-LIST_HEAD(dns_list_head, dns_entry);
+TAILQ_HEAD(dns_list_head, dns_entry);
 #endif