kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-11438: [freeswitch-core] recvonly channels left that way on blind transfer in some cases #resolve

This commit is contained in:
Anthony Minessale 2018-10-04 09:24:35 -05:00 committed by Mike Jerris
parent 699affa1ef
commit c47752c940
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/switch_core_media.h
View File

@ -381,7 +381,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_print(switch_core_session_t
SWITCH_DECLARE(switch_status_t) switch_core_session_printf(switch_core_session_t *session, const char *fmt, ...);
SWITCH_DECLARE(switch_msrp_session_t *) switch_core_media_get_msrp_session(switch_core_session_t *session);
SWITCH_DECLARE(void) switch_core_media_set_smode(switch_core_session_t *session, switch_media_type_t type, switch_media_flow_t smode, switch_sdp_type_t sdp_type);
SWITCH_END_EXTERN_C
#endif

2
src/switch_core_media.c
View File

@ -4662,7 +4662,7 @@ static void check_stream_changes(switch_core_session_t *session, switch_sdp_type
}
}
static void switch_core_media_set_smode(switch_core_session_t *session, switch_media_type_t type, switch_media_flow_t smode, switch_sdp_type_t sdp_type)
SWITCH_DECLARE(void) switch_core_media_set_smode(switch_core_session_t *session, switch_media_type_t type, switch_media_flow_t smode, switch_sdp_type_t sdp_type)
{
switch_media_handle_t *smh;
switch_rtp_engine_t *engine;

13
src/switch_ivr.c
View File

@ -2096,7 +2096,8 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_session_transfer(switch_core_session_
const char *forwardvar = switch_channel_get_variable(channel, forwardvar_name);
int forwardval = 70;
const char *use_dialplan = dialplan, *use_context = context;
switch_media_flow_t flow;
if (zstr(forwardvar)) {
forwardvar_name = SWITCH_MAX_FORWARDS_VARIABLE; /* fall back to max_forwards variable for setting maximum */
forwardvar = switch_channel_get_variable(channel, forwardvar_name);
@ -2109,6 +2110,16 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_session_transfer(switch_core_session_
return SWITCH_STATUS_FALSE;
}
if ((flow = switch_core_session_media_flow(session, SWITCH_MEDIA_TYPE_AUDIO)) != SWITCH_MEDIA_FLOW_SENDRECV) {
switch_core_session_message_t msg = { 0 };
msg.message_id = SWITCH_MESSAGE_INDICATE_MEDIA_RENEG;
msg.from = __FILE__;
switch_core_media_set_smode(session, SWITCH_MEDIA_TYPE_AUDIO, SWITCH_MEDIA_FLOW_SENDRECV, SDP_TYPE_REQUEST);
switch_core_session_receive_message(session, &msg);
}
max_forwards = switch_core_session_sprintf(session, "%d", forwardval);
switch_channel_set_variable(channel, forwardvar_name, max_forwards);