ben.carrasco/freeswitch
1
0 Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-11-12 12:37:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

clear up some more display issues and fix resume-media-on-hold sofia option

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15177 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale committed 2009-10-19 19:58:23 +00:00
1 parent 9d111318d5
commit 3dfe67800f
10 files changed
+113 -77
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/switch_ivr_bridge.c
+12 -3
View File
@@ -84,7 +84,7 @@ static void send_display(switch_core_session_t *session, switch_core_session_t *
switch_core_session_message_t *msg;
switch_caller_profile_t *caller_profile;
switch_channel_t *caller_channel;
const char *name, *number;
const char *name, *number, *p;
caller_channel = switch_core_session_get_channel(session);
caller_profile = switch_channel_get_caller_profile(caller_channel);
@@ -111,6 +111,13 @@ static void send_display(switch_core_session_t *session, switch_core_session_t *
}
}
if ((p = strrchr(number, '/'))) {
number = p+1;
}
if ((p = strrchr(name, '/'))) {
name = p+1;
}
msg = switch_core_session_alloc(peer_session, sizeof(*msg));
MESSAGE_STAMP_FFL(msg);
msg->message_id = SWITCH_MESSAGE_INDICATE_DISPLAY;
@@ -394,9 +401,9 @@ static void *audio_bridge_thread(switch_thread_t *thread, void *obj)
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Media Establishment Failed.\n", switch_channel_get_name(un));
goto end_of_bridge_loop;
}
if (ans_a) ans_b = 1; else ans_a = 1;
}
if (ans_a) ans_b = 1; else ans_a = 1;
}
if (originator && !sent_update && ans_a && ans_b && switch_channel_media_ack(chan_a) && switch_channel_media_ack(chan_b)) {
@@ -866,6 +873,8 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_signal_bridge(switch_core_session_t *
switch_channel_set_flag(peer_channel, CF_TRANSFER);
}
switch_ivr_bridge_display(session, peer_session);
return SWITCH_STATUS_SUCCESS;
}