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

Merge pull request #902 in FS/freeswitch from ~MZAKA/freeswitch:bugfix/FS-9278-zoip-hold to master 

* commit '9988d8d9059c65194d536824db95546081d292b2':
  FS-9278: sending sendonly instead of sendrecv media attribute in SDP when unholding call when Zoiper softphone had responded with inactive
This commit is contained in:
Mike Jerris 2016-07-01 12:31:14 -05:00
parent f0a36960c7 9988d8d905
commit 7f623fc0c8
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/switch_core_media.c
View File

@ -4069,6 +4069,9 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
if (!sendonly && (m->m_mode == sdp_sendonly || m->m_mode == sdp_inactive)) { if (!sendonly && (m->m_mode == sdp_sendonly || m->m_mode == sdp_inactive)) {
sendonly = 1; sendonly = 1;
if (m->m_mode == sdp_inactive) {
inactive = 1;
}
} }
if (!sendonly && m->m_connections && m->m_connections->c_address && !strcmp(m->m_connections->c_address, "0.0.0.0")) { if (!sendonly && m->m_connections && m->m_connections->c_address && !strcmp(m->m_connections->c_address, "0.0.0.0")) {
@ -4143,12 +4146,17 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
} }
if (sdp_type == SDP_TYPE_RESPONSE) { if (sdp_type == SDP_TYPE_RESPONSE) {
if (sendonly) { if (inactive) {
// When freeswitch had previously sent inactive in sip request. it should remain inactive otherwise smode should be sendrecv
if (a_engine->smode==SWITCH_MEDIA_FLOW_INACTIVE) {
a_engine->smode = sdp_media_flow(sdp_inactive);
} else {
a_engine->smode = sdp_media_flow(sdp_sendrecv);
}
} else if (sendonly) {
a_engine->smode = sdp_media_flow(sdp_sendonly); a_engine->smode = sdp_media_flow(sdp_sendonly);
} else if (recvonly) { } else if (recvonly) {
a_engine->smode = sdp_media_flow(sdp_recvonly); a_engine->smode = sdp_media_flow(sdp_recvonly);
} else if (inactive) {
a_engine->smode = sdp_media_flow(sdp_inactive);
} }
} }