Changeset 1824

Timestamp:

Mar 13, 2005, 11:44:52 AM (20 years ago)

Author:

bird

Message:

Applied half a patch from Lorne. Implemented socket duplication.

File:

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

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

@@ -8 +8 @@
  *
  *
- * Copyright (c) 2004 knut st. osmundsen <bird-srcspam@anduin.net>
+ * Copyright (c) 2004-2005 knut st. osmundsen <bird-srcspam@anduin.net>
  *
  *
@@ -66 +66 @@
 #include <InnoTekLIBC/tcpip.h>
 #include <InnoTekLIBC/fork.h>
+#include <InnoTekLIBC/thread.h>
 #define __LIBC_LOG_GROUP __LIBC_LOG_GRP_SOCKET
 #include <InnoTekLIBC/logstrict.h>
@@ -95 +96 @@
 #ifdef TCPV40HDRS
 /* not included in the TCPV40HDRS - this is from the BSD4.4 stack headers
-                                    and doesn't have to right!!! */
+                                    and doesn't have to be right!!! */
 struct arpreq_tr {
         struct  sockaddr arp_pa;                /* protocol address */
@@ -159 +160 @@
 static int TCPNAME(imp_recv)(int, void *, int, int);
 static int TCPNAME(imp_send)(int, const void *, int, int);
-static int TCPNAME(imp_removesocketfromlist)(int);
-static int TCPNAME(imp_addsockettolist)(int);
+static _Bool TCPNAME(imp_removesocketfromlist)(int);
+static void TCPNAME(imp_addsockettolist)(int);
 #ifdef TCPV40HDRS
 static int TCPNAME(imp_bsdselect)(int, fd_set *, fd_set *, fd_set *, struct timeval *);
@@ -215 +216 @@
      */
     rc = __libc_spmSocketDeref(pSocketFH->iSocket);
-    if (!rc)
-    {
+    if (rc < 0)
+        rc = rc; /* error */
+    else if (!rc)
+    {
+        /*
+         * Noone is using the socket now, close it.
+         */
         rc = TCPNAME(imp_soclose)(pSocketFH->iSocket);
         if (rc)
@@ -229 +235 @@
         }
     }
-    else if (rc > 0)
-    {
-        /** @todo socket duplication within the same process! A per process reference counting is required too! */
-
+    else if (rc >> 16) /* (high word is process reference count) */
+        /* The socket is duplicated within the current process, it will be close later when the other handle(s) is(/are) closed. */
+        rc = 0;
+    else
+    {
         /*
-         * Someone is using the socket, we'll remove it from the list of
-         * sockets owned by this process to prevent it from being closed.
+         * Someone other process is using the socket, we'll remove it from the list of
+         * sockets owned by this process to prevent it from being closed on exit. The other process(es)
+         * will do the closing.
+         *
+         * Please note that removesocketfromlist returns a boolean success indicator and proably no errno.
          */
         rc = TCPNAME(imp_removesocketfromlist)(pSocketFH->iSocket);
-        if (rc < 1) /** @todo investigate removesocketfromlist return code. */
-        {
-            LIBC_ASSERTM_FAILED("removesocketfromlist(%d) -> rc=%d sock_errno()->%d\n", pSocketFH->iSocket, rc, TCPNAME(imp_sock_errno)());
-            rc = -__libc_TcpipGetSocketErrno();
-        }
-    }
-    else
-        rc = -EBADF;
+        if (!rc)
+        {
+            LIBC_ASSERTM_FAILED("removesocketfromlist(%d) -> false! sock_errno()->%d\n", pSocketFH->iSocket, TCPNAME(imp_sock_errno)());
+            rc = -EBADF; /* this is an internal error, it should *NOT* happen! */
+        }
+    }
 
     /*
@@ -281 +289 @@
     PLIBCSOCKETFH   pSocketFH = (PLIBCSOCKETFH)pFH;
     int             rc;
-
-    rc = TCPNAME(imp_recv)(pSocketFH->iSocket, pvBuf, cbRead, 0);
+    int             fFlags = 0;
+#if 0 /* doesn't work for 4.3 */
+    if (pFH->fFlags & O_NONBLOCK)
+        fFlags = MSG_DONTWAIT;
+#endif
+    rc = TCPNAME(imp_recv)(pSocketFH->iSocket, pvBuf, cbRead, fFlags);
     if (rc < 0)
     {
@@ -309 +321 @@
     PLIBCSOCKETFH   pSocketFH = (PLIBCSOCKETFH)pFH;
     int             rc;
-
-    rc = TCPNAME(imp_send)(pSocketFH->iSocket, pvBuf, cbWrite, 0);
+    int             fFlags = 0;
+#if 0 /* doesn't work for 4.3 */
+    if (pFH->fFlags & O_NONBLOCK)
+        fFlags = MSG_DONTWAIT;
+#endif
+    rc = TCPNAME(imp_send)(pSocketFH->iSocket, pvBuf, cbWrite, fFlags);
     if (rc < 0)
     {
@@ -336 +352 @@
 static int TCPNAME(ops_Duplicate)(PLIBCFH pFH, int fh, int *pfhNew)
 {
-    LIBCLOG_ENTER("pFH=%p:{iSocket=%d} fh=%d pfhNew=%p\n", (void *)pFH, ((PLIBCSOCKETFH)pFH)->iSocket, fh, (void *)pfhNew);
-    LIBC_ASSERTM_FAILED("Duplication of sockets aren't supported yet.\n");
-    /** @todo In order to properly support this we need to have per process reference counting
-     * of the sockets too. This should be done in a high heap block and done on allocation to
-     * get the exec/spaw inheritance right. */
-    LIBCLOG_RETURN_INT(-ENOSYS);
+    PLIBCSOCKETFH  pFHSocket = (PLIBCSOCKETFH)pFH;
+    LIBCLOG_ENTER("pFH=%p:{iSocket=%d} fh=%d pfhNew=%p\n", (void *)pFH, pFHSocket->iSocket, fh, (void *)pfhNew);
+
+    /*
+     * Allocate a new filehandle matching the request and copy the data over.
+     */
+    PLIBCSOCKETFH  pFHNew;
+    int rc = TCPNAMEG(AllocFHEx)(*pfhNew, pFHSocket->iSocket, O_RDWR | F_SOCKET, 0/*old*/, pfhNew, &pFHNew);
+    if (!rc)
+    {
+        pFHNew->core.fFlags      = pFHSocket->core.fFlags;
+        pFHNew->core.iLookAhead  = pFHSocket->core.iLookAhead;
+        pFHNew->core.Inode       = pFHSocket->core.Inode;
+        pFHNew->core.Dev         = pFHSocket->core.Dev;
+        LIBCLOG_RETURN_MSG(0, "ret 0 (0x0) *pfhNew=%d\n", *pfhNew);
+    }
+
+    LIBCLOG_RETURN_INT(rc);
 }
 
@@ -385 +413 @@
         {
             /** @todo implement this properly. See FCNTLFLAGS. */
+#if 1
             LIBC_ASSERTM_FAILED("F_SETFL isn't implemented but returns success. arg=%#x\n", iArg);
             *prc = 0;
+#else
+            pFH->fFlags= pFH->fFlags & ~(O_ACCMODE | O_APPEND | O_NONBLOCK | O_SYNC);
+            pFH->fFlags= pFH->fFlags | fFlags;
+            LIBCLOG_MSG("F_SETFL is implemented only partially but returns success. arg=%#x\n", pFH->fFlags);
+            *prc = fFlags;
+#endif
             break;
         }
@@ -775 +810 @@
     PLIBCSOCKETFH   pSocketFH = (PLIBCSOCKETFH)pFH;
     int rc = __libc_spmSocketRef(pSocketFH->iSocket);
-    LIBC_ASSERTM(rc > 0, "__libc_spmSocketDeref(%d) -> rc=%d\n", pSocketFH->iSocket, rc);
+    LIBC_ASSERTM(rc > 0, "__libc_spmSocketRef(%d) -> rc=%d\n", pSocketFH->iSocket, rc);
+    if ((rc >> 16) == 1)
+        TCPNAME(imp_addsockettolist)(pSocketFH->iSocket);
     LIBCLOG_RETURN_INT(0);
     rc = rc;
@@ -795 +832 @@
 {
     LIBCLOG_ENTER("iSocket=%d\n", iSocket);
-    PLIBCSOCKETFH pFH = TCPNAMEG(AllocFHEx)(-1, iSocket, O_RDWR | F_SOCKET, 1, pfh);
-    LIBCLOG_RETURN_P(pFH);
+    PLIBCSOCKETFH pFH;
+    int rc = TCPNAMEG(AllocFHEx)(-1, iSocket, O_RDWR | F_SOCKET, 1, pfh, &pFH);
+    if (!rc)
+        LIBCLOG_RETURN_P(pFH);
+    errno = -rc;
+    return NULL;
 }
 
@@ -807 +848 @@
  * processor where such actions are unnecessary.
  *
- * @returns Pointer to socket handle on success.
- * @returns NULL and errno on failure.
+ * @returns 0 on success.
+ * @returns Negative error code (errno.h) on failure.
  * @param   fh          The requested file handle.
  *                      If -1 any file handle can be used.
@@ -818 +859 @@
  *                      If clear we only increment the global reference counter.
  * @param   pfh         Where to store the filename.
- */
-PLIBCSOCKETFH TCPNAMEG(AllocFHEx)(int fh, int iSocket, unsigned fFlags, int fNew, int *pfh)
+ * @param   ppFHSocket  Where to store the allocated socket handle. Optional.
+ */
+int TCPNAMEG(AllocFHEx)(int fh, int iSocket, unsigned fFlags, int fNew, int *pfh, PLIBCSOCKETFH *ppFHSocket)
 {
     LIBCLOG_ENTER("iSocket=%d\n", iSocket);
@@ -856 +898 @@
             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);
-    }
-    else
-        __libc_TcpipSetSocketErrno();
-
-    LIBCLOG_RETURN_P(NULL);
+            if ((rc >> 16) == 1) /* only first reference in this process */
+                TCPNAME(imp_addsockettolist)(iSocket);
+        }
+        if (ppFHSocket)
+            *ppFHSocket = pFH;
+        LIBCLOG_RETURN_INT(0);
+    }
+    LIBCLOG_RETURN_P(rc);
 }
 
@@ -1067 +1108 @@
     LIBCLOG_MSG("calling native: cFDs=%d pRead=%p pWrite=%p, pExcept=%p tv=%p\n",
                 cFDs, (void *)pRead, (void *)pWrite, (void *)pExcept, (void *)tv);
+    __LIBC_PTHREAD pThrd = __libc_threadCurrent();
+    pThrd->ulSigLastTS = 0;
     rc = TCPNAME(imp_bsdselect)(cFDs, pRead, pWrite, pExcept, tv);
     if (rc < 0)
@@ -1072 +1115 @@
         __libc_TcpipUpdateErrno();
         LIBCLOG_RETURN_INT(rc);
+    }
+    else if (!rc && pThrd->ulSigLastTS)      /* detect interruption */
+    {
+        __libc_TcpipSetErrno(EINTR);
+        LIBCLOG_RETURN_INT(-1);
     }
 
@@ -1243 +1291 @@
 }
 
-static int     TCPNAME(imp_addsockettolist)(int s)
+static void     TCPNAME(imp_addsockettolist)(int s)
 {
     LIBCLOG_ENTER("iSocket=%d\n", s);
-    static int (*TCPCALL pfn)(int s);
+    static void (*TCPCALL pfn)(int s);
     if (!pfn && TCPNAME(get_imp)(ORD_ADDSOCKETTOLIST, (void **)(void *)&pfn))
-        LIBCLOG_RETURN_INT(-1);
-    int rc = pfn(s);
-    LIBCLOG_RETURN_INT(rc);
-}
-
-static int     TCPNAME(imp_removesocketfromlist)(int s)
+        LIBCLOG_RETURN_VOID();
+    pfn(s);
+    LIBCLOG_RETURN_VOID();
+}
+
+static _Bool    TCPNAME(imp_removesocketfromlist)(int s)
 {
     LIBCLOG_ENTER("iSocket=%d\n", s);
     static int (*TCPCALL pfn)(int s);
     if (!pfn && TCPNAME(get_imp)(ORD_REMOVESOCKETFROMLIST, (void **)(void *)&pfn))
-        LIBCLOG_RETURN_INT(-1);
+        LIBCLOG_RETURN_INT(0);
     int rc = pfn(s);
-    LIBCLOG_RETURN_INT(rc);
+    LIBCLOG_RETURN_INT(!!rc); /* paranoia!!!! */
 }
 
@@ -1315 +1363 @@
         int rc = __libc_spmSocketDeref(pFH->iSocket);
         LIBC_ASSERTM(rc >= 0, "__libc_spmSocketDeref(%d) -> rc=%d\n", pFH->iSocket, rc);
+        if (rc < 0)
+            rc = 0; /* we'd rather have failures and fix the problem than stale sockets and bugs. */
         if (!rc)
         {
@@ -1323 +1373 @@
             LIBC_ASSERTM(!rc, "soclose(%d) -> rc=%d sock_errno()->%d\n", pFH->iSocket, rc, TCPNAME(imp_sock_errno)());
         }
+        else if (rc >> 16) /* (high word is process reference count) */
+            /* The socket is duplicated within the current process, it will be close later when the other handle(s) is(/are) closed. */
+            rc = 0;
         else
         {
@@ -1328 +1381 @@
              * 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.
+             *
+             * Please note that removesocketfromlist is returning a boolean success indicator and probably no errno.
              */
             rc = TCPNAME(imp_removesocketfromlist)(pFH->iSocket);
-            LIBC_ASSERTM(rc >= 1, "removesocketfromlist(%d) -> rc=%d sock_errno()->%d\n", pFH->iSocket, rc, TCPNAME(imp_sock_errno)());
+            LIBC_ASSERTM(rc == 1, "removesocketfromlist(%d) -> rc=%d sock_errno()->%d\n", pFH->iSocket, rc, TCPNAME(imp_sock_errno)());
         }