Changeset 1586

Timestamp:

Nov 1, 2004, 3:26:32 AM (21 years ago)

Author:

bird

Message:

Tried to fix the add/remove socket list stuff.

File:

• trunk/src/emx/src/lib/sys/tcpipver.c (modified) (8 diffs, 1 prop)

trunk/src/emx/src/lib/sys/tcpipver.c

@@ -160 +160 @@
 static int TCPNAME(imp_send)(int, const void *, int, int);
 static int TCPNAME(imp_removesocketfromlist)(int);
+static int TCPNAME(imp_addsockettolist)(int);
 #ifdef TCPV40HDRS
 static int TCPNAME(imp_bsdselect)(int, fd_set *, fd_set *, fd_set *, struct timeval *);
@@ -228 +229 @@
         }
     }
-    else if (rc < 0)
+    else if (rc > 0)
+    {
+        /*
+         * Someone is using the socket, we'll remove it from the list of
+         * sockets owned by this process to prevent it from being closed.
+         */
+        rc = TCPNAME(imp_removesocketfromlist)(pSocketFH->iSocket);
+        if (rc)
+        {
+            LIBC_ASSERTM(!rc, "removesocketfromlist(%d) -> rc=%d sock_errno()->%d\n", pSocketFH->iSocket, rc, TCPNAME(imp_sock_errno)());
+            rc = -__libc_TcpipGetSocketErrno();
+        }
+    }
+    else
         rc = -EBADF;
 
@@ -755 +769 @@
     LIBCLOG_ENTER("pFH=%p:{iSocket=%d} fh=%d\n", (void *)pFH, ((PLIBCSOCKETFH)pFH)->iSocket, fh);
     PLIBCSOCKETFH   pSocketFH = (PLIBCSOCKETFH)pFH;
-    __libc_spmSocketRef(pSocketFH->iSocket);
+    int rc = __libc_spmSocketRef(pSocketFH->iSocket);
+    LIBC_ASSERTM(rc > 0, "__libc_spmSocketDeref(%d) -> rc=%d\n", pSocketFH->iSocket, rc);
     LIBCLOG_RETURN_INT(0);
+    rc = rc;
 }
 
@@ -823 +839 @@
 
         /*
-         * New: Set usage counter to 1 and remove from tcpip cleanup list.
-         * Existing: Increment reference counter
+         * New: Set usage counter to 1.
+         * Existing: Increment reference counter and add to socket list.
          */
         if (fNew)
         {
-            __libc_spmSocketNew(iSocket);
-            TCPNAME(imp_removesocketfromlist)(iSocket); /* We do our own cleanup! */
+            rc = __libc_spmSocketNew(iSocket);
+            LIBC_ASSERTM(!rc, "__libc_spmSocketNew(%d) -> rc=%d\n", iSocket, rc);
         }
         else
-            __libc_spmSocketRef(iSocket);
+        {
+            rc = __libc_spmSocketRef(iSocket);
+            LIBC_ASSERTM(rc > 0, "__libc_spmSocketRef(%d) -> rc=%d\n", iSocket, rc);
+            rc = TCPNAME(imp_addsockettolist)(iSocket);
+            LIBC_ASSERTM(!rc, "addsockettolist(%d) -> rc=%d\n", iSocket, rc);
+        }
         LIBCLOG_RETURN_P(pFH);
     }
@@ -1094 +1115 @@
 # define ORD_RECV                       10
 # define ORD_SEND                       13
+# define ORD_ADDSOCKETTOLIST            27
 # define ORD_REMOVESOCKETFROMLIST       28
 # define ORD_BSDSELECT                  32
@@ -1104 +1126 @@
 # define ORD_RECV                       10
 # define ORD_SEND                       13
+# define ORD_ADDSOCKETTOLIST            27
 # define ORD_REMOVESOCKETFROMLIST       28
 # define ORD_BSDSELECT                  32
@@ -1213 +1236 @@
 }
 
+static int     TCPNAME(imp_addsockettolist)(int s)
+{
+    static int (*TCPCALL pfn)(int s);
+    if (!pfn && TCPNAME(get_imp)(ORD_ADDSOCKETTOLIST, (void **)(void *)&pfn))
+        return -1;
+    return pfn(s);
+}
+
 static int     TCPNAME(imp_removesocketfromlist)(int s)
 {
@@ -1274 +1305 @@
         if (!rc)
         {
+            /*
+             * Close the socket, noone needs it.
+             */
             rc = TCPNAME(imp_soclose)(pFH->iSocket);
             LIBC_ASSERTM(!rc, "soclose(%d) -> rc=%d sock_errno()->%d\n", pFH->iSocket, rc, TCPNAME(imp_sock_errno)());
+        }
+        else
+        {
+            /*
+             * If in use by other process, we'll remove it from the list of sockets
+             * owned by this process to prevent it from begin closed.
+             */
+            rc = TCPNAME(imp_removesocketfromlist)(pFH->iSocket);
+            LIBC_ASSERTM(!rc, "removesocketfromlist(%d) -> rc=%d sock_errno()->%d\n", pFH->iSocket, rc, TCPNAME(imp_sock_errno)());
         }