From e0066b68d74be4cc4699e5ffa64de9711761bffb Mon Sep 17 00:00:00 2001 From: Brian West Date: Thu, 7 Mar 2013 09:41:51 -0600 Subject: [PATCH 1/2] don't use : in the file name, makes it somewhat problematic to scp these files even when quoted --- libs/freetdm/src/ftdm_io.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/freetdm/src/ftdm_io.c b/libs/freetdm/src/ftdm_io.c index 8e6db56af4..1c1b4b9045 100644 --- a/libs/freetdm/src/ftdm_io.c +++ b/libs/freetdm/src/ftdm_io.c @@ -3806,12 +3806,12 @@ FT_DECLARE(ftdm_status_t) ftdm_channel_queue_dtmf(ftdm_channel_t *ftdmchan, cons #endif 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, 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"); } 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, ftdmchan->span_id, ftdmchan->chan_id, currtime.tm_year-100, currtime.tm_mon+1, currtime.tm_mday, From 9fc4beeaa5b52add11b3d7518b2ef9f28a3614f6 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Thu, 7 Mar 2013 08:44:32 -0600 Subject: [PATCH 2/2] FS-3576 --resolve --- src/mod/endpoints/mod_sofia/mod_sofia.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c index 241cf88c2d..099c04295b 100644 --- a/src/mod/endpoints/mod_sofia/mod_sofia.c +++ b/src/mod/endpoints/mod_sofia/mod_sofia.c @@ -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_END()); 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; }