FGCOM
/
pjproject
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Option to use SIP UPDATE for refreshing calls in IP change (#3146)

Browse Source 
* Option to use SIP UPDATE for refreshing calls in IP change

* Updated docs

* Add AccountIpChangeConfig.reinvUseUpdate in PJSUA2

* Add logs for debugging and display menu 'I' for IP change in pjsua app (the IP change action was already there just hidden).
remotes/origin/ip-change-early
Nanang Izzuddin 2 years ago committed by GitHub
parent c804b31f85
commit c12693f3d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 84 additions and 6 deletions
Show Stats Download Patch File Download Diff File

3
pjsip-apps/src/pjsua/pjsua_app_legacy.c
Unescape View File

@ -247,7 +247,8 @@ static void keystroke_help()
puts("| Video: \"vid help\" for more info |");
puts("+-----------------------------------------------------------------------------+");
#endif
puts("| q QUIT L ReLoad sleep MS echo [0|1|txt] n: detect NAT type |");
puts("| q QUIT L ReLoad I IP change n detect NAT type |");
puts("| sleep MS echo [0|1|txt] |");
puts("+=============================================================================+");
i = pjsua_call_get_count();

11
pjsip/include/pjsua-lib/pjsua.h
Unescape View File

@ -2717,6 +2717,17 @@ typedef struct pjsua_ip_change_acc_cfg
*/
unsigned reinvite_flags;
/**
* For refreshing the call, use SIP UPDATE, instead of re-INVITE, if
* remote supports it (by publishing it in Allow header). If remote
* does not support UPDATE method or somehow the UPDATE attempt fails,
* it will fallback to using re-INVITE. The \a reinvite_flags will be
* used regardless whether it is re-INVITE or UPDATE that is sent.
*
* Default: PJ_FALSE (using re-INVITE).
*/
pj_bool_t reinv_use_update;
} pjsua_ip_change_acc_cfg;

11
pjsip/include/pjsua2/account.hpp
Unescape View File

@ -1232,6 +1232,17 @@ typedef struct AccountIpChangeConfig
*/
unsigned reinviteFlags;
/**
* For refreshing the call, use SIP UPDATE, instead of re-INVITE, if
* remote supports it (by publishing it in Allow header). If remote
* does not support UPDATE method or somehow the UPDATE attempt fails,
* it will fallback to using re-INVITE. The \a reinviteFlags will be
* used regardless whether it is re-INVITE or UPDATE that is sent.
*
* Default: PJ_FALSE (using re-INVITE).
*/
unsigned reinvUseUpdate;
public:
/**
* Virtual destructor

63
pjsip/src/pjsua-lib/pjsua_acc.c
Unescape View File

@ -4214,9 +4214,10 @@ pj_status_t pjsua_acc_handle_call_on_ip_change(pjsua_acc *acc)
{
for (i = 0; i < (int)pjsua_var.ua_cfg.max_calls; ++i) {
pjsua_call_info call_info;
pjsua_call_get_info(i, &call_info);
if (pjsua_var.calls[i].acc_id != acc->index)
status = pjsua_call_get_info(i, &call_info);
if (status != PJ_SUCCESS ||
pjsua_var.calls[i].acc_id != acc->index)
{
continue;
}
@ -4247,21 +4248,73 @@ pj_status_t pjsua_acc_handle_call_on_ip_change(pjsua_acc *acc)
} else if ((acc->cfg.ip_change_cfg.reinvite_flags) &&
(call_info.state == PJSIP_INV_STATE_CONFIRMED))
{
pj_bool_t use_update = acc->cfg.ip_change_cfg.reinv_use_update;
/* Check if remote support SIP UPDATE method */
if (use_update) {
pjsua_call *call;
pjsip_dialog *dlg = NULL;
PJ_LOG(5, (THIS_FILE, "Call #%d: IP change is configured "
"to using UPDATE", i));
status = acquire_call("handle_call_on_ip_change()",
i, &call, &dlg);
if (status != PJ_SUCCESS) {
use_update = PJ_FALSE;
PJ_PERROR(3,(THIS_FILE, status,
"Call #%d: IP change cannot "
"check if remote supports UPDATE due to "
"failure in acquiring dialog lock", i));
} else {
const pj_str_t ST_UPDATE = {"UPDATE", 6};
use_update = pjsip_dlg_remote_has_cap(
dlg, PJSIP_H_ALLOW, NULL,
&ST_UPDATE)
== PJSIP_DIALOG_CAP_SUPPORTED;
pjsip_dlg_dec_lock(dlg);
if (!use_update) {
PJ_LOG(3, (THIS_FILE, "Call #%d: IP change will "
"use re-INVITE because remote does "
"not support UPDATE", i));
}
}
}
acc->ip_change_op = PJSUA_IP_CHANGE_OP_ACC_REINVITE_CALLS;
pjsua_call_cleanup_flag(&call_info.setting);
call_info.setting.flag |=
acc->cfg.ip_change_cfg.reinvite_flags;
PJ_LOG(3, (THIS_FILE, "call to %.*s: send "
"re-INVITE with flags 0x%x triggered "
PJ_LOG(3, (THIS_FILE, "Call #%d to %.*s: send %s "
"with flags 0x%x triggered "
"by IP change (IP change flag: 0x%x)",
i,
call_info.remote_info.slen,
call_info.remote_info.ptr,
(use_update? "UPDATE" : "re-INVITE"),
call_info.setting.flag,
acc->cfg.ip_change_cfg.reinvite_flags));
status = pjsua_call_reinvite(i, call_info.setting.flag, NULL);
/* Refresh call using UPDATE */
if (use_update) {
status = pjsua_call_update(i, call_info.setting.flag,
NULL);
/* If this fails, retry using INVITE below */
if (status != PJ_SUCCESS) {
PJ_LOG(3, (THIS_FILE, "Call #%d: failed sending UPDATE"
" retrying using re-INVITE", i));
use_update = PJ_FALSE;
}
}
/* Refresh call using re-INVITE */
if (!use_update) {
status = pjsua_call_reinvite(i, call_info.setting.flag,
NULL);
}
if (pjsua_var.ua_cfg.cb.on_ip_change_progress) {
pjsua_ip_change_op_info info;

2
pjsip/src/pjsua2/account.cpp
Unescape View File

@ -716,6 +716,7 @@ void AccountConfig::toPj(pjsua_acc_config &ret) const
ret.ip_change_cfg.shutdown_tp = ipChangeConfig.shutdownTp;
ret.ip_change_cfg.hangup_calls = ipChangeConfig.hangupCalls;
ret.ip_change_cfg.reinvite_flags = ipChangeConfig.reinviteFlags;
ret.ip_change_cfg.reinv_use_update = ipChangeConfig.reinvUseUpdate;
}
/* Initialize from pjsip. */
@ -911,6 +912,7 @@ void AccountConfig::fromPj(const pjsua_acc_config &prm,
ipChangeConfig.shutdownTp = PJ2BOOL(prm.ip_change_cfg.shutdown_tp);
ipChangeConfig.hangupCalls = PJ2BOOL(prm.ip_change_cfg.hangup_calls);
ipChangeConfig.reinviteFlags = prm.ip_change_cfg.reinvite_flags;
ipChangeConfig.reinvUseUpdate = prm.ip_change_cfg.reinv_use_update;
}
void AccountConfig::readObject(const ContainerNode &node) PJSUA2_THROW(Error)

Write Preview
Loading…
Cancel
Save