From 76b2de58362add141c2ec200c9c82055cca1dfc6 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthony.minessale@gmail.com>
Date: Sat, 29 Dec 2007 00:10:07 +0000
Subject: [PATCH] tweak
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7011 d0543943-73ff-0310-b7d9-9358b9ac24b2
---
src/switch_channel.c | 5 ++++-
src/switch_core_session.c | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/switch_channel.c b/src/switch_channel.c
index f0bd8b7e78..9bb53708d8 100644
--- a/src/switch_channel.c
+++ b/src/switch_channel.c
@@ -1223,10 +1223,13 @@ SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_hangup(switch_chan
switch_mutex_unlock(channel->profile_mutex);
}
+ switch_set_flag(channel, CF_BREAK);
+ switch_clear_flag(channel, CF_BROADCAST);
+
if (channel->state < CS_HANGUP) {
switch_event_t *event;
switch_channel_state_t last_state = channel->state;
-
+
channel->state = CS_HANGUP;
channel->hangup_cause = hangup_cause;
switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_NOTICE, "Hangup %s [%s] [%s]\n",
diff --git a/src/switch_core_session.c b/src/switch_core_session.c
index d92c14075f..cefe71af00 100644
--- a/src/switch_core_session.c
+++ b/src/switch_core_session.c
@@ -84,9 +84,12 @@ SWITCH_DECLARE(void) switch_core_session_hupall(switch_call_cause_t cause)
switch_hash_this(hi, NULL, NULL, &val);
if (val) {
session = (switch_core_session_t *) val;
+ switch_core_session_read_lock(session);
+
channel = switch_core_session_get_channel(session);
switch_channel_hangup(channel, cause);
- switch_core_session_kill_channel(session, SWITCH_SIG_KILL);
+
+ switch_core_session_rwunlock(session);
}
}
switch_mutex_unlock(runtime.throttle_mutex);