kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-18 15:49:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "res_pjsip/config_transport: Prevent async_operations > 1 when protocol = tls"

Browse Source
This commit is contained in:
Joshua Colp
2015-12-08 13:18:08 -06:00
committed by Gerrit Code Review
parent 67aae71d94 28ab03fbf7
commit 4cf470c70a
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/res_pjsip/config_transport.c
View File

@@ -216,6 +216,14 @@ static int transport_apply(const struct ast_sorcery *sorcery, void *obj)
res = pjsip_tcp_transport_start3(ast_sip_get_pjsip_endpoint(), &cfg, &transport->state->factory); res = pjsip_tcp_transport_start3(ast_sip_get_pjsip_endpoint(), &cfg, &transport->state->factory);
} else if (transport->type == AST_TRANSPORT_TLS) { } else if (transport->type == AST_TRANSPORT_TLS) {
/* The following check is a work-around for ASTERISK-25615.
* When that issue is resolved in upstream pjproject, this check can be removed.
*/
if (transport->async_operations > 1) {
ast_log(LOG_ERROR, "Transport: %s: When protocol=tls, async_operations can't be > 1 (ASTERISK-25615)\n",
ast_sorcery_object_get_id(obj));
return -1;
}
transport->tls.ca_list_file = pj_str((char*)transport->ca_list_file); transport->tls.ca_list_file = pj_str((char*)transport->ca_list_file);
#ifdef HAVE_PJ_SSL_CERT_LOAD_FROM_FILES2 #ifdef HAVE_PJ_SSL_CERT_LOAD_FROM_FILES2
transport->tls.ca_list_path = pj_str((char*)transport->ca_list_path); transport->tls.ca_list_path = pj_str((char*)transport->ca_list_path);