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

Timestamp:

Feb 23, 2002, 5:39:10 PM (24 years ago)

Author:

sandervl

Message:

Don't send FD_CONNECT for sockets that are returned by accept

File:

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

trunk/src/wsock32/asyncapi.cpp

@@ -1 @@
-/* $Id: asyncapi.cpp,v 1.19 2002-02-20 15:07:13 sandervl Exp $ */
+/* $Id: asyncapi.cpp,v 1.20 2002-02-23 16:39:09 sandervl Exp $ */
 
 /*
@@ -531 +531 @@
         ret = select((int *)sockets, nr(noread), nr(nowrite), nr(noexcept), -1);
         pThreadParm->fWaitSelect = FALSE;
+
         if(ret == SOCKET_ERROR) {
                 int selecterr = sock_errno();
@@ -542 +543 @@
 ////                    state = ioctl(s, FIOBSTATUS, (char *)&tmp, sizeof(tmp));
 ////                    dprintf(("SOCEINTR; state = %x", state));
-                        goto asyncloopstart;    //so_cancel was called
+                        goto asyncloopstart;    //so_cancel/closesocket was called
 
                 case SOCECONNRESET:
@@ -574 +575 @@
                 state = ioctl(s, FIOBSTATUS, (char *)&tmp, sizeof(tmp));
 
-                if(lEventsPending & FD_CONNECT) {
+                //Don't send FD_CONNECT is socket was already connected (accept returns connected socket)
+                if(!pThreadParm->fConnected && (lEventsPending & FD_CONNECT)) 
+                {
                         if(state & SS_ISCONNECTED) {
                                 AsyncSelectNotifyEvent(pThreadParm, FD_CONNECT, NO_ERROR);
+                                pThreadParm->fConnected = TRUE;
                         }
                         else {
@@ -594 +598 @@
                 }
         }
-
         if(ready(noread))
         {
                 state = ioctl(s, FIONREAD, (CHAR *) &bytesread, sizeof(bytesread));
+                dprintf2(("state %x, bytesread %d", state, bytesread));
                 if(state == SOCKET_ERROR)
                 {
@@ -769 +773 @@
         return SOCKET_ERROR;
    }
+
+   int size, state, tmp;
+   state = ioctl(s, FIOBSTATUS, (char *)&tmp, sizeof(tmp));
+   dprintf(("QueueAsyncJob: state %x", state));
+
+   //Don't send FD_CONNECT is socket was already connected (accept returns connected socket)
+   if(state & SS_ISCONNECTED) {
+        pThreadParm->fConnected = TRUE;
+   }
+   else pThreadParm->fConnected = FALSE;
+
    if(QueueAsyncJob(WSAsyncSelectThreadProc, pThreadParm) == 0) {
         delete pThreadParm->u.asyncselect.asyncSem;