FS-9846: [mod_sofia] Bugs related with Hold and Proxy Hold option added in FS-9192 after merges in 1.6.11 #resolve

This commit is contained in:
Brian West 2016-12-20 16:19:30 -06:00 committed by Mike Jerris
parent 4a3a021c8c
commit cadf011277
1 changed files with 10 additions and 0 deletions

View File

@ -5709,6 +5709,16 @@ switch_status_t config_sofia(sofia_config_t reload, char *profile_name)
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "send-display-update=true is set, but we can't comply because allow-update=false\n");
sofia_clear_pflag(profile, PFLAG_SEND_DISPLAY_UPDATE);
}
if (sofia_test_pflag(profile, PFLAG_PROXY_HOLD)) {
if (profile->media_options & MEDIA_OPT_MEDIA_ON_HOLD) {
profile->media_options &= ~MEDIA_OPT_MEDIA_ON_HOLD;
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "proxy-hold=true is set, incompatible with media-option=resume-media-on-hold\n");
}
if (profile->media_options & MEDIA_OPT_BYPASS_AFTER_HOLD) {
profile->media_options &= ~MEDIA_OPT_BYPASS_AFTER_HOLD;
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "proxy-hold=true is set, incompatible with media-option=bypass-media-after-hold\n");
}
}
if ((!profile->cng_pt) && (!sofia_test_media_flag(profile, SCMF_SUPPRESS_CNG))) {
profile->cng_pt = SWITCH_RTP_CNG_PAYLOAD;