kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-14 16:15:04 +00:00
Code Issues Projects Releases Wiki Activity

update

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7103 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2008-01-05 22:17:26 +00:00
parent 504b632c2b
commit b1977f2e36
6 changed files with 55 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/switch_channel.h
View File

@ -75,7 +75,7 @@ SWITCH_DECLARE(switch_channel_state_t) switch_channel_get_running_state(switch_c
SWITCH_DECLARE(uint8_t) switch_channel_ready(switch_channel_t *channel); SWITCH_DECLARE(uint8_t) switch_channel_ready(switch_channel_t *channel);
SWITCH_DECLARE(void) switch_channel_wait_for_state(switch_channel_t *channel, switch_channel_t *other_channel, switch_channel_state_t want_state); SWITCH_DECLARE(void) switch_channel_wait_for_state(switch_channel_t *channel, switch_channel_t *other_channel, switch_channel_state_t want_state);
SWITCH_DECLARE(switch_status_t) switch_channel_wait_for_flag(switch_channel_t *channel, switch_channel_flag_t want_flag, uint32_t to); SWITCH_DECLARE(switch_status_t) switch_channel_wait_for_flag(switch_channel_t *channel, switch_channel_flag_t want_flag, switch_bool_t pres, uint32_t to);
SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_set_state(switch_channel_t *channel, SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_set_state(switch_channel_t *channel,
const char *file, const char *func, int line, switch_channel_state_t state); const char *file, const char *func, int line, switch_channel_state_t state);

10
src/mod/applications/mod_dptools/mod_dptools.c
View File

@ -1273,11 +1273,11 @@ SWITCH_STANDARD_APP(record_function)
if (l) { if (l) {
if (*l == '+') { if (*l == '+') {
l++; l++;
if (l) { }
limit = atoi(l); if (l) {
if (limit < 0) { limit = atoi(l);
limit = 0; if (limit < 0) {
} limit = 0;
} }
} }
} }

18
src/mod/endpoints/mod_sofia/mod_sofia.c
View File

@ -252,11 +252,29 @@ switch_status_t sofia_on_hangup(switch_core_session_t *session)
cause = switch_channel_get_cause(channel); cause = switch_channel_get_cause(channel);
if (switch_test_flag(tech_pvt, TFLAG_SIP_HOLD) && cause != SWITCH_CAUSE_ATTENDED_TRANSFER) { if (switch_test_flag(tech_pvt, TFLAG_SIP_HOLD) && cause != SWITCH_CAUSE_ATTENDED_TRANSFER) {
const char *buuid;
switch_core_session_t *bsession;
switch_channel_t *bchannel;
const char *lost_ext;
if (tech_pvt->max_missed_packets) { if (tech_pvt->max_missed_packets) {
switch_rtp_set_max_missed_packets(tech_pvt->rtp_session, tech_pvt->max_missed_packets); switch_rtp_set_max_missed_packets(tech_pvt->rtp_session, tech_pvt->max_missed_packets);
} }
switch_channel_presence(tech_pvt->channel, "unknown", "unhold"); switch_channel_presence(tech_pvt->channel, "unknown", "unhold");
if ((buuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE))) {
if ((bsession = switch_core_session_locate(buuid))) {
bchannel = switch_core_session_get_channel(bsession);
if (switch_channel_test_flag(bchannel, CF_BROADCAST)) {
if ((lost_ext = switch_channel_get_variable(bchannel, "left_hanging_extension"))) {
switch_ivr_session_transfer(bsession, lost_ext, NULL, NULL);
}
switch_channel_stop_broadcast(bchannel);
}
switch_core_session_rwunlock(bsession);
}
}
switch_clear_flag_locked(tech_pvt, TFLAG_SIP_HOLD); switch_clear_flag_locked(tech_pvt, TFLAG_SIP_HOLD);
} }

27
src/mod/endpoints/mod_sofia/sofia_glue.c
View File

@ -1395,24 +1395,35 @@ uint8_t sofia_glue_negotiate_sdp(switch_core_session_t *session, sdp_session_t *
} }
if (stream) { if (stream) {
switch_ivr_displace_session(tech_pvt->session, stream, 0, "rl"); //switch_ivr_displace_session(tech_pvt->session, stream, 0, "rl");
switch_ivr_broadcast(switch_channel_get_variable(tech_pvt->channel, SWITCH_SIGNAL_BOND_VARIABLE), stream, SMF_ECHO_ALEG | SMF_LOOP);
} }
} }
} else { } else {
if (switch_test_flag(tech_pvt, TFLAG_SIP_HOLD)) { if (switch_test_flag(tech_pvt, TFLAG_SIP_HOLD)) {
const char *stream; const char *uuid;
switch_core_session_t *b_session;
//const char *stream;
if (tech_pvt->max_missed_packets) { if (tech_pvt->max_missed_packets) {
switch_rtp_set_max_missed_packets(tech_pvt->rtp_session, tech_pvt->max_missed_packets); switch_rtp_set_max_missed_packets(tech_pvt->rtp_session, tech_pvt->max_missed_packets);
} }
if (!(stream = switch_channel_get_variable(tech_pvt->channel, SWITCH_HOLD_MUSIC_VARIABLE))) { if ((uuid = switch_channel_get_variable(tech_pvt->channel, SWITCH_SIGNAL_BOND_VARIABLE)) && (b_session = switch_core_session_locate(uuid))) {
stream = tech_pvt->profile->hold_music; switch_channel_t *b_channel = switch_core_session_get_channel(b_session);
} switch_channel_stop_broadcast(b_channel);
switch_channel_wait_for_flag(b_channel, CF_BROADCAST, SWITCH_FALSE, 2000);
switch_core_session_rwunlock(b_session);
}
if (stream) { //if (!(stream = switch_channel_get_variable(tech_pvt->channel, SWITCH_HOLD_MUSIC_VARIABLE))) {
switch_ivr_stop_displace_session(tech_pvt->session, stream); //stream = tech_pvt->profile->hold_music;
} //}
//if (stream) {
//switch_ivr_stop_displace_session(tech_pvt->session, stream);
//}
switch_clear_flag_locked(tech_pvt, TFLAG_SIP_HOLD); switch_clear_flag_locked(tech_pvt, TFLAG_SIP_HOLD);
switch_channel_presence(tech_pvt->channel, "unknown", "unhold"); switch_channel_presence(tech_pvt->channel, "unknown", "unhold");

14
src/switch_channel.c
View File

@ -550,14 +550,24 @@ SWITCH_DECLARE(void) switch_channel_wait_for_state(switch_channel_t *channel, sw
} }
} }
SWITCH_DECLARE(switch_status_t) switch_channel_wait_for_flag(switch_channel_t *channel, switch_channel_flag_t want_flag, uint32_t to) SWITCH_DECLARE(switch_status_t) switch_channel_wait_for_flag(switch_channel_t *channel, switch_channel_flag_t want_flag, switch_bool_t pres, uint32_t to)
{ {
if (to) { if (to) {
to++; to++;
} }
while(!switch_test_flag(channel, want_flag)) { for(;;) {
if (pres) {
if (switch_test_flag(channel, want_flag)) {
break;
}
} else {
if (!switch_test_flag(channel, want_flag)) {
break;
}
}
switch_yield(1000); switch_yield(1000);
if (to && !--to) { if (to && !--to) {
return SWITCH_STATUS_TIMEOUT; return SWITCH_STATUS_TIMEOUT;

1
src/switch_ivr_bridge.c
View File

@ -222,7 +222,6 @@ static void *audio_bridge_thread(switch_thread_t * thread, void *obj)
end: end:
switch_core_session_kill_channel(session_b, SWITCH_SIG_BREAK); switch_core_session_kill_channel(session_b, SWITCH_SIG_BREAK);
switch_channel_stop_broadcast(chan_b);
switch_core_session_reset(session_a); switch_core_session_reset(session_a);
switch_channel_set_variable(chan_a, SWITCH_BRIDGE_VARIABLE, NULL); switch_channel_set_variable(chan_a, SWITCH_BRIDGE_VARIABLE, NULL);
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "BRIDGE THREAD DONE [%s]\n", switch_channel_get_name(chan_a)); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "BRIDGE THREAD DONE [%s]\n", switch_channel_get_name(chan_a));