Permalink
Browse files

Merge branch 'master' into v1.2.stable

  • Loading branch information...
2 parents 0a2e713 + 9fc4bee commit 93e2a38efd53f872a30384dfd4eff0a2cd1b7ad2 @swk swk committed Mar 7, 2013
Showing with 5 additions and 2 deletions.
  1. +2 −2 libs/freetdm/src/ftdm_io.c
  2. +3 −0 src/mod/endpoints/mod_sofia/mod_sofia.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,
@@ -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;
}

0 comments on commit 93e2a38

Please sign in to comment.