Changeset 3117 for pjproject/trunk/pjlib/src/pj/ssl_sock_symbian.cpp
- Timestamp:
- Mar 6, 2010 2:04:52 AM (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk/pjlib/src/pj/ssl_sock_symbian.cpp
r3110 r3117 172 172 reader_ = NULL; 173 173 if (securesock_) { 174 securesock_->Close(); 174 if (state_ == SSL_STATE_ESTABLISHED) 175 securesock_->Close(); 175 176 delete securesock_; 176 177 securesock_ = NULL; … … 214 215 rem_addr_ = rem_addr; 215 216 servername_.Set(servername); 216 state_ = SSL_STATE_CONNECTING;217 218 217 rSock.Connect(rem_addr_, iStatus); 219 218 SetActive(); 219 state_ = SSL_STATE_CONNECTING; 220 220 221 221 rSock.LocalName(local_addr_); … … 277 277 { 278 278 RSocket &rSock = ((CPjSocket*)sock_)->Socket(); 279 279 280 rSock.CancelConnect(); 280 281 281 CleanupSubObjects(); 282 283 282 state_ = SSL_STATE_NULL; 284 283 } … … 287 286 { 288 287 securesock_->CancelHandshake(); 289 securesock_->Close();290 291 288 CleanupSubObjects(); 292 293 289 state_ = SSL_STATE_NULL; 294 290 } … … 323 319 securesock_->SetOpt(KSoSSLDomainName, KSolInetSSL, 324 320 servername_); 325 securesock_->FlushSessionCache(); 321 322 // FlushSessionCache() seems to also fire signals to all 323 // completed AOs (something like CActiveScheduler::RunIfReady()) 324 // which may cause problem, e.g: we've experienced that when 325 // SSL timeout is set to 1s, the SSL timeout timer fires up 326 // at this point and securesock_ instance gets deleted here! 327 // So be careful using this. And we don't think we need it here. 328 //securesock_->FlushSessionCache(); 329 326 330 securesock_->StartClientHandshake(iStatus); 327 331 SetActive(); … … 648 652 ssock->cb = param->cb; 649 653 ssock->user_data = param->user_data; 654 ssock->timeout = param->timeout; 650 655 ssock->ciphers_num = param->ciphers_num; 651 656 if (param->ciphers_num > 0) { … … 1154 1159 delete ssock->sock; 1155 1160 ssock->sock = NULL; 1161 if (err == KErrTimedOut) status = PJ_ETIMEDOUT; 1156 1162 } 1157 1163
Note: See TracChangeset
for help on using the changeset viewer.