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

Timestamp:

Mar 4, 2009 7:28:34 PM (16 years ago)

Author:

vboxsync

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

43761

Message:

NAT: dns proxy functions fine. the time out and switch to next server should be bit tested

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• slirp.c (modified) (1 diff)
• socket.c (modified) (1 diff)
• socket.h (modified) (1 diff)
• udp.c (modified) (1 diff)

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

@@ -865 +865 @@
                 if (so->so_expire <= curtime)
                 {
+#ifdef VBOX_WITH_SLIRP_DNS_PROXY
+                    Log2(("NAT: %R[natsock] expired\n", so));
+                    if (so->so_timeout != NULL) 
+                    {
+                        so->so_timeout(pData, so, so->so_timeout_arg);
+                    } 
+#endif
 #ifdef VBOX_WITH_SLIRP_MT
                     /* we need so_next for continue our cycle*/

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

@@ -579 +579 @@
              *  Note: Here we can't check if dnsproxy's sent initial request
              */
-            dnsproxy_answer(pData, so, m, sizeof(struct ip));  
+            if (so->so_fport == htons(53))
+                dnsproxy_answer(pData, so, m);  
 #endif
 

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

@@ -81 +81 @@
 # endif /* RT_OS_WINDOWS */
 #endif /* VBOX_WITH_SIMPLIFIED_SLIRP_SYNC */
+#ifdef VBOX_WITH_SLIRP_DNS_PROXY
+    void (* so_timeout)(PNATState pData, struct socket *so, void *arg);
+    void *so_timeout_arg;
+#endif
 };
 

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

@@ -402 +402 @@
             SOCKET_LOCK_CREATE(so);
             QSOCKET_LOCK(udb);
-            insque(pData, so,&udb);
+            insque(pData, so, &udb);
             NSOCK_INC();
             QSOCKET_UNLOCK(udb);