diff options
| author | moy <moy@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-12-23 03:02:31 +0000 |
|---|---|---|
| committer | moy <moy@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-12-23 03:02:31 +0000 |
| commit | f5dbea9655529cde2dc75b4ec520db80293fff42 (patch) | |
| tree | e2af8ae6a5d4d31dc02245e36b5f20ad94bd2ea3 | |
| parent | 5082e386ab539e1ae66c2c2c3e3928f0322f69d5 (diff) | |
do not use progress which is for PRI and SS7, add mfcr2_progress member
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@299533 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_dahdi.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 9e8b65820..9f9678d5b 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -1230,6 +1230,7 @@ static struct dahdi_pvt { int mfcr2_forced_release:1; int mfcr2_dnis_matched:1; int mfcr2_call_accepted:1; + int mfcr2_progress:1; int mfcr2_accept_on_offer:1; #endif /*! \brief DTMF digit in progress. 0 when no digit in progress. */ @@ -3619,6 +3620,7 @@ static int dahdi_call(struct ast_channel *ast, char *rdest, int timeout) return -1; } p->mfcr2_call_accepted = 0; + p->mfcr2_progress = 0; ast_setstate(ast, AST_STATE_DIALING); } #endif /* HAVE_OPENR2 */ @@ -7070,11 +7072,11 @@ static struct ast_frame *dahdi_read(struct ast_channel *ast) /* if the call is already accepted and we already delivered AST_CONTROL_RINGING * now enqueue a progress frame to bridge the media up */ if (p->mfcr2_call_accepted && - !p->progress && + !p->mfcr2_progress && ast->_state == AST_STATE_RINGING) { ast_log(LOG_DEBUG, "Enqueuing progress frame after R2 accept in chan %d\n", p->channel); ast_queue_frame(p->owner, &f); - p->progress = 1; + p->mfcr2_progress = 1; } } } |