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

Timestamp:

Dec 9, 2008 1:47:04 PM (16 years ago)

Author:

vboxsync

Message:

slirp: properly finish the icmp socket

File:

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

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

@@ -365 +365 @@
 udp_detach(PNATState pData, struct socket *so)
 {
-        /* Correctly update list if detaching last socket in list. */
-        if (so == udp_last_so) udp_last_so = &udb;
 #ifndef VBOX_WITH_SLIRP_ICMP
-        closesocket(so->s);
-        /* if (so->so_m) m_free(so->so_m);    done by sofree */
-
+    closesocket(so->s);
+    sofree(pData, so);
+#else /*! VBOX_WITH_SLIRP_ICMP */
+    closesocket(so->s);
+    if (so == &pData->icmp_socket)
+    {
+        if (so == udp_last_so)
+            udp_last_so = &udb;
+        if (so->so_next && so->so_prev)
+            remque(pData, so);
+    }
+    else
         sofree(pData, so);
-#else /*! VBOX_WITH_SLIRP_ICMP */
-        if (so != &pData->icmp_socket) {
-            closesocket(so->s);
-            sofree(pData, so);
-        }
 #endif /* VBOX_WITH_SLIRP_ICMP */
 }