Changeset 45323 in vbox for trunk/src

Timestamp:

Apr 4, 2013 4:59:29 AM (12 years ago)

Author:

vboxsync

Message:

NAT:dnsproxy: handling return from so_timeout callback.
1st condition handle the case when dnsproxy already detached expired socket (not in this version).

2nd condition checks so_timeout if dnsproxy's dropped so_timeout from current socket it could be detached (previously dnsproxy queried next nameserver using new socket).

File:

• trunk/src/VBox/Devices/Network/slirp/slirp.c (modified) (1 diff)

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

@@ -737 +737 @@
                 if (so->so_timeout != NULL)
                 {
+                    /* so_timeout - might change the so_expire value or 
+                     * drop so_timeout* from so. 
+                     */
                     so->so_timeout(pData, so, so->so_timeout_arg);
+                    /* on 4.2 so->  
+                     */
+                    if (   so_next->so_prev != so /* so_timeout freed the socket */
+                        || so->so_timeout)  /* so_timeout just freed so_timeout */
+                      CONTINUE_NO_UNLOCK(udp);
                 }
                 UDP_DETACH(pData, so, so_next);