sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pjsip_options: dynamic contact's fields not updated on reload 

Dynamic contacts were not being properly updated on reload. As a matter of
fact any changes to the AOR that a dynamic contact was associated with were
not being applied.

On reload, this patch makes it so for each dynamic contact, the associated
AOR is now retrieved and the AOR's fields are applied to the contact.

ASTERISK-27467

Change-Id: I8e3165dc6a745218c1c9db837f77fafa0516985d
This commit is contained in:
Kevin Harwell 2017-12-07 18:18:00 -06:00
parent b0b28446c1
commit bd2218ce63
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
res/res_pjsip/pjsip_options.c
View File

@ -1147,7 +1147,24 @@ static int qualify_and_schedule_cb_with_aor(void *obj, void *arg, int flags)
static int qualify_and_schedule_cb_without_aor(void *obj, void *arg, int flags)
{
qualify_and_schedule_contact((struct ast_sip_contact *) obj);
/*
* These are really dynamic contacts. We need to retrieve the aor associated
* with the contact since it's possible some of the aor's fields were updated
* since last load.
*/
struct ast_sip_contact *contact = obj;
struct ast_sip_aor *aor = ast_sip_location_retrieve_aor(contact->aor);
if (aor) {
qualify_and_schedule_cb_with_aor(obj, aor, flags);
ao2_ref(aor, -1);
} else {
ast_log(LOG_WARNING, "Unable to locate AOR for contact '%s'. Keeping old "
"associated settings: frequency=%d, timeout=%f, authenticate=%s\n",
contact->uri, contact->qualify_frequency, contact->qualify_timeout,
contact->authenticate_qualify ? "yes" : "no");
qualify_and_schedule_contact(contact);
}
return 0;
}