Index: channels/chan_sip.c =================================================================== --- channels/chan_sip.c (revision 107959) +++ channels/chan_sip.c (working copy) @@ -2250,6 +2250,7 @@ } #define sip_pvt_lock(x) ast_mutex_lock(&x->pvt_lock) +#define sip_pvt_trylock(x) ast_mutex_trylock(&x->pvt_lock) #define sip_pvt_unlock(x) ast_mutex_unlock(&x->pvt_lock) /*! @@ -5843,6 +5844,7 @@ } dialoglist_lock(); +restartsearch: for (p = dialoglist; p; p = p->next) { /* In pedantic, we do not want packets with bad syntax to be connected to a PVT */ int found = FALSE; @@ -5873,7 +5875,12 @@ if (found) { /* Found the call */ - sip_pvt_lock(p); + if (sip_pvt_trylock(p)) { + dialoglist_unlock(); + usleep(1); + dialoglist_lock(); + goto restartsearch; + } dialoglist_unlock(); return p; } @@ -18332,7 +18339,13 @@ get back to this point every millisecond or less) */ for (dialog = dialoglist; dialog; dialog = dialog->next) { - sip_pvt_lock(dialog); + if (sip_pvt_trylock(dialog)) { + dialoglist_unlock(); + usleep(1); + dialoglist_lock(); + goto restartsearch; + } + /* Check RTP timeouts and kill calls if we have a timeout set and do not get RTP */ check_rtp_timeout(dialog, t); /* If we have sessions that needs to be destroyed, do it now */