Changeset 559 for pjproject/trunk

Timestamp:

Jun 28, 2006 3:23:18 PM (18 years ago)

Author:

bennylp

Message:

Fixed bug in ioqueue IOCP: accept() callback is called with new socket handle already reset to -1

Location:

pjproject/trunk/pjlib/src

Files:

• pj/ioqueue_winnt.c (modified) (2 diffs)
• pjlib-test/ioq_tcp.c (modified) (1 diff)
• pjlib-test/test.h (modified) (1 diff)

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

@@ -185 +185 @@
         *accept_overlapped->newsock_ptr = accept_overlapped->newsock;
     accept_overlapped->operation = 0;
-    accept_overlapped->newsock = PJ_INVALID_SOCKET;
 }
 
@@ -633 +632 @@
                                            accept_rec->newsock,
                                            PJ_SUCCESS);
+                accept_rec->newsock = PJ_INVALID_SOCKET;
             }
             break;

pjproject/trunk/pjlib/src/pjlib-test/ioq_tcp.c

@@ -83 +83 @@
                               int status)
 {
-    PJ_UNUSED_ARG(sock);
-
-    callback_accept_key = key;
-    callback_accept_op = op_key;
-    callback_accept_status = status;
+    if (sock == PJ_INVALID_SOCKET) {
+
+        if (status != PJ_SUCCESS) {
+            /* Ignore. Could be blocking error */
+            app_perror(".....warning: received error in on_ioqueue_accept() callback",
+                       status);
+        } else {
+            callback_accept_status = -61;
+            PJ_LOG(3,("", "..... on_ioqueue_accept() callback was given "
+                          "invalid socket and status is %d", status));
+        }
+    } else {
+        callback_accept_key = key;
+        callback_accept_op = op_key;
+        callback_accept_status = status;
+    }
 }
 

pjproject/trunk/pjlib/src/pjlib-test/test.h

@@ -49 +49 @@
 #define INCLUDE_TCP_IOQUEUE_TEST    GROUP_NETWORK
 #define INCLUDE_IOQUEUE_PERF_TEST   GROUP_NETWORK
-#define INCLUDE_IOQUEUE_UNREG_TEST  1   // GROUP_NETWORK
+#define INCLUDE_IOQUEUE_UNREG_TEST  GROUP_NETWORK
 #define INCLUDE_FILE_TEST           GROUP_FILE