Changeset 3372 for branches

Timestamp:

May 27, 2007, 12:37:44 PM (18 years ago)

Author:

bird

Message:

Fixes #166.

File:

• branches/libc-0.6/src/emx/src/lib/sys/tcpipver.c (modified) (19 diffs)

branches/libc-0.6/src/emx/src/lib/sys/tcpipver.c

@@ -62 +62 @@
 #define INCL_BASE
 #define INCL_FSMACROS
+#define INCL_EXAPIS
 #include <os2emx.h>
 #include <InnoTekLIBC/sharedpm.h>
@@ -171 +172 @@
 
 static void TCPNAME(Cleanup)(void);
-static int  tcpipForkChild1(__LIBC_PFORKHANDLE pForkHandle, __LIBC_FORKOP enmOperation);
 
 
@@ -210 +210 @@
 static int TCPNAME(ops_Close)(PLIBCFH pFH, int fh)
 {
-    LIBCLOG_ENTER("pFH=%p:{iSocket=%d} fh=%d\n", (void *)pFH, ((PLIBCSOCKETFH)pFH)->iSocket, fh);
+    LIBCLOG_ENTER("pFH=%p:{.iSocket=%d} fh=%d\n", (void *)pFH, ((PLIBCSOCKETFH)pFH)->iSocket, fh);
     PLIBCSOCKETFH   pSocketFH = (PLIBCSOCKETFH)pFH;
     int             rc;
@@ -235 +235 @@
                 __libc_spmSocketRef(pSocketFH->iSocket);
             }
+            /** @todo deal with EALREADY, it will leave an unclosed and soon to be invalid handle behind... */
         }
     }
@@ -249 +250 @@
          * Please note that removesocketfromlist returns a boolean success indicator and proably no errno.
          */
+        int iSavedTcpipErrno = TCPNAME(imp_sock_errno)();
+        TCPNAME(imp_set_errno)(0);
         rc = TCPNAME(imp_removesocketfromlist)(pSocketFH->iSocket);
         if (!rc)
@@ -255 +258 @@
             rc = -EBADF; /* this is an internal error, it should *NOT* happen! */
         }
+        else
+            rc = 0;
+        TCPNAME(imp_set_errno)(iSavedTcpipErrno);
     }
 
     /*
-     * Unlink from our list.
+     * Unlink from our list (rc list must correspond to __libc_FHClose!).
      */
-    if (rc != -EBADF && rc != -ENOTSOCK && rc != -EALREADY)
-    {
+    if (    !rc
+        ||  rc == -EBADF
+        ||  rc == -ENOTSOCK)
+    {
+        LIBCLOG_MSG("Unlinking pSocketFH=%p:{iSocket=%d} fh=%d\n", pSocketFH, pSocketFH->iSocket, fh);
         _smutex_request(&gsmtxSockets);
         if (pSocketFH->pNext)
@@ -289 +298 @@
 static int TCPNAME(ops_Read)(PLIBCFH pFH, int fh, void *pvBuf, size_t cbRead, size_t *pcbRead)
 {
-    LIBCLOG_ENTER("pFH=%p:{iSocket=%d} fh=%d pvBuf=%p cbRead=%d pcbRead=%p\n",
+    LIBCLOG_ENTER("pFH=%p:{.iSocket=%d} fh=%d pvBuf=%p cbRead=%d pcbRead=%p\n",
                   (void *)pFH, ((PLIBCSOCKETFH)pFH)->iSocket, fh, pvBuf, cbRead, (void *)pcbRead);
     PLIBCSOCKETFH   pSocketFH = (PLIBCSOCKETFH)pFH;
@@ -321 +330 @@
 static int TCPNAME(ops_Write)(PLIBCFH pFH, int fh, const void *pvBuf, size_t cbWrite, size_t *pcbWritten)
 {
-    LIBCLOG_ENTER("pFH=%p:{iSocket=%d} fh=%d pvBuf=%p cbWrite=%d pcbWritten=%p\n",
+    LIBCLOG_ENTER("pFH=%p:{.iSocket=%d} fh=%d pvBuf=%p cbWrite=%d pcbWritten=%p\n",
                   (void *)pFH, ((PLIBCSOCKETFH)pFH)->iSocket, fh, pvBuf, cbWrite, (void *)pcbWritten);
     PLIBCSOCKETFH   pSocketFH = (PLIBCSOCKETFH)pFH;
@@ -357 +366 @@
 {
     PLIBCSOCKETFH  pFHSocket = (PLIBCSOCKETFH)pFH;
-    LIBCLOG_ENTER("pFH=%p:{iSocket=%d} fh=%d pfhNew=%p\n", (void *)pFH, pFHSocket->iSocket, fh, (void *)pfhNew);
+    LIBCLOG_ENTER("pFH=%p:{.iSocket=%d} fh=%d pfhNew=%p\n", (void *)pFH, pFHSocket->iSocket, fh, (void *)pfhNew);
 
     /*
@@ -391 +400 @@
 static int TCPNAME(ops_FileControl)(PLIBCFH pFH, int fh, int iRequest, int iArg, int *prc)
 {
-    LIBCLOG_ENTER("pFH=%p:{iSocket=%d} fh=%d iRequest=%#x iArg=%#x prc=%p\n",
+    LIBCLOG_ENTER("pFH=%p:{.iSocket=%d} fh=%d iRequest=%#x iArg=%#x prc=%p\n",
                   (void *)pFH, ((PLIBCSOCKETFH)pFH)->iSocket, fh, iRequest, iArg, (void *)prc);
     int rc;
@@ -423 +432 @@
                 {
                     rc = __libc_Back_ioFileControlStandard(pFH, fh, iRequest, iArg, prc);
-                    if (rc) 
+                    if (rc)
                     {
                         /* undo change on failure. */
@@ -461 +470 @@
 static int TCPNAME(ops_IOControl)(PLIBCFH pFH, int fh, int iIOControl, int iArg, int *prc)
 {
-    LIBCLOG_ENTER("pFH=%p:{iSocket=%d} fh=%d iIOControl=%#x iArg=%#x prc=%p\n",
+    LIBCLOG_ENTER("pFH=%p:{.iSocket=%d} fh=%d iIOControl=%#x iArg=%#x prc=%p\n",
                   (void *)pFH, ((PLIBCSOCKETFH)pFH)->iSocket, fh, iIOControl, iArg, (void *)prc);
     PLIBCSOCKETFH   pSocketFH = (PLIBCSOCKETFH)pFH;
@@ -796 +805 @@
 static int TCPNAME(ops_ForkChild)(struct __libc_FileHandle *pFH, int fh, __LIBC_PFORKHANDLE pForkHandle, __LIBC_FORKOP enmOperation)
 {
-    LIBCLOG_ENTER("pFH=%p:{iSocket=%d} fh=%d\n", (void *)pFH, ((PLIBCSOCKETFH)pFH)->iSocket, fh);
+    LIBCLOG_ENTER("pFH=%p:{.iSocket=%d} fh=%d\n", (void *)pFH, ((PLIBCSOCKETFH)pFH)->iSocket, fh);
     PLIBCSOCKETFH   pSocketFH = (PLIBCSOCKETFH)pFH;
     int rc = __libc_spmSocketRef(pSocketFH->iSocket);
@@ -847 +856 @@
  *                      list for the current process.
  *                      If clear we only increment the global reference counter.
- * @param   pfh         Where to store the filename.
+ * @param   pfh         Where to store the file handle.
  * @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);
+    LIBCLOG_ENTER("fh=%d iSocket=%d fFlags=%#x fNew=%d pfh=%p:{%d} ppFHSocket=%p\n", fh, iSocket, fFlags, fNew, (void *)pfh, pfh ? *pfh : -2, (void *)ppFHSocket);
     PLIBCFH         pFHLibc;
     int rc = __libc_FHAllocate(fh, fFlags, sizeof(LIBCSOCKETFH), &gSocketOps, &pFHLibc, pfh);
@@ -860 +869 @@
          * Init the handle.
          */
-        PLIBCSOCKETFH   pFH = (PLIBCSOCKETFH)pFHLibc;
+        PLIBCSOCKETFH pFH = (PLIBCSOCKETFH)pFHLibc;
         pFH->iSocket = iSocket;
 
@@ -892 +901 @@
         if (ppFHSocket)
             *ppFHSocket = pFH;
-        LIBCLOG_RETURN_INT(0);
+        LIBCLOG_RETURN_MSG(0, "ret 0 *pfh=%d *ppFHSocket=%p\n", pfh ? *pfh : -2, pFH);
     }
     LIBCLOG_ERROR_RETURN_P(rc);
@@ -1198 +1207 @@
         HMODULE hmod;
         char    szErr[16];
-        rc = DosLoadModule((PSZ)szErr, sizeof(szErr), (PCSZ)gszDllName, &hmod);
+        rc = DosLoadModuleEx((PSZ)szErr, sizeof(szErr), (PCSZ)gszDllName, &hmod);
         if (rc)
         {
@@ -1374 +1383 @@
              * Please note that removesocketfromlist is returning a boolean success indicator and probably no errno.
              */
+            TCPNAME(imp_set_errno)(0);
             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)());
@@ -1384 +1394 @@
 }
 
-
-#undef  __LIBC_LOG_GROUP
-#define __LIBC_LOG_GROUP __LIBC_LOG_GRP_FORK
-
-_FORK_CHILD1(0xffffff00, tcpipForkChild1)
-
-/**
- * Reload the DLL in the child process.
- *
- * @returns 0 on success.
- * @returns negative errno on failure.
- * @param   pForkHandle     Pointer to fork handle.
- * @param   enmOperation    Callback operation.
- */
-static int tcpipForkChild1(__LIBC_PFORKHANDLE pForkHandle, __LIBC_FORKOP enmOperation)
-{
-    LIBCLOG_ENTER("pForkHandle=%p enmOperation=%d\n", (void *)pForkHandle, enmOperation);
-    int rc;
-    switch (enmOperation)
-    {
-        case __LIBC_FORK_OP_FORK_CHILD:
-        {
-            rc = 0;
-            if (ghmod)
-                rc = __libc_tcpipForkLoadModule(ghmod, gszDllName);
-            break;
-        }
-
-        default:
-            rc = 0;
-            break;
-    }
-
-    LIBCLOG_RETURN_INT(rc);
-}
-
-