Changeset 3051

Timestamp:

Jan 8, 2010 1:08:05 PM (13 years ago)

Author:

nanang

Message:

Ticket #1001:

• Moved setsockopt(SO_UPDATE_ACCEPT_CONTEXT) from pj_sock_accept() to ioqueue_on_accept_complete().
• Added setsockopt(SO_UPDATE_ACCEPT_CONTEXT) in pj_sock_accept() for new accepted socket when immediate connection is available.
• Added pj_sock_getsockname() check in unit test ioq_tcp.c for new accepted socket.

Location:

pjproject/trunk/pjlib/src

Files:

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

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

@@ -168 +168 @@
  * Process the socket when the overlapped accept() completed.
  */
-static void ioqueue_on_accept_complete(ioqueue_accept_rec *accept_overlapped)
+static void ioqueue_on_accept_complete(pj_ioqueue_key_t *key,
+                                       ioqueue_accept_rec *accept_overlapped)
 {
     struct sockaddr *local;
     struct sockaddr *remote;
     int locallen, remotelen;
+    pj_status_t status;
 
     PJ_CHECK_STACK();
+
+    /* On WinXP or later, use SO_UPDATE_ACCEPT_CONTEXT so that socket 
+     * addresses can be obtained with getsockname() and getpeername().
+     */
+    status = setsockopt(accept_overlapped->newsock, SOL_SOCKET,
+                        SO_UPDATE_ACCEPT_CONTEXT, 
+                        (char*)&key->hnd, 
+                        sizeof(SOCKET));
+    /* SO_UPDATE_ACCEPT_CONTEXT is for WinXP or later.
+     * So ignore the error status.
+     */
 
     /* Operation complete immediately. */
@@ -707 +720 @@
         case PJ_IOQUEUE_OP_ACCEPT:
             /* special case for accept. */
-            ioqueue_on_accept_complete((ioqueue_accept_rec*)pOv);
+            ioqueue_on_accept_complete(key, (ioqueue_accept_rec*)pOv);
             if (key->cb.on_accept_complete) {
                 ioqueue_accept_rec *accept_rec = (ioqueue_accept_rec*)pOv;
@@ -1212 +1225 @@
             int status;
 
+            /* On WinXP or later, use SO_UPDATE_ACCEPT_CONTEXT so that socket 
+             * addresses can be obtained with getsockname() and getpeername().
+             */
+            status = setsockopt(sock, SOL_SOCKET, SO_UPDATE_ACCEPT_CONTEXT,
+                                (char*)&key->hnd, sizeof(SOCKET));
+            /* SO_UPDATE_ACCEPT_CONTEXT is for WinXP or later.
+             * So ignore the error status.
+             */
+
             status = getsockname(sock, local, addrlen);
             if (status != 0) {
@@ -1240 +1262 @@
     if (status != PJ_SUCCESS)
         return status;
-
-    /* On WinXP or later, use SO_UPDATE_ACCEPT_CONTEXT so that socket 
-     * addresses can be obtained with getsockname() and getpeername().
-     */
-    status = setsockopt(op_key_rec->accept.newsock, SOL_SOCKET,
-                        SO_UPDATE_ACCEPT_CONTEXT, 
-                        (char*)&key->hnd, sizeof(SOCKET));
-    /* SO_UPDATE_ACCEPT_CONTEXT is for WinXP or later.
-     * So ignore the error status.
-     */
 
     op_key_rec->accept.operation = PJ_IOQUEUE_OP_ACCEPT;
@@ -1266 +1278 @@
 
     if (rc == TRUE) {
-        ioqueue_on_accept_complete(&op_key_rec->accept);
+        ioqueue_on_accept_complete(key, &op_key_rec->accept);
         return PJ_SUCCESS;
     } else {

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

@@ -98 +98 @@
         }
     } else {
+        pj_sockaddr addr;
+        int client_addr_len;
+
+        client_addr_len = sizeof(addr);
+        status = pj_sock_getsockname(sock, &addr, &client_addr_len);
+        if (status != PJ_SUCCESS) {
+            app_perror("...ERROR in pj_sock_getsockname()", status);
+        }
+
         callback_accept_key = key;
         callback_accept_op = op_key;