diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2018-01-15 10:40:27 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2018-01-15 10:40:27 -0600 |
| commit | 6f1f16d88720db2f0c29f323dce2ba065cb0c9ce (patch) | |
| tree | d4b4780c14283614fddd7b48e7f74a65c3330bd1 | |
| parent | 569c1a0614f1d05cb7c2f01ac7d51d38af6e9de7 (diff) | |
| parent | cabe80631be472a6fa9550f4de0c3e8ab4614bb6 (diff) | |
Merge "config_transport: Enable TCP_NODELAY on TLS transports"
| -rw-r--r-- | res/res_pjsip/config_transport.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/res/res_pjsip/config_transport.c b/res/res_pjsip/config_transport.c index a9a90ac92..63bf11812 100644 --- a/res/res_pjsip/config_transport.c +++ b/res/res_pjsip/config_transport.c @@ -618,6 +618,8 @@ static int transport_apply(const struct ast_sorcery *sorcery, void *obj) &temp_state->state->factory); } } 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) { 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)); @@ -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); 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++) { if (perm_state && perm_state->state && perm_state->state->factory && perm_state->state->factory->destroy) { |