diff options
| author | Liong Sauw Ming <ming@teluu.com> | 2016-07-15 10:16:58 +0000 |
|---|---|---|
| committer | Liong Sauw Ming <ming@teluu.com> | 2016-07-15 10:16:58 +0000 |
| commit | e85eec1b45c88efce0ce2bc4557f31cd3516ddae (patch) | |
| tree | 7e878ab4ccd25ce7959d0f73f29cf05f600fa527 | |
| parent | 417c40e02da3d4d2c2d907a6119f1ebb6498d601 (diff) | |
Re #1928 (misc): Re #1878 (Compile time option for TCP/TLS transport to not create a listener)
When not creating a TLS listener, still call pj_ssl_sock_set_certificate(), since it will later still be used by clients.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5386 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjsip/src/pjsip/sip_transport_tls.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pjsip/src/pjsip/sip_transport_tls.c b/pjsip/src/pjsip/sip_transport_tls.c index 4ecf6197..19eed519 100644 --- a/pjsip/src/pjsip/sip_transport_tls.c +++ b/pjsip/src/pjsip/sip_transport_tls.c @@ -445,9 +445,6 @@ PJ_DEF(pj_status_t) pjsip_tls_transport_start2( pjsip_endpoint *endpt, pj_sockaddr_init(af, &listener->bound_addr, NULL, 0); } -#if !(defined(PJSIP_TLS_TRANSPORT_DONT_CREATE_LISTENER) && \ - PJSIP_TLS_TRANSPORT_DONT_CREATE_LISTENER != 0) - /* Check if certificate/CA list for SSL socket is set */ if (listener->tls_setting.cert_file.slen || listener->tls_setting.ca_list_file.slen || @@ -462,7 +459,12 @@ PJ_DEF(pj_status_t) pjsip_tls_transport_start2( pjsip_endpoint *endpt, &listener->cert); if (status != PJ_SUCCESS) goto on_error; + } + +#if !(defined(PJSIP_TLS_TRANSPORT_DONT_CREATE_LISTENER) && \ + PJSIP_TLS_TRANSPORT_DONT_CREATE_LISTENER != 0) + if (listener->cert) { status = pj_ssl_sock_set_certificate(listener->ssock, pool, listener->cert); if (status != PJ_SUCCESS) |