Changeset 3265 for trunk/src

Timestamp:

Mar 28, 2000, 9:10:09 PM (25 years ago)

Author:

sandervl

Message:

FD_CLOSE fix

File:

• trunk/src/wsock32/asyncapi.cpp (modified) (5 diffs)

trunk/src/wsock32/asyncapi.cpp

@@ -1 @@
-/* $Id: asyncapi.cpp,v 1.4 2000-03-28 17:13:05 sandervl Exp $ */
+/* $Id: asyncapi.cpp,v 1.5 2000-03-28 19:10:09 sandervl Exp $ */
 
 /*
@@ -460 +460 @@
         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));
+////            dprintf(("WSAsyncSelectThreadProc %x rds=%d, wrs=%d, oos =%d, pending = %x select returned %x", pThreadParm->u.asyncselect.s, noread, nowrite, noexcept, lEventsPending, selecterr));
                 if(selecterr && selecterr < SOCBASEERR) {
                         selecterr += SOCBASEERR;
@@ -467 +467 @@
                 {
                 case SOCEINTR:
-                        state = ioctl(s, FIOBSTATUS, (char *)&tmp, sizeof(tmp));
-                        dprintf(("SOCEINTR; state = %x", state));
+////                    state = ioctl(s, FIOBSTATUS, (char *)&tmp, sizeof(tmp));
+////                    dprintf(("SOCEINTR; state = %x", state));
                         goto asyncloopstart;    //so_cancel was called
 
@@ -520 +520 @@
         {
                 state = ioctl(s, FIONREAD, (CHAR *) &bytesread, sizeof(bytesread));
-                if(state == SOCKET_ERROR) {
+                if(state == SOCKET_ERROR) 
+                {
                         if(lEventsPending & FD_CLOSE) 
                         {
@@ -550 +551 @@
                 if((lEventsPending & FD_READ) && bytesread > 0) {
                         AsyncNotifyEvent(pThreadParm, FD_READ, NO_ERROR);
+                }
+                else 
+                if((lEventsPending & FD_CLOSE) && (state == 0 && bytesread == 0)) {
+                        AsyncNotifyEvent(pThreadParm, FD_CLOSE, NO_ERROR);
                 }
         }