Changeset 3117 for pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c

Timestamp:

Mar 6, 2010 2:04:52 AM (14 years ago)

Author:

nanang

Message:

Ticket #1043:

• Fixed bug of unused timeout setting in Symbian SSL socket, ssl_sock_symbian.cpp.
• Added an SSL test scenario of SSL connect timeout, SSL socket client tries to connect to non-SSL socket server.
• Fixed OpenSSL-based SSL socket to start SSL timer before TCP connect (was started after TCP connected and before SSL handshake).

File:

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

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

@@ -1166 +1166 @@
     switch (timer_id) {
     case TIMER_HANDSHAKE_TIMEOUT:
-        PJ_LOG(1,(ssock->pool->obj_name, "SSL handshake timeout after %d.%ds",
+        PJ_LOG(1,(ssock->pool->obj_name, "SSL timeout after %d.%ds",
                   ssock->param.timeout.sec, ssock->param.timeout.msec));
 
@@ -1607 +1607 @@
     ssock->write_state.start = ssock->write_state.buf;
     ssock->write_state.len = 0;
-
-    /* Start handshake timer */
-    if (ssock->param.timer_heap && (ssock->param.timeout.sec != 0 ||
-        ssock->param.timeout.msec != 0))
-    {
-        pj_assert(ssock->timer.id == TIMER_NONE);
-        ssock->timer.id = TIMER_HANDSHAKE_TIMEOUT;
-        status = pj_timer_heap_schedule(ssock->param.timer_heap,
-                                        &ssock->timer,
-                                        &ssock->param.timeout);
-        if (status != PJ_SUCCESS)
-            ssock->timer.id = TIMER_NONE;
-    }
 
 #ifdef SSL_set_tlsext_host_name
@@ -2291 +2278 @@
     pj_sockaddr_cp(&ssock->rem_addr, remaddr);
 
+    /* Start timer */
+    if (ssock->param.timer_heap && (ssock->param.timeout.sec != 0 ||
+        ssock->param.timeout.msec != 0))
+    {
+        pj_assert(ssock->timer.id == TIMER_NONE);
+        ssock->timer.id = TIMER_HANDSHAKE_TIMEOUT;
+        status = pj_timer_heap_schedule(ssock->param.timer_heap,
+                                        &ssock->timer,
+                                        &ssock->param.timeout);
+        if (status != PJ_SUCCESS)
+            ssock->timer.id = TIMER_NONE;
+    }
+
     status = pj_activesock_start_connect(ssock->asock, pool, remaddr,
                                          addr_len);