From: Kevin P. Fleming Date: Wed, 15 Feb 2006 01:55:20 +0000 (+0000) Subject: remove code that does not appear to do anything useful (issue #6059) X-Git-Tag: 1.4.0-beta1~2598 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a9c957764fad478405fe9ef1c8fcc9927f5ee5e;p=thirdparty%2Fasterisk.git remove code that does not appear to do anything useful (issue #6059) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@10142 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/channels/chan_sip.c b/channels/chan_sip.c index db3d3f1c10..a93fb943f1 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -11377,15 +11377,7 @@ restartsearch: ast_mutex_unlock(&sip->lock); } ast_mutex_unlock(&iflock); - /* Don't let anybody kill us right away. Nobody should lock the interface list - and wait for the monitor list, but the other way around is okay. */ - ast_mutex_lock(&monlock); - /* Lock the network interface */ - ast_mutex_lock(&netlock); - /* Okay, now that we know what to do, release the network lock */ - ast_mutex_unlock(&netlock); - /* And from now on, we're okay to be killed, so release the monitor lock as well */ - ast_mutex_unlock(&monlock); + pthread_testcancel(); /* Wait for sched or io */ res = ast_sched_wait(sched);