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

res_pjsip: Add support for partial transport reload.

Browse Source 
Some configuration items for a transport do not result in
the underlying transport changing, but instead are just
state we keep ourselves and use. It is perfectly reasonable
to change these items.

These include local_net and external_* information.

ASTERISK-29354

Change-Id: I027857ccfe4419f460243e562b5f098434b3d43a
This commit is contained in:
Joshua C. Colp
2021-03-01 19:32:24 -04:00
committed by Joshua Colp
parent f47c5cbdf9
commit f213833514
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
res/res_pjsip/config_transport.c
View File

@@ -670,20 +670,15 @@ static int transport_apply(const struct ast_sorcery *sorcery, void *obj)
return 0;
}
if (!transport->allow_reload && !transport->flow) {
if (!perm_state->change_detected) {
perm_state->change_detected = 1;
ast_log(LOG_WARNING, "Transport '%s' is not reloadable, maintaining previous values\n", transport_id);
}
/* In case someone is using the deprecated fields, reset them */
transport->state = perm_state->state;
copy_state_to_transport(transport);
ao2_replace(perm_state->transport, transport);
return 0;
/* If we aren't allowed to reload then we copy values that can't be changed from perm_state */
if (!transport->allow_reload) {
memcpy(&temp_state->state->host, &perm_state->state->host, sizeof(temp_state->state->host));
memcpy(&temp_state->state->tls, &perm_state->state->tls, sizeof(temp_state->state->tls));
memcpy(&temp_state->state->ciphers, &perm_state->state->ciphers, sizeof(temp_state->state->ciphers));
}
}
if (!transport->flow) {
if (!transport->flow && (!perm_state || transport->allow_reload)) {
if (temp_state->state->host.addr.sa_family != PJ_AF_INET && temp_state->state->host.addr.sa_family != PJ_AF_INET6) {
ast_log(LOG_ERROR, "Transport '%s' could not be started as binding not specified\n", transport_id);
return -1;
@@ -739,6 +734,12 @@ static int transport_apply(const struct ast_sorcery *sorcery, void *obj)
temp_state->state->flow = 1;
res = PJ_SUCCESS;
} else if (!transport->allow_reload && perm_state) {
/* We inherit the transport from perm state, untouched */
ast_log(LOG_WARNING, "Transport '%s' is not fully reloadable, not reloading: protocol, bind, TLS, TCP, ToS, or CoS options.\n", transport_id);
temp_state->state->transport = perm_state->state->transport;
perm_state->state->transport = NULL;
res = PJ_SUCCESS;
} else if (transport->type == AST_TRANSPORT_UDP) {
for (i = 0; i < BIND_TRIES && res != PJ_SUCCESS; i++) {