sysmocom/asterisk
11
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Import revision 4196 from pjproject trunk. Fix a crash issue when starting ICE connectivity checks and immediately destroying the ICE session. This was exposed by the SIP CCSS test.

Browse source 
Full fix for this issue will be worked on as a medium to long term roadmap item.

pjroject issue viewable at https://trac.pjsip.org/repos/ticket/1548


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@369703 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp 2012-07-06 14:32:30 +00:00
parent 3044aa3e38
commit 96a4b257bd
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
res/pjproject/pjnath/include/pjnath/ice_session.h
View file

@ -619,6 +619,7 @@ struct pj_ice_sess
pj_uint8_t *prefs; /**< Type preference. */
pj_bool_t is_nominating; /**< Nominating stage */
pj_bool_t is_complete; /**< Complete? */
pj_bool_t is_destroying; /**< Destroy is called */
pj_status_t ice_status; /**< Error status. */
pj_timer_entry timer; /**< ICE timer. */
pj_ice_sess_cb cb; /**< Callback. */

10
res/pjproject/pjnath/src/pjnath/ice_session.c
View file

@ -455,6 +455,8 @@ static void destroy_ice(pj_ice_sess *ice,
LOG4((ice->obj_name, "Destroying ICE session"));
}
ice->is_destroying = PJ_TRUE;
/* Let other callbacks finish */
if (ice->mutex) {
pj_mutex_lock(ice->mutex);
@ -1840,8 +1842,16 @@ static pj_status_t start_periodic_check(pj_timer_heap_t *th,
ice = td->ice;
clist = td->clist;
if (ice->is_destroying)
return PJ_SUCCESS;
pj_mutex_lock(ice->mutex);
if (ice->is_destroying) {
pj_mutex_unlock(ice->mutex);
return PJ_SUCCESS;
}
/* Set timer ID to FALSE first */
te->id = PJ_FALSE;