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

update

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7955 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2008-03-24 20:58:44 +00:00
parent f39d931259
commit 4d0b60ad16
5 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/include/switch_types.h
View File

@ -722,7 +722,8 @@ typedef enum {
CF_ORIGINATING = (1 << 25), CF_ORIGINATING = (1 << 25),
CF_STOP_BROADCAST = (1 << 26), CF_STOP_BROADCAST = (1 << 26),
CF_PROXY_MEDIA = (1 << 27), CF_PROXY_MEDIA = (1 << 27),
CF_INNER_BRIDGE = (1 << 28) CF_INNER_BRIDGE = (1 << 28),
CF_REQ_MEDIA = (1 << 29)
} switch_channel_flag_t; } switch_channel_flag_t;

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

@ -513,7 +513,7 @@ static switch_status_t sofia_read_frame(switch_core_session_t *session, switch_f
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
} }
while (!(tech_pvt->read_codec.implementation && switch_rtp_ready(tech_pvt->rtp_session))) { while (!(tech_pvt->read_codec.implementation && switch_rtp_ready(tech_pvt->rtp_session) && !switch_channel_test_flag(channel, CF_REQ_MEDIA))) {
if (switch_channel_ready(channel)) { if (switch_channel_ready(channel)) {
switch_yield(10000); switch_yield(10000);
} else { } else {
@ -590,7 +590,7 @@ static switch_status_t sofia_write_frame(switch_core_session_t *session, switch_
switch_assert(tech_pvt != NULL); switch_assert(tech_pvt != NULL);
while (!(tech_pvt->read_codec.implementation && switch_rtp_ready(tech_pvt->rtp_session))) { while (!(tech_pvt->read_codec.implementation && switch_rtp_ready(tech_pvt->rtp_session) && !switch_channel_test_flag(channel, CF_REQ_MEDIA))) {
if (switch_channel_ready(channel)) { if (switch_channel_ready(channel)) {
switch_yield(10000); switch_yield(10000);
} else { } else {
@ -782,6 +782,7 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
if (!tech_pvt->local_sdp_str) { if (!tech_pvt->local_sdp_str) {
sofia_glue_tech_absorb_sdp(tech_pvt); sofia_glue_tech_absorb_sdp(tech_pvt);
} }
switch_channel_set_flag(tech_pvt->channel, CF_REQ_MEDIA);
sofia_glue_do_invite(session); sofia_glue_do_invite(session);
} }
break; break;
@ -797,7 +798,7 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
case SWITCH_MESSAGE_INDICATE_MEDIA: case SWITCH_MESSAGE_INDICATE_MEDIA:
{ {
uint32_t count = 0, send_invite = 1; uint32_t send_invite = 1;
switch_channel_clear_flag(channel, CF_PROXY_MODE); switch_channel_clear_flag(channel, CF_PROXY_MODE);
tech_pvt->local_sdp_str = NULL; tech_pvt->local_sdp_str = NULL;
@ -827,20 +828,8 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
sofia_glue_set_local_sdp(tech_pvt, NULL, 0, NULL, 1); sofia_glue_set_local_sdp(tech_pvt, NULL, 0, NULL, 1);
if (send_invite) { if (send_invite) {
switch_channel_set_flag(tech_pvt->channel, CF_REQ_MEDIA);
sofia_glue_do_invite(session); sofia_glue_do_invite(session);
/* wait for rtp to start and first real frame to arrive */
tech_pvt->read_frame.datalen = 0;
while (switch_test_flag(tech_pvt, TFLAG_IO) && switch_channel_get_state(channel) < CS_HANGUP && !switch_rtp_ready(tech_pvt->rtp_session)) {
if (++count > 1000) {
status = SWITCH_STATUS_FALSE;
goto end;
}
if (!switch_rtp_ready(tech_pvt->rtp_session)) {
switch_yield(1000);
continue;
}
break;
}
} }
} }
break; break;

7
src/mod/endpoints/mod_sofia/sofia.c
View File

@ -1404,10 +1404,11 @@ static void sofia_handle_sip_r_invite(switch_core_session_t *session, int status
switch_channel_t *channel = switch_core_session_get_channel(session); switch_channel_t *channel = switch_core_session_get_channel(session);
const char *uuid; const char *uuid;
switch_core_session_t *other_session; switch_core_session_t *other_session;
private_object_t *tech_pvt = switch_core_session_get_private(session);
switch_channel_clear_flag(channel, CF_REQ_MEDIA);
if (switch_channel_test_flag(channel, CF_PROXY_MODE) || switch_channel_test_flag(channel, CF_PROXY_MEDIA)) { if (switch_channel_test_flag(channel, CF_PROXY_MODE) || switch_channel_test_flag(channel, CF_PROXY_MEDIA)) {
private_object_t *tech_pvt = switch_core_session_get_private(session);
switch_assert(tech_pvt != NULL);
if (!switch_test_flag(tech_pvt, TFLAG_SENT_UPDATE)) { if (!switch_test_flag(tech_pvt, TFLAG_SENT_UPDATE)) {
return; return;
@ -1827,6 +1828,8 @@ static void sofia_handle_sip_i_state(switch_core_session_t *session, int status,
} }
break; break;
case nua_callstate_ready: case nua_callstate_ready:
switch_channel_clear_flag(channel, CF_REQ_MEDIA);
if (tech_pvt && nh == tech_pvt->nh2) { if (tech_pvt && nh == tech_pvt->nh2) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Cheater Reinvite!\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Cheater Reinvite!\n");
switch_set_flag_locked(tech_pvt, TFLAG_REINVITE); switch_set_flag_locked(tech_pvt, TFLAG_REINVITE);

2
src/switch_core_io.c
View File

@ -475,6 +475,7 @@ static switch_status_t perform_write(switch_core_session_t *session, switch_fram
} }
} }
} }
return status; return status;
} }
@ -868,6 +869,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_frame(switch_core_sess
} }
done: done:
if (do_write) { if (do_write) {
return perform_write(session, frame, timeout, io_flag, stream_id); return perform_write(session, frame, timeout, io_flag, stream_id);
} }

8
src/switch_ivr.c
View File

@ -800,6 +800,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_media(const char *uuid, switch_media_
switch_core_session_message_t msg = { 0 }; switch_core_session_message_t msg = { 0 };
switch_status_t status = SWITCH_STATUS_GENERR; switch_status_t status = SWITCH_STATUS_GENERR;
uint8_t swap = 0; uint8_t swap = 0;
switch_frame_t *read_frame = NULL;
msg.message_id = SWITCH_MESSAGE_INDICATE_MEDIA; msg.message_id = SWITCH_MESSAGE_INDICATE_MEDIA;
msg.from = __FILE__; msg.from = __FILE__;
@ -815,12 +816,17 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_media(const char *uuid, switch_media_
status = SWITCH_STATUS_SUCCESS; status = SWITCH_STATUS_SUCCESS;
switch_core_session_receive_message(session, &msg); switch_core_session_receive_message(session, &msg);
switch_channel_wait_for_flag(channel, CF_REQ_MEDIA, SWITCH_FALSE, 10000);
switch_core_session_read_frame(session, &read_frame, -1, 0);
if ((flags & SMF_REBRIDGE) if ((flags & SMF_REBRIDGE)
&& (other_uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BRIDGE_VARIABLE)) && (other_uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BRIDGE_VARIABLE))
&& (other_session = switch_core_session_locate(other_uuid))) { && (other_session = switch_core_session_locate(other_uuid))) {
other_channel = switch_core_session_get_channel(other_session); other_channel = switch_core_session_get_channel(other_session);
switch_assert(other_channel != NULL); switch_assert(other_channel != NULL);
switch_core_session_receive_message(other_session, &msg); switch_core_session_receive_message(other_session, &msg);
switch_channel_wait_for_flag(other_channel, CF_REQ_MEDIA, SWITCH_FALSE, 10000);
switch_core_session_read_frame(other_session, &read_frame, -1, 0);
switch_channel_clear_state_handler(other_channel, NULL); switch_channel_clear_state_handler(other_channel, NULL);
switch_core_session_rwunlock(other_session); switch_core_session_rwunlock(other_session);
} }
@ -865,12 +871,14 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_nomedia(const char *uuid, switch_medi
if ((flags & SMF_FORCE) || !switch_channel_test_flag(channel, CF_PROXY_MODE)) { if ((flags & SMF_FORCE) || !switch_channel_test_flag(channel, CF_PROXY_MODE)) {
switch_core_session_receive_message(session, &msg); switch_core_session_receive_message(session, &msg);
switch_channel_wait_for_flag(channel, CF_REQ_MEDIA, SWITCH_FALSE, 10000);
if ((flags & SMF_REBRIDGE) && (other_uuid = switch_channel_get_variable(channel, SWITCH_BRIDGE_VARIABLE)) && if ((flags & SMF_REBRIDGE) && (other_uuid = switch_channel_get_variable(channel, SWITCH_BRIDGE_VARIABLE)) &&
(other_session = switch_core_session_locate(other_uuid))) { (other_session = switch_core_session_locate(other_uuid))) {
other_channel = switch_core_session_get_channel(other_session); other_channel = switch_core_session_get_channel(other_session);
switch_core_session_receive_message(other_session, &msg); switch_core_session_receive_message(other_session, &msg);
switch_channel_wait_for_flag(other_channel, CF_REQ_MEDIA, SWITCH_FALSE, 10000);
switch_channel_clear_state_handler(other_channel, NULL); switch_channel_clear_state_handler(other_channel, NULL);
} }