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).




git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3117 74dad513-b988-da41-8d7b-12977e46ad98

2 files changed, 29 insertions, 23 deletions

diff --git a/pjlib/src/pj/ssl_sock_ossl.c b/pjlib/src/pj/ssl_sock_ossl.c
index 7fe0c435..3528fe72 100644
--- a/pjlib/src/pj/ssl_sock_ossl.c
+++ b/pjlib/src/pj/ssl_sock_ossl.c
@@ -1165,7 +1165,7 @@ static void on_timer(pj_timer_heap_t *th, struct pj_timer_entry *te)
 
     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));
 
 	on_handshake_complete(ssock, PJ_ETIMEDOUT);
@@ -1607,19 +1607,6 @@ static pj_bool_t asock_on_connect_complete (pj_activesock_t *asock,
     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
     /* Set server name to connect */
     if (ssock->param.server_name.slen) {
@@ -2290,6 +2277,19 @@ PJ_DECL(pj_status_t) pj_ssl_sock_start_connect(pj_ssl_sock_t *ssock,
     /* Save remote address */
     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);
 
diff --git a/pjlib/src/pj/ssl_sock_symbian.cpp b/pjlib/src/pj/ssl_sock_symbian.cpp
index 65916d73..9237ef13 100644
--- a/pjlib/src/pj/ssl_sock_symbian.cpp
+++ b/pjlib/src/pj/ssl_sock_symbian.cpp
@@ -171,7 +171,8 @@ private:
 	delete reader_;
 	reader_ = NULL;
 	if (securesock_) {
-	    securesock_->Close();
+	    if (state_ == SSL_STATE_ESTABLISHED)
+		securesock_->Close();
 	    delete securesock_;
 	    securesock_ = NULL;
 	}
@@ -213,10 +214,9 @@ int CPjSSLSocket::Connect(CPjSSLSocket_cb cb, void *key,
     key_ = key;
     rem_addr_ = rem_addr;
     servername_.Set(servername);
-    state_ = SSL_STATE_CONNECTING;
-
     rSock.Connect(rem_addr_, iStatus);
     SetActive();
+    state_ = SSL_STATE_CONNECTING;
     
     rSock.LocalName(local_addr_);
 
@@ -276,20 +276,16 @@ void CPjSSLSocket::DoCancel()
     case SSL_STATE_CONNECTING:
 	{
 	    RSocket &rSock = ((CPjSocket*)sock_)->Socket();
+
 	    rSock.CancelConnect();
-	    
 	    CleanupSubObjects();
-
 	    state_ = SSL_STATE_NULL;
 	}
 	break;
     case SSL_STATE_HANDSHAKING:
 	{
 	    securesock_->CancelHandshake();
-	    securesock_->Close();
-	    
 	    CleanupSubObjects();
-	    
 	    state_ = SSL_STATE_NULL;
 	}
 	break;
@@ -322,7 +318,15 @@ void CPjSSLSocket::RunL()
 	    if (servername_.Length() > 0)
 		securesock_->SetOpt(KSoSSLDomainName, KSolInetSSL,
 				    servername_);
-	    securesock_->FlushSessionCache();
+
+	    // FlushSessionCache() seems to also fire signals to all 
+	    // completed AOs (something like CActiveScheduler::RunIfReady())
+	    // which may cause problem, e.g: we've experienced that when 
+	    // SSL timeout is set to 1s, the SSL timeout timer fires up
+	    // at this point and securesock_ instance gets deleted here!
+	    // So be careful using this. And we don't think we need it here.
+	    //securesock_->FlushSessionCache();
+
 	    securesock_->StartClientHandshake(iStatus);
 	    SetActive();
 	    state_ = SSL_STATE_HANDSHAKING;
@@ -647,6 +651,7 @@ PJ_DEF(pj_status_t) pj_ssl_sock_create (pj_pool_t *pool,
     ssock->sock_type = param->sock_type;
     ssock->cb = param->cb;
     ssock->user_data = param->user_data;
+    ssock->timeout = param->timeout;
     ssock->ciphers_num = param->ciphers_num;
     if (param->ciphers_num > 0) {
 	unsigned i;
@@ -1153,6 +1158,7 @@ static void connect_cb(int err, void *key)
     } else {
 	delete ssock->sock;
 	ssock->sock = NULL;
+	if (err == KErrTimedOut) status = PJ_ETIMEDOUT;
     }
     
     if (ssock->cb.on_connect_complete) {