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

Create new contact for reregistration after transport disconnected (#2572)

This commit is contained in:
Nanang Izzuddin 2020-11-20 10:53:59 +07:00 committed by GitHub
parent 2925cca94f
commit c6bc0b1e2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
pjsip/src/pjsua-lib/pjsua_acc.c
View File

@ -3792,6 +3792,41 @@ static void auto_rereg_timer_cb(pj_timer_heap_t *th, pj_timer_entry *te)
/* Start re-registration */
acc->auto_rereg.attempt_cnt++;
/* Generate new contact as the current contact may use a disconnected
* transport. Only do this when outbound is not active and contact is not
* rewritten (where the contact address may really be used by server to
* contact the UA).
*/
if (acc->rfc5626_status != OUTBOUND_ACTIVE && !acc->contact_rewritten) {
pj_str_t tmp_contact;
pj_pool_t *pool;
pool = pjsua_pool_create("tmpregc", 512, 512);
status = pjsua_acc_create_uac_contact(pool, &tmp_contact, acc->index,
&acc->cfg.reg_uri);
if (status != PJ_SUCCESS) {
pjsua_perror(THIS_FILE,
"Unable to generate suitable Contact header"
" for re-registration", status);
pj_pool_release(pool);
schedule_reregistration(acc);
goto on_return;
}
if (pj_strcmp(&tmp_contact, &acc->contact)) {
if (acc->contact.slen < tmp_contact.slen) {
pj_strdup_with_null(acc->pool, &acc->contact, &tmp_contact);
} else {
pj_strcpy(&acc->contact, &tmp_contact);
}
update_regc_contact(acc);
pjsip_regc_update_contact(acc->regc, 1, &acc->reg_contact);
}
pj_pool_release(pool);
}
status = pjsua_acc_set_registration(acc->index, PJ_TRUE);
if (status != PJ_SUCCESS)
schedule_reregistration(acc);
@ -3917,6 +3952,10 @@ void pjsua_acc_on_tp_state_changed(pjsip_transport *tp,
if (acc->via_tp == (void*)tp) {
pj_bzero(&acc->via_addr, sizeof(acc->via_addr));
acc->via_tp = NULL;
/* Also reset regc's Via addr */
if (acc->regc)
pjsip_regc_set_via_sent_by(acc->regc, NULL, NULL);
}
/* Release transport immediately if regc is using it