From a537dae6d0a20ead92a9fce08ac6aeef342d91b7 Mon Sep 17 00:00:00 2001 From: George Joseph Date: Thu, 9 Feb 2017 17:05:01 -0700 Subject: pjproject_bundled: Update for pjproject 2.6 * Removed all 2.5.5 functional patches. * Updated usages of pj_release_pool to be "safe". * Updated configure options to disable webrtc. * Updated config_site.h to disable webrtc in pjmedia. * Added Richard Mudgett's recent resolver patches. Change-Id: Ib400cc4dfca68b3d07ce14d314e829bfddc252c7 --- res/res_pjsip.c | 7 ++++++- res/res_pjsip_history.c | 7 ++++++- res/res_rtp_asterisk.c | 11 ++++++++++- 3 files changed, 22 insertions(+), 3 deletions(-) (limited to 'res') diff --git a/res/res_pjsip.c b/res/res_pjsip.c index 4dead21f5..9782cc997 100644 --- a/res/res_pjsip.c +++ b/res/res_pjsip.c @@ -4448,8 +4448,13 @@ static int unload_pjsip(void *data) } if (memory_pool) { - pj_pool_release(memory_pool); + /* This mimics the behavior of pj_pool_safe_release + * which was introduced in pjproject 2.6. + */ + pj_pool_t *temp_pool = memory_pool; + memory_pool = NULL; + pj_pool_release(temp_pool); } ast_pjsip_endpoint = NULL; diff --git a/res/res_pjsip_history.c b/res/res_pjsip_history.c index 853ba319e..4e7dbd007 100644 --- a/res/res_pjsip_history.c +++ b/res/res_pjsip_history.c @@ -606,8 +606,13 @@ static void pjsip_history_entry_dtor(void *obj) struct pjsip_history_entry *entry = obj; if (entry->pool) { - pj_pool_release(entry->pool); + /* This mimics the behavior of pj_pool_safe_release + * which was introduced in pjproject 2.6. + */ + pj_pool_t *temp_pool = entry->pool; + entry->pool = NULL; + pj_pool_release(temp_pool); } } diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c index 5d7adcd43..28ddeca42 100644 --- a/res/res_rtp_asterisk.c +++ b/res/res_rtp_asterisk.c @@ -1053,7 +1053,16 @@ static void rtp_ioqueue_thread_destroy(struct ast_rtp_ioqueue_thread *ioqueue) pj_thread_destroy(ioqueue->thread); } - pj_pool_release(ioqueue->pool); + if (ioqueue->pool) { + /* This mimics the behavior of pj_pool_safe_release + * which was introduced in pjproject 2.6. + */ + pj_pool_t *temp_pool = ioqueue->pool; + + ioqueue->pool = NULL; + pj_pool_release(temp_pool); + } + ast_free(ioqueue); } -- cgit v1.2.3