diff options
| author | George Joseph <george.joseph@fairview5.com> | 2016-02-10 15:16:46 -0700 |
|---|---|---|
| committer | George Joseph <george.joseph@fairview5.com> | 2016-02-10 15:28:08 -0700 |
| commit | 168c18737f87c7bcfdc6c1bd6bbe1eeed0fcff31 (patch) | |
| tree | 86f1c695b9725e26e08c648e28baf41c34fbd1cd /res/res_pjsip.c | |
| parent | 22bef60b1a82a1d0d2c53f9451cd65342051df94 (diff) | |
res_pjsip: Handle pjsip_dlg_create_uas deprecation
Pjproject has deprecated pjsip_dlg_create_uas in 2.5 and replaced it with
pjsip_dlg_create_uas_and_inc_lock which, as the name implies, automatically
increments the lock on the returned dialog. To account for this, configure.ac
now detects the presence of pjsip_dlg_create_uas_and_inc_lock and res_pjsip.c
has an #ifdef HAVE_PJSIP_DLG_CREATE_UAS_AND_INC_LOCK to decide whether to use
the original call or the new one. If the new one was used, the ref count is
decremented before returning.
ASTERISK-25751 #close
Reported-by Josh Colp
Change-Id: I1be776b94761df03bd0693bc7795a75682615ca8
Diffstat (limited to 'res/res_pjsip.c')
| -rw-r--r-- | res/res_pjsip.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/res/res_pjsip.c b/res/res_pjsip.c index 2b7625aba..cdad365ef 100644 --- a/res/res_pjsip.c +++ b/res/res_pjsip.c @@ -2709,7 +2709,11 @@ pjsip_dialog *ast_sip_create_dialog_uas(const struct ast_sip_endpoint *endpoint, (type != PJSIP_TRANSPORT_UDP && type != PJSIP_TRANSPORT_UDP6) ? ";transport=" : "", (type != PJSIP_TRANSPORT_UDP && type != PJSIP_TRANSPORT_UDP6) ? pjsip_transport_get_type_name(type) : ""); +#ifdef HAVE_PJSIP_DLG_CREATE_UAS_AND_INC_LOCK + *status = pjsip_dlg_create_uas_and_inc_lock(pjsip_ua_instance(), rdata, &contact, &dlg); +#else *status = pjsip_dlg_create_uas(pjsip_ua_instance(), rdata, &contact, &dlg); +#endif if (*status != PJ_SUCCESS) { char err[PJ_ERR_MSG_SIZE]; @@ -2722,6 +2726,9 @@ pjsip_dialog *ast_sip_create_dialog_uas(const struct ast_sip_endpoint *endpoint, dlg->sess_count++; pjsip_dlg_set_transport(dlg, &selector); dlg->sess_count--; +#ifdef HAVE_PJSIP_DLG_CREATE_UAS_AND_INC_LOCK + pjsip_dlg_dec_lock(dlg); +#endif return dlg; } |