提交 da727681 authored 作者: Anthony Minessale's avatar Anthony Minessale

update core

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@2361 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 326e36e7
...@@ -55,7 +55,6 @@ static void audio_bridge_function(switch_core_session_t *session, char *data) ...@@ -55,7 +55,6 @@ static void audio_bridge_function(switch_core_session_t *session, char *data)
switch_channel_hangup(caller_channel, SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL); switch_channel_hangup(caller_channel, SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL);
return; return;
} else { } else {
/* peer channel is read locked now the bridge func will unlock it for us */
switch_ivr_multi_threaded_bridge(session, peer_session, NULL, NULL, NULL); switch_ivr_multi_threaded_bridge(session, peer_session, NULL, NULL, NULL);
} }
} }
......
...@@ -1560,7 +1560,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess ...@@ -1560,7 +1560,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
} }
if (switch_channel_test_flag(peer_channel, CF_ANSWERED) || switch_channel_test_flag(peer_channel, CF_EARLY_MEDIA)) { if (switch_channel_test_flag(peer_channel, CF_ANSWERED) || switch_channel_test_flag(peer_channel, CF_EARLY_MEDIA)) {
switch_core_session_read_lock(peer_session);
*bleg = peer_session; *bleg = peer_session;
if (caller_channel) { if (caller_channel) {
switch_channel_set_variable(caller_channel, "originate_disposition", "call accepted"); switch_channel_set_variable(caller_channel, "originate_disposition", "call accepted");
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论