Changeset 2240 for pjproject/trunk/pjlib/src/pj/ioqueue_winnt.c

Timestamp:

Aug 26, 2008 2:41:26 PM (16 years ago)

Author:

bennylp

Message:

Fixed ticket #601: Bug in IoCompletionPort? ioqueue with TCP server socket causes ioqueue to unable to accept incoming TCP connections

File:

• pjproject/trunk/pjlib/src/pj/ioqueue_winnt.c (modified) (3 diffs)

pjproject/trunk/pjlib/src/pj/ioqueue_winnt.c

@@ -176 +176 @@
 
     /* Operation complete immediately. */
-    GetAcceptExSockaddrs( accept_overlapped->accept_buf,
-                          0, 
-                          ACCEPT_ADDR_LEN,
-                          ACCEPT_ADDR_LEN,
-                          &local,
-                          &locallen,
-                          &remote,
-                          &remotelen);
-    if (*accept_overlapped->addrlen >= locallen) {
-        pj_memcpy(accept_overlapped->local, local, locallen);
-        pj_memcpy(accept_overlapped->remote, remote, locallen);
-    } else {
-        pj_bzero(accept_overlapped->local, *accept_overlapped->addrlen);
-        pj_bzero(accept_overlapped->remote, *accept_overlapped->addrlen);
-    }
-    *accept_overlapped->addrlen = locallen;
+    if (accept_overlapped->addrlen) {
+        GetAcceptExSockaddrs( accept_overlapped->accept_buf,
+                              0, 
+                              ACCEPT_ADDR_LEN,
+                              ACCEPT_ADDR_LEN,
+                              &local,
+                              &locallen,
+                              &remote,
+                              &remotelen);
+        if (*accept_overlapped->addrlen >= locallen) {
+            if (accept_overlapped->local)
+                pj_memcpy(accept_overlapped->local, local, locallen);
+            if (accept_overlapped->remote)
+                pj_memcpy(accept_overlapped->remote, remote, locallen);
+        } else {
+            if (accept_overlapped->local)
+                pj_bzero(accept_overlapped->local, 
+                         *accept_overlapped->addrlen);
+            if (accept_overlapped->remote)
+                pj_bzero(accept_overlapped->remote, 
+                         *accept_overlapped->addrlen);
+        }
+
+        *accept_overlapped->addrlen = locallen;
+    }
     if (accept_overlapped->newsock_ptr)
         *accept_overlapped->newsock_ptr = accept_overlapped->newsock;
@@ -701 +710 @@
                 ioqueue_accept_rec *accept_rec = (ioqueue_accept_rec*)pOv;
                 pj_status_t status = PJ_SUCCESS;
-
-                if (accept_rec->newsock == PJ_INVALID_SOCKET) {
+                pj_sock_t newsock;
+
+                newsock = accept_rec->newsock;
+                accept_rec->newsock = PJ_INVALID_SOCKET;
+
+                if (newsock == PJ_INVALID_SOCKET) {
                     int dwError = WSAGetLastError();
                     if (dwError == 0) dwError = OSERR_ENOTCONN;
@@ -708 +721 @@
                 }
 
-                key->cb.on_accept_complete(key, 
-                                           (pj_ioqueue_op_key_t*)pOv, 
-                                           accept_rec->newsock,
-                                           status);
-                accept_rec->newsock = PJ_INVALID_SOCKET;
+                key->cb.on_accept_complete(key, (pj_ioqueue_op_key_t*)pOv,
+                                           newsock, status);
+                
             }
             break;