diff options
| author | Liong Sauw Ming <ming@teluu.com> | 2016-06-08 02:55:24 +0000 |
|---|---|---|
| committer | Liong Sauw Ming <ming@teluu.com> | 2016-06-08 02:55:24 +0000 |
| commit | fd7ff41eec38181ba154286ca312a16b965aa07c (patch) | |
| tree | 08c01eacb2f87951a102c4ec2a3488aeb9dd79bc /pjsip | |
| parent | c95f39268f6c4a0833249db7d2cbd8748a3561ae (diff) | |
Close #1930: Race condition in OpenSSL socket
A workaround to solve the race condition based on ticket #985.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5338 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip')
| -rw-r--r-- | pjsip/src/pjsip/sip_transport_tls.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pjsip/src/pjsip/sip_transport_tls.c b/pjsip/src/pjsip/sip_transport_tls.c index d2107d12..bfce75fc 100644 --- a/pjsip/src/pjsip/sip_transport_tls.c +++ b/pjsip/src/pjsip/sip_transport_tls.c @@ -379,6 +379,7 @@ PJ_DEF(pj_status_t) pjsip_tls_transport_start2( pjsip_endpoint *endpt, ssock_param.cb.on_accept_complete = &on_accept_complete; ssock_param.async_cnt = async_cnt; ssock_param.ioqueue = pjsip_endpt_get_ioqueue(endpt); + ssock_param.timer_heap = pjsip_endpt_get_timer_heap(endpt); ssock_param.require_client_cert = listener->tls_setting.require_client_cert; ssock_param.timeout = listener->tls_setting.timeout; ssock_param.user_data = listener; @@ -1055,6 +1056,7 @@ static pj_status_t lis_create_transport(pjsip_tpfactory *factory, ssock_param.cb.on_data_sent = &on_data_sent; ssock_param.async_cnt = 1; ssock_param.ioqueue = pjsip_endpt_get_ioqueue(listener->endpt); + ssock_param.timer_heap = pjsip_endpt_get_timer_heap(listener->endpt); ssock_param.server_name = remote_name; ssock_param.timeout = listener->tls_setting.timeout; ssock_param.user_data = NULL; /* pending, must be set later */ |