Changeset 16449 in vbox for trunk/src/VBox

Timestamp:

Feb 2, 2009 6:03:10 AM (16 years ago)

Author:

vboxsync

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

42317

Message:

NAT:MT connection closing is working now

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• slirp.c (modified) (2 diffs)
• socket.c (modified) (1 diff)
• socket.h (modified) (1 diff)
• tcp_input.c (modified) (2 diffs)
• tcp_subr.c (modified) (1 diff)
• udp.c (modified) (1 diff)

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

@@ -800 +800 @@
         /* { */
 
+#ifdef VBOX_WITH_SLIRP_MT
+            if (   so->so_state & SS_NOFDREF 
+                && so->so_deleted == 1) 
+            {   
+                struct socket *son, *sop = NULL;
+                QSOCKET_LOCK(tcb);
+                if (so->so_next != NULL) 
+                {
+                    if (so->so_next != &tcb)
+                        SOCKET_LOCK(so->so_next);
+                    son = so->so_next;
+                }
+                if (    so->so_prev != &tcb
+                    && so->so_prev != NULL) 
+                {
+                    SOCKET_LOCK(so->so_prev);
+                    sop = so->so_prev;
+                }
+                QSOCKET_UNLOCK(tcb);
+                remque(pData, so);
+                SOCKET_UNLOCK(so);
+                SOCKET_LOCK_DESTROY(so);
+                RTMemFree(so);
+                so_next = son;
+                if (sop != NULL)
+                    SOCKET_UNLOCK(sop);
+                CONTINUE_NO_UNLOCK(tcp);
+            }
+#endif
             /*
              * FD_ISSET is meaningless on these sockets
@@ -977 +1006 @@
          QSOCKET_FOREACH(so, so_next, udp)
          /* { */
+#ifdef VBOX_WITH_SLIRP_MT
+            if (   so->so_state & SS_NOFDREF 
+                && so->so_deleted == 1) 
+            {   
+                struct socket *son, *sop = NULL;
+                QSOCKET_LOCK(udb);
+                if (so->so_next != NULL) 
+                {
+                    if (so->so_next != &udb)
+                        SOCKET_LOCK(so->so_next);
+                    son = so->so_next;
+                }
+                if (    so->so_prev != &udb
+                    && so->so_prev != NULL) 
+                {
+                    SOCKET_LOCK(so->so_prev);
+                    sop = so->so_prev;
+                }
+                QSOCKET_UNLOCK(udb);
+                remque(pData, so);
+                SOCKET_UNLOCK(so);
+                SOCKET_LOCK_DESTROY(so);
+                RTMemFree(so);
+                so_next = son;
+                if (sop != NULL)
+                    SOCKET_UNLOCK(sop);
+                CONTINUE_NO_UNLOCK(udp);
+            }
+#endif
             POLL_UDP_EVENTS(rc, error, so, &NetworkEvents);
 

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

@@ -87 +87 @@
     if (so->so_m != NULL)
         m_free(pData, so->so_m);
+#ifndef VBOX_WITH_SLIRP_MT
     if(so->so_next && so->so_prev)
         remque(pData, so);  /* crashes if so is not in a queue */
     so->so_state = SS_NOFDREF; /* for debugging purposes */
-    SOCKET_UNLOCK(so);
-    SOCKET_LOCK_DESTROY(so);
 
     RTMemFree(so);
+#else
+    so->so_deleted = 1;
+#endif
 }
 

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

@@ -69 +69 @@
 #ifdef VBOX_WITH_SLIRP_MT
     RTCRITSECT      so_mutex;
+    int             so_deleted;
 #endif
 };

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

@@ -423 +423 @@
                 && so->so_laddr.s_addr == ti->ti_src.s_addr
                 && so->so_faddr.s_addr == ti->ti_dst.s_addr
-                && so->so_fport        == ti->ti_dport) 
+                && so->so_fport        == ti->ti_dport
+                && so->so_deleted != 1) 
             {
                 Log2(("lock: %s:%d We found socket %R[natsock]\n", __FUNCTION__, __LINE__, so));
@@ -1654 +1655 @@
     m_free(pData, m);
 
-#ifdef VBOX_WITH_SLIRP_MT
-    /*socket should be killed atm*/
-    AssertRelease(!RTCritSectIsInitialized(&so->so_mutex));
-#endif    
     return;
 }

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

@@ -287 +287 @@
     sbfree(&so->so_rcv);
     sbfree(&so->so_snd);
-    QSOCKET_LOCK(tcb);
-    if (   so->so_next != &tcb
-        && so->so_next != NULL)
-    {
-        SOCKET_LOCK(so->so_next);
-        so_next = so->so_next;
-    }
-    if (   so->so_prev != &tcb
-        && so->so_prev != NULL)
-    {
-        SOCKET_LOCK(so->so_prev);
-        so_prev = so->so_prev;
-    }
-    QSOCKET_UNLOCK(tcb);
     sofree(pData, so);
-    if (so_next != NULL) SOCKET_UNLOCK(so_next);
-    if (so_prev != NULL) SOCKET_UNLOCK(so_prev);
+    SOCKET_UNLOCK(so);
     tcpstat.tcps_closed++;
     return ((struct tcpcb *)0);

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

@@ -400 +400 @@
 udp_detach(PNATState pData, struct socket *so)
 {
-    struct socket *so_next, *so_prev;
-    so_next = so_prev = NULL;
     if (so != &pData->icmp_socket)
     {
         QSOCKET_LOCK(udb);
         SOCKET_LOCK(so);
-        if (    so->so_next != &udb
-            && so->so_next != NULL)
-        {
-            SOCKET_LOCK(so->so_next);
-            so_next = so->so_next;
-        }
-        if (    so->so_prev != &udb
-            && so->so_prev != NULL)
-        {
-            SOCKET_LOCK(so->so_prev);
-            so_prev = so->so_prev;
-        }
         QSOCKET_UNLOCK(udb);
         closesocket(so->s);
         sofree(pData, so);
-        if(so_prev != NULL)
-            SOCKET_UNLOCK(so_prev);
-        if(so_next != NULL)
-            SOCKET_UNLOCK(so_next);
+        SOCKET_UNLOCK(so);
     }
 }