kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-07-09 08:46:55 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into v1.2.stable

Browse Source
This commit is contained in:
Ken Rice 2013-03-07 12:10:46 -06:00
commit 93e2a38efd
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/freetdm/src/ftdm_io.c
View File

@ -3806,12 +3806,12 @@ FT_DECLARE(ftdm_status_t) ftdm_channel_queue_dtmf(ftdm_channel_t *ftdmchan, cons
#endif #endif
if (ftdm_strlen_zero(globals.dtmfdebug_directory)) { if (ftdm_strlen_zero(globals.dtmfdebug_directory)) {
snprintf(dfile, sizeof(dfile), "dtmf-s%dc%d-20%d-%d-%d-%d:%d:%d.%s", snprintf(dfile, sizeof(dfile), "dtmf-s%dc%d-20%d-%d-%d-%d%d%d.%s",
ftdmchan->span_id, ftdmchan->chan_id, ftdmchan->span_id, ftdmchan->chan_id,
currtime.tm_year-100, currtime.tm_mon+1, currtime.tm_mday, currtime.tm_year-100, currtime.tm_mon+1, currtime.tm_mday,
currtime.tm_hour, currtime.tm_min, currtime.tm_sec, ftdmchan->native_codec == FTDM_CODEC_ULAW ? "ulaw" : ftdmchan->native_codec == FTDM_CODEC_ALAW ? "alaw" : "sln"); currtime.tm_hour, currtime.tm_min, currtime.tm_sec, ftdmchan->native_codec == FTDM_CODEC_ULAW ? "ulaw" : ftdmchan->native_codec == FTDM_CODEC_ALAW ? "alaw" : "sln");
} else { } else {
snprintf(dfile, sizeof(dfile), "%s/dtmf-s%dc%d-20%d-%d-%d-%d:%d:%d.%s", snprintf(dfile, sizeof(dfile), "%s/dtmf-s%dc%d-20%d-%d-%d-%d%d%d.%s",
globals.dtmfdebug_directory, globals.dtmfdebug_directory,
ftdmchan->span_id, ftdmchan->chan_id, ftdmchan->span_id, ftdmchan->chan_id,
currtime.tm_year-100, currtime.tm_mon+1, currtime.tm_mday, currtime.tm_year-100, currtime.tm_mon+1, currtime.tm_mday,

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

@ -722,6 +722,9 @@ static switch_status_t sofia_answer_channel(switch_core_session_t *session)
TAG_IF(sofia_test_pflag(tech_pvt->profile, PFLAG_DISABLE_100REL), NUTAG_INCLUDE_EXTRA_SDP(1)), TAG_IF(sofia_test_pflag(tech_pvt->profile, PFLAG_DISABLE_100REL), NUTAG_INCLUDE_EXTRA_SDP(1)),
TAG_END()); TAG_END());
sofia_clear_flag(tech_pvt, TFLAG_3PCC_INVITE); // all done sofia_clear_flag(tech_pvt, TFLAG_3PCC_INVITE); // all done
sofia_set_flag_locked(tech_pvt, TFLAG_ANS);
sofia_set_flag_locked(tech_pvt, TFLAG_SDP);
switch_channel_mark_answered(channel); // ... and remember to actually answer the call!
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }