Changeset 3210 for trunk/src

Timestamp:

Mar 24, 2000, 12:07:23 AM (25 years ago)

Author:

sandervl

Message:

bugfixes

Location:

trunk/src/wsock32/new

Files:

• asyncapi.cpp (modified) (7 diffs)
• wsock32.cpp (modified) (3 diffs)

trunk/src/wsock32/new/asyncapi.cpp

@@ -1 @@
-/* $Id: asyncapi.cpp,v 1.2 2000-03-23 19:21:53 sandervl Exp $ */
+/* $Id: asyncapi.cpp,v 1.3 2000-03-23 23:07:22 sandervl Exp $ */
 
 /*
@@ -150 +150 @@
 
    if(!pThreadParm->fCancelled) {
+        dprintf(("WSAsyncThreadProc %x %x %x %x", pThreadParm->hwnd, pThreadParm->msg, pThreadParm->hAsyncTaskHandle, lParam));
         PostMessageA(pThreadParm->hwnd, pThreadParm->msg, 
                      (WPARAM)pThreadParm->hAsyncTaskHandle, lParam);
@@ -396 +397 @@
    event = WSAMAKESELECTREPLY(event, socket_error);
 
+   dprintf(("AsyncNotifyEvent %x %x %x %x", pThreadParm->u.asyncselect.s, pThreadParm->hwnd, pThreadParm->msg, event));
    PostMessageA(pThreadParm->hwnd, pThreadParm->msg, (WPARAM)pThreadParm->u.asyncselect.s, 
                (LPARAM)event);
@@ -414 +416 @@
    {
 asyncloopstart:
-        i         = 0;
-        noread    = nowrite = noexcept = -1;
+        i      = 0;
+        noread = nowrite = noexcept = -1;
 
         //break if user cancelled request
@@ -437 +439 @@
                 sockets[noread] = s;
         }
-        if(lEventsPending & (FD_WRITE | FD_CONNECT)) {
+        if((lEventsPending & FD_CONNECT) ||
+          ((lEventsPending & FD_WRITE) &&
+           (!(ioctl(s, FIOBSTATUS, (char *)&tmp, sizeof(tmp)) & SS_CANTSENDMORE))))
+        {
                 nowrite = i++;
                 sockets[nowrite] = s;
@@ -446 +451 @@
         }
 
-        dprintf(("WSAsyncSelectThreadProc %x wrs=%d, rds=%d, oos =%d, pending = %x", pThreadParm->u.asyncselect.s, noread, nowrite, noexcept, lEventsPending));
+//        dprintf(("WSAsyncSelectThreadProc %x rds=%d, wrs=%d, oos =%d, pending = %x", pThreadParm->u.asyncselect.s, noread, nowrite, noexcept, lEventsPending));
 
         ret = select((int *)sockets, nr(noread), nr(nowrite), nr(noexcept), -1);
         if(ret == SOCKET_ERROR) {
                 int selecterr = sock_errno();
+                dprintf(("WSAsyncSelectThreadProc %x rds=%d, wrs=%d, oos =%d, pending = %x select returned %x", pThreadParm->u.asyncselect.s, noread, nowrite, noexcept, lEventsPending, selecterr));
                 switch(selecterr) 
                 {
@@ -490 +496 @@
                                 ret = getsockopt(s, SOL_SOCKET, SO_ERROR,
                                                  (char *) &sockoptval, &sockoptlen);
-                                if(sockoptval == (WSAECONNREFUSED-WSABASEERR)) {
+                                if(sockoptval == WSAECONNREFUSED) {
                                         AsyncNotifyEvent(pThreadParm, FD_CONNECT, WSAECONNREFUSED);
                                 }

trunk/src/wsock32/new/wsock32.cpp

@@ -1 @@
-/* $Id: wsock32.cpp,v 1.17 2000-03-23 19:21:54 sandervl Exp $ */
+/* $Id: wsock32.cpp,v 1.18 2000-03-23 23:07:23 sandervl Exp $ */
 
 /*
@@ -232 +232 @@
    } 
    ret = soclose(s);
-
    //Close WSAAsyncSelect thread if one was created for this socket
-   WSAAsyncSelect(s, 0, 0, 0);
-   
+   FindAndSetAsyncEvent(s, 0, 0, 0);
+  
    if(ret == SOCKET_ERROR) {
         WSASetLastError(wsaErrno());
@@ -862 +861 @@
                 ret = setsockopt(s,level,optname, (char *)&size, sizeof(ULONG));
                 if(ret == SOCKET_ERROR && size > 65535) {
+                        dprintf(("setsockopt: change size from %d to 65000", size));
                         //SvL: Limit send & receive buffer length to 64k
                         //     (only happens with 16 bits tcpip stack?)