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

Merge "pjsip_options: dynamic contact's fields not updated on reload" into 13

Browse Source
This commit is contained in:
Jenkins2
2017-12-13 13:57:44 -06:00
committed by Gerrit Code Review
parent 20ca06b1db f20ab2b65f
commit 53f1de6259
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
res/res_pjsip/pjsip_options.c
View File

@@ -1157,7 +1157,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;
}