Changeset 1384 for trunk/src

Timestamp:

Oct 20, 1999, 10:11:03 PM (26 years ago)

Author:

phaller

Message:

Fix: socket fix

Location:

trunk/src/wsock32

Files:

• async.cpp (modified) (11 diffs)
• makefile (modified) (2 diffs)
• wsock32.cpp (modified) (2 diffs)
• wsock32.def (modified) (3 diffs)
• wsock32const.h (modified) (2 diffs)

trunk/src/wsock32/async.cpp

@@ -1 @@
-/* $Id: async.cpp,v 1.4 1999-10-20 11:04:12 phaller Exp $ */
+/* $Id: async.cpp,v 1.5 1999-10-20 20:10:55 phaller Exp $ */
 
 /*
@@ -30 +30 @@
 #include <nerrno.h>
 #include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <sys/select.h>
+#include <unistd.h>
+
 #include <wsock32const.h>
 
@@ -140 +144 @@
     void          asyncGetServByName   (PASYNCREQUEST pRequest);
     void          asyncGetServByPort   (PASYNCREQUEST pRequest);
+    void          asyncSelect          (PASYNCREQUEST pRequest);
 
   // public members
@@ -595 +600 @@
   struct hostent* pHostent;
   USHORT          usLength;
-  ULONG           wParam;
-  ULONG           lParam;
   USHORT          rc;
 
@@ -650 +653 @@
   struct hostent* pHostent;
   USHORT          usLength;
-  ULONG           wParam;
-  ULONG           lParam;
   USHORT          rc;
 
@@ -703 +704 @@
   struct protoent* pProtoent;
   USHORT           usLength;
-  ULONG            wParam;
-  ULONG            lParam;
   USHORT           rc;
 
@@ -756 +755 @@
   struct protoent* pProtoent;
   USHORT           usLength;
-  ULONG            wParam;
-  ULONG            lParam;
   USHORT           rc;
 
@@ -809 +806 @@
   struct servent* pServent;
   USHORT          usLength;
-  ULONG           wParam;
-  ULONG           lParam;
   USHORT          rc;
 
@@ -863 +858 @@
   struct servent* pServent;
   USHORT          usLength;
-  ULONG           wParam;
-  ULONG           lParam;
   USHORT          rc;
 
@@ -899 +892 @@
   // M$ says, if PostMessageA fails, spin as long as window exists
 }
+
+
+
+/*****************************************************************************
+ * Name      : WSAAsyncWorker::asyncSelect
+ * Purpose   :
+ * Parameters:
+ * Variables :
+ * Result    :
+ * Remark    :
+ * Status    : UNTESTED
+ *
+ * Author    : Patrick Haller [Tue, 1998/06/16 23:00]
+ *****************************************************************************/
+
+typedef int SOCKET;
+
+void WSAAsyncWorker::asyncSelect(PASYNCREQUEST pRequest)
+{
+  ULONG           wParam;
+  ULONG           lParam;
+  int             irc;
+  int             iUnknown;
+
+  SOCKET          sockWin;
+  ULONG           ulEvent;
+  USHORT          usResult = 0;
+
+  dprintf(("WSOCK32-ASYNC: WSAAsyncWorker::asyncSelect (%08xh, %08xh) not correctly implemented\n",
+           this,
+           pRequest));
+
+
+  // setup variables
+  sockWin = (SOCKET)pRequest->ul1;
+  ulEvent = (ULONG) pRequest->ul2;
+
+  //@@@PH how to implement other events?
+
+  // finally do the select!
+  irc = os2_select(&sockWin,
+                   (ulEvent & FD_READ),
+                   (ulEvent & FD_WRITE),
+                   (ulEvent & FD_OOB),
+                   10000);              // @@@PH timeout
+  if (irc < 0)                                          /* an error occurred */
+  {
+    lParam = sock_errno();                          /* raise error condition */
+    if (lParam == SOCENOTSOCK)
+    {
+      usResult = FD_CLOSE;
+      lParam   = 0;
+    }
+  }
+  else
+    if (irc == 0)                                      /* this means timeout */
+    {
+      lParam = WSAETIMEDOUT;                        /* raise error condition */
+    }
+    else
+    {
+      //@@@PH check the socket for any event and report!
+      usResult = 0;
+
+      // readiness for reading bytes ?
+      irc = ioctl(sockWin, FIONREAD, &iUnknown, sizeof(iUnknown));
+      if ( (irc == 0) && (iUnknown > 0))
+         usResult |= FD_READ;
+    }
+
+  // post result
+  PostMessageA(pRequest->hwnd,
+               pRequest->ulMessage,
+               (WPARAM)sockWin,
+               (LPARAM)((lParam << 16) | usResult));
+
+  // M$ says, if PostMessageA fails, spin as long as window exists
+}
+
 
 
@@ -1262 +1334 @@
   return(wsaWorker->isBlocking());
 }
+
+
+/*****************************************************************************
+ * Name      :
+ * Purpose   :
+ * Parameters:
+ * Variables :
+ * Result    :
+ * Remark    :
+ * Status    : UNTESTED STUB
+ *
+ * Author    : Patrick Haller [Tue, 1998/06/16 23:00]
+ *****************************************************************************/
+// the real function calls
+ODINFUNCTION4(HANDLE, WSAAsyncSelect,SOCKET,       s,
+                                     HWND,         hwnd,
+                                     unsigned int, wMsg,
+                                     long,         lEvent)
+{
+  PASYNCREQUEST pRequest = wsaWorker->createRequest(WSAASYNC_SELECT,
+                                                    (HWND) hwnd,
+                                                    (ULONG)wMsg,
+                                                    (PVOID)NULL,
+                                                    (ULONG)0,
+                                                    (ULONG)s,
+                                                    (ULONG)lEvent);
+  wsaWorker->pushRequest(pRequest);
+  return (HANDLE)pRequest;
+}
+

trunk/src/wsock32/makefile

@@ -1 @@
-# $Id: makefile,v 1.9 1999-10-20 10:03:53 phaller Exp $
+# $Id: makefile,v 1.10 1999-10-20 20:10:57 phaller Exp $
 
 #
@@ -29 +29 @@
         $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
               $(PDWIN32_LIB)\pmwinx.lib $(PDWIN32_LIB)\user32.lib \
-              tcp32dll.lib so32dll.lib  $(PDWIN32_LIB)\kernel32.lib \
+              tcpip32.lib tcp32dll.lib so32dll.lib  $(PDWIN32_LIB)\kernel32.lib \
               $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
         $(CP) $@ $(PDWIN32_BIN)

trunk/src/wsock32/wsock32.cpp

@@ -1 @@
-/* $Id: wsock32.cpp,v 1.7 1999-10-20 11:04:13 phaller Exp $ */
+/* $Id: wsock32.cpp,v 1.8 1999-10-20 20:10:58 phaller Exp $ */
 
 /*
@@ -1475 +1475 @@
  *****************************************************************************/
 
-ODINFUNCTION4(int, OS2WSAAsyncSelect, SOCKET, s,
-                                      HWND,   hWnd,
-                                      u_int,  wMsg,
-                                      long,   lEvent)
-{
-  PFNTHREAD   pfnAsyncThread = &AsyncLoop; /* Address of thread program   */
-  ULONG       ulThreadParm = 100;          /* Parameter to thread routine     */
-  APIRET      rc           = NO_ERROR;     /* Return code                     */
-  unsigned long ii;
-  AsyncStatus *as;
-
-  as = FindASY(s);
-  if(as == NULL)
-    return 0;
-
-  CheckThreads(as);
-
-  as->hwnd = hWnd;
-  as->msg = wMsg;
-  as->event = lEvent;
-
-  ulThreadParm = (ULONG)as;
-
-  rc = DosCreateThread(&(as->threadID),  /* Thread ID (returned by function)  */
-                       pfnAsyncThread, /* Address of thread program         */
-                       ulThreadParm,   /* Parameter passed to ThreadProc    */
-                       CREATE_READY |  /* Thread is ready when created      */
-                       STACK_SPARSE,   /* Do not pre-commit stack pages     */
-                       8192L);         /* Stack size, rounded to page bdy   */
-  if (rc != NO_ERROR)
-  {
-    dprintf(("WSOCK32: DosCreateThread error: return code = %u\n",
-             rc));
-    OS2WSASetLastError(rc);
-    return 0;
-  }
-
-  return 1; //WSAAsyncSelect(s,hWnd,wMsg,lEvent);
-}
-
-
-/*****************************************************************************
- * Name      :
- * Purpose   :
- * Parameters:
- * Variables :
- * Result    :
- * Remark    :
- * Status    : UNTESTED STUB
- *
- * Author    : Patrick Haller [Tue, 1998/06/16 23:00]
- *****************************************************************************/
-
 ODINFUNCTION4(int, OS2WSARecvEx, SOCKET,    s,
                                  char FAR*, buf,

trunk/src/wsock32/wsock32.def

@@ -1 @@
-; $Id: wsock32.def,v 1.7 1999-10-20 11:04:13 phaller Exp $
+; $Id: wsock32.def,v 1.8 1999-10-20 20:11:01 phaller Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -49 +49 @@
    send =                      _OS2send@16                             @19
    sendto =                    _OS2sendto@24                           @20
-   setsockopt =        _OS2setsockopt@20                       @21
+   setsockopt                  =  _OS2setsockopt@20                    @21
    shutdown =                  _OS2shutdown@8                          @22
    socket =                    _OS2socket@12                           @23
@@ -61 +61 @@
    gethostname =               _OS2gethostname@8                       @57
 
-   WSAAsyncSelect              = _OS2WSAAsyncSelect@16                 @101
+   WSAAsyncSelect              = _WSAAsyncSelect@16                    @101
 
    WSAAsyncGetHostByAddr       = _WSAAsyncGetHostByAddr@28             @102

trunk/src/wsock32/wsock32const.h

@@ -1 @@
-/* $Id: wsock32const.h,v 1.1 1999-10-20 10:03:55 phaller Exp $ */
+/* $Id: wsock32const.h,v 1.2 1999-10-20 20:11:03 phaller Exp $ */
 
 /* WSOCK32.H--definitions & conversions for Odin's wsock32.dll.
@@ -20 +20 @@
  * taken from the BSD file sys/socket.h.
  */
+
+/* WSAAsyncSelect flags */
+#define FD_READ    0x01
+#define FD_WRITE   0x02
+#define FD_OOB     0x04
+#define FD_ACCEPT  0x08
+#define FD_CONNECT 0x10
+#define FD_CLOSE   0x20
+
 
 /*