diff options
Diffstat (limited to 'pjsip/src/pjsip/sip_transport_tls.c')
| -rw-r--r-- | pjsip/src/pjsip/sip_transport_tls.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/pjsip/src/pjsip/sip_transport_tls.c b/pjsip/src/pjsip/sip_transport_tls.c index 6302a4d4..ac7ac930 100644 --- a/pjsip/src/pjsip/sip_transport_tls.c +++ b/pjsip/src/pjsip/sip_transport_tls.c @@ -339,7 +339,7 @@ PJ_DEF(pj_status_t) pjsip_tls_transport_start2( pjsip_endpoint *endpt, } } - pool = pjsip_endpt_create_pool(endpt, "tlslis", POOL_LIS_INIT, + pool = pjsip_endpt_create_pool(endpt, "tlstp", POOL_LIS_INIT, POOL_LIS_INC); PJ_ASSERT_RETURN(pool, PJ_ENOMEM); @@ -354,7 +354,7 @@ PJ_DEF(pj_status_t) pjsip_tls_transport_start2( pjsip_endpoint *endpt, listener->factory.flag = pjsip_transport_get_flag_from_type(listener->factory.type); - pj_ansi_strcpy(listener->factory.obj_name, "tlslis"); + pj_ansi_strcpy(listener->factory.obj_name, "tlstp"); if (is_ipv6) pj_ansi_strcat(listener->factory.obj_name, "6"); @@ -419,6 +419,9 @@ PJ_DEF(pj_status_t) pjsip_tls_transport_start2( pjsip_endpoint *endpt, pj_grp_lock_add_handler(listener->grp_lock, pool, listener, &lis_on_destroy); +#if !(defined(PJSIP_TLS_TRANSPORT_DONT_CREATE_LISTENER) && \ + PJSIP_TLS_TRANSPORT_DONT_CREATE_LISTENER != 0) + ssock_param.grp_lock = listener->grp_lock; /* Create SSL socket */ @@ -426,6 +429,8 @@ PJ_DEF(pj_status_t) pjsip_tls_transport_start2( pjsip_endpoint *endpt, if (status != PJ_SUCCESS) goto on_error; +#endif + /* Bind address may be different than factory.local_addr because * factory.local_addr will be resolved below. */ @@ -439,6 +444,9 @@ 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 || @@ -480,6 +488,8 @@ PJ_DEF(pj_status_t) pjsip_tls_transport_start2( pjsip_endpoint *endpt, goto on_error; } +#endif + /* If published host/IP is specified, then use that address as the * listener advertised address. */ @@ -518,7 +528,7 @@ PJ_DEF(pj_status_t) pjsip_tls_transport_start2( pjsip_endpoint *endpt, pj_ansi_snprintf(listener->factory.obj_name, sizeof(listener->factory.obj_name), - "tlslis:%d", listener->factory.addr_name.port); + "tlstp:%d", listener->factory.addr_name.port); /* Register to transport manager */ listener->endpt = endpt; @@ -569,7 +579,7 @@ static void lis_on_destroy(void *arg) if (listener->factory.pool) { pj_pool_t *pool = listener->factory.pool; - PJ_LOG(4,(listener->factory.obj_name, "SIP TLS listener destroyed")); + PJ_LOG(4,(listener->factory.obj_name, "SIP TLS transport destroyed")); listener->factory.pool = NULL; pj_pool_release(pool); |