aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2006-02-15 01:55:20 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2006-02-15 01:55:20 +0000
commit564a29ff7c75b9f5b6ee2332bbd04af00cb2448b (patch)
treef4d4acd47797ae9dd205e09dcda2e842f2a05e12
parentea305ad5218d5105ed9d1e98d02a670e1b57e684 (diff)
remove code that does not appear to do anything useful (issue #6059)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@10142 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--channels/chan_sip.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index db3d3f1c1..a93fb943f 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);