summaryrefslogtreecommitdiff
path: root/res/res_pjsip.c
diff options
context:
space:
mode:
authorzuul <zuul@gerrit.asterisk.org>2016-02-12 16:50:13 -0600
committerGerrit Code Review <gerrit2@gerrit.digium.api>2016-02-12 16:50:13 -0600
commit295a501d7953b65cf2c48eafd0ad523a6464ae26 (patch)
tree8ddc6857ee58dd0e0e18af23455ea9c23ade1e49 /res/res_pjsip.c
parenta39486552efb30ca4067d0b8e919ed03f332b4af (diff)
parent168c18737f87c7bcfdc6c1bd6bbe1eeed0fcff31 (diff)
Merge "res_pjsip: Handle pjsip_dlg_create_uas deprecation"
Diffstat (limited to 'res/res_pjsip.c')
-rw-r--r--res/res_pjsip.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/res/res_pjsip.c b/res/res_pjsip.c
index 0fc5346bd..171f383f7 100644
--- a/res/res_pjsip.c
+++ b/res/res_pjsip.c
@@ -2711,7 +2711,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];
@@ -2724,6 +2728,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;
}