Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed account's route set update when modifying account #3825

Merged
merged 4 commits into from
Jan 16, 2024
Merged

Fixed account's route set update when modifying account #3825

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e55af9a
Fixed account's route set update when modifying account
sauwming Jan 10, 2024
8cd8b73
Optimize route set modification
sauwming Jan 11, 2024
80049cb
Fixed doc and remove test code
sauwming Jan 11, 2024
cb1785a
Minor: removed unnecessary white space
sauwming Jan 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 17 additions & 31 deletions pjsip/src/pjsua-lib/pjsua_acc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -841,6 +841,7 @@ PJ_DEF(pj_status_t) pjsua_acc_modify( pjsua_acc_id acc_id,
pj_bool_t update_reg = PJ_FALSE;
pj_bool_t unreg_first = PJ_FALSE;
pj_bool_t update_mwi = PJ_FALSE;
pj_bool_t update_route = PJ_FALSE;
pj_status_t status = PJ_SUCCESS;

PJ_ASSERT_RETURN(acc_id>=0 && acc_id<(int)PJ_ARRAY_SIZE(pjsua_var.acc),
Expand Down Expand Up @@ -907,6 +908,8 @@ PJ_DEF(pj_status_t) pjsua_acc_modify( pjsua_acc_id acc_id,
}

reg_sip_uri = (pjsip_sip_uri*) pjsip_uri_get_uri(reg_uri);

update_route = PJ_TRUE;
}

/* REGISTER header list */
Expand All @@ -921,8 +924,17 @@ PJ_DEF(pj_status_t) pjsua_acc_modify( pjsua_acc_id acc_id,
/* Global outbound proxy */
global_route_crc = calc_proxy_crc(pjsua_var.ua_cfg.outbound_proxy,
pjsua_var.ua_cfg.outbound_proxy_cnt);
if (global_route_crc != acc->global_route_crc) {
/* Account proxy */
local_route_crc = calc_proxy_crc(cfg->proxy, cfg->proxy_cnt);
if (global_route_crc != acc->global_route_crc ||
local_route_crc != acc->local_route_crc)
{
update_route = PJ_TRUE;
}

if (update_route) {
pjsip_route_hdr *r;
unsigned i;

/* Copy from global outbound proxies */
pj_list_init(&global_route);
Expand All @@ -932,13 +944,6 @@ PJ_DEF(pj_status_t) pjsua_acc_modify( pjsua_acc_id acc_id,
pjsip_hdr_shallow_clone(acc->pool, r));
r = r->next;
}
}

/* Account proxy */
local_route_crc = calc_proxy_crc(cfg->proxy, cfg->proxy_cnt);
if (local_route_crc != acc->local_route_crc) {
pjsip_route_hdr *r;
unsigned i;

/* Validate the local route and save it to temporary var */
pj_list_init(&local_route);
Expand Down Expand Up @@ -1160,38 +1165,19 @@ PJ_DEF(pj_status_t) pjsua_acc_modify( pjsua_acc_id acc_id,
unreg_first = PJ_TRUE;
}

/* Global outbound proxy */
if (global_route_crc != acc->global_route_crc) {
/* Update route set */
if (update_route) {
unsigned i;
pj_size_t rcnt;

/* Remove the outbound proxies from the route set */
rcnt = pj_list_size(&acc->route_set);
for (i=0; i < rcnt - acc->cfg.proxy_cnt; ++i) {
pjsip_route_hdr *r = acc->route_set.next;
pj_list_erase(r);
}
/* Clear the route set */
pj_list_init(&acc->route_set);

/* Insert the outbound proxies to the beginning of route set */
pj_list_merge_first(&acc->route_set, &global_route);

/* Update global route CRC */
acc->global_route_crc = global_route_crc;

update_reg = PJ_TRUE;
unreg_first = PJ_TRUE;
}

/* Account proxy */
if (local_route_crc != acc->local_route_crc) {
unsigned i;

/* Remove the current account proxies from the route set */
for (i=0; i < acc->cfg.proxy_cnt; ++i) {
pjsip_route_hdr *r = acc->route_set.prev;
pj_list_erase(r);
}

/* Insert new proxy setting to the route set */
pj_list_merge_last(&acc->route_set, &local_route);

Expand Down
Loading