Changeset 3439 for trunk/src/wsock32/asyncapi.cpp

Timestamp:

Apr 23, 2000, 5:55:52 PM (25 years ago)

Author:

sandervl

Message:

don't send FD_CLOSE ack when select returns and there's no data to be read

File:

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

trunk/src/wsock32/asyncapi.cpp

@@ -1 @@
-/* $Id: asyncapi.cpp,v 1.5 2000-03-28 19:10:09 sandervl Exp $ */
+/* $Id: asyncapi.cpp,v 1.6 2000-04-23 15:55:52 sandervl Exp $ */
 
 /*
@@ -473 +473 @@
                 case SOCECONNRESET:
                 case SOCEPIPE:
-                        if(lEventsPending & FD_CLOSE)
+                        if(lEventsPending & FD_CLOSE) {
+                                dprintf(("FD_CLOSE; broken connection"));
                                 AsyncNotifyEvent(pThreadParm, FD_CLOSE, WSAECONNRESET);
+                        }
 
                         //remote connection broken (so can't receive data anymore)
@@ -482 +484 @@
 
                 case SOCEINVAL:
-                        if(lEventsPending & FD_CLOSE)
+                        if(lEventsPending & FD_CLOSE) {
+                                dprintf(("FD_CLOSE; SOCEINVAL"));
                                 AsyncNotifyEvent(pThreadParm, FD_CLOSE, selecterr);
+                        }
                         break;
                 default:
@@ -524 +528 @@
                         if(lEventsPending & FD_CLOSE) 
                         {
+                                dprintf(("FD_CLOSE; ioctl; socket error"));
                                 AsyncNotifyEvent(pThreadParm, FD_CLOSE, NO_ERROR);
                                 //remote connection broken (so can't receive data anymore)
@@ -552 +557 @@
                         AsyncNotifyEvent(pThreadParm, FD_READ, NO_ERROR);
                 }
+#if 0
+//SvL: This generates FD_CLOSE messages when the connection is just fine
+//     (recv executed in another thread when select returns)
                 else 
                 if((lEventsPending & FD_CLOSE) && (state == 0 && bytesread == 0)) {
+                        dprintf(("FD_CLOSE; state == 0 && bytesread == 0"));
                         AsyncNotifyEvent(pThreadParm, FD_CLOSE, NO_ERROR);
                 }
+#endif
         }
         if(ready(noexcept))