kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-29 15:36:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "config_transport: Enable TCP_NODELAY on TLS transports"

Browse Source
This commit is contained in:
Jenkins2
2018-01-15 10:40:27 -06:00
committed by Gerrit Code Review
parent 569c1a0614 cabe80631b
commit 6f1f16d887
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
res/res_pjsip/config_transport.c
View File

@@ -618,6 +618,8 @@ static int transport_apply(const struct ast_sorcery *sorcery, void *obj)
&temp_state->state->factory); &temp_state->state->factory);
} }
} else if (transport->type == AST_TRANSPORT_TLS) { } else if (transport->type == AST_TRANSPORT_TLS) {
static int option = 1;
if (transport->async_operations > 1 && ast_compare_versions(pj_get_version(), "2.5.0") < 0) { if (transport->async_operations > 1 && ast_compare_versions(pj_get_version(), "2.5.0") < 0) {
ast_log(LOG_ERROR, "Transport: %s: When protocol=tls and pjproject version < 2.5.0, async_operations can't be > 1\n", ast_log(LOG_ERROR, "Transport: %s: When protocol=tls and pjproject version < 2.5.0, async_operations can't be > 1\n",
ast_sorcery_object_get_id(obj)); ast_sorcery_object_get_id(obj));
@@ -627,6 +629,13 @@ static int transport_apply(const struct ast_sorcery *sorcery, void *obj)
temp_state->state->tls.password = pj_str((char*)transport->password); temp_state->state->tls.password = pj_str((char*)transport->password);
set_qos(transport, &temp_state->state->tls.qos_params); set_qos(transport, &temp_state->state->tls.qos_params);
/* sockopt_params.options is copied to each newly connected socket */
temp_state->state->tls.sockopt_params.options[0].level = pj_SOL_TCP();
temp_state->state->tls.sockopt_params.options[0].optname = pj_TCP_NODELAY();
temp_state->state->tls.sockopt_params.options[0].optval = &option;
temp_state->state->tls.sockopt_params.options[0].optlen = sizeof(option);
temp_state->state->tls.sockopt_params.cnt = 1;
for (i = 0; i < BIND_TRIES && res != PJ_SUCCESS; i++) { for (i = 0; i < BIND_TRIES && res != PJ_SUCCESS; i++) {
if (perm_state && perm_state->state && perm_state->state->factory if (perm_state && perm_state->state && perm_state->state->factory
&& perm_state->state->factory->destroy) { && perm_state->state->factory->destroy) {