[asterisk-commits] moy: branch 1.6.2 r299533 - /branches/1.6.2/channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: moy
Date: Wed Dec 22 21:02:31 2010
New Revision: 299533

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=299533
Log:
do not use progress which is for PRI and SS7, add mfcr2_progress member

Modified:
    branches/1.6.2/channels/chan_dahdi.c

Modified: branches/1.6.2/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/channels/chan_dahdi.c?view=diff&rev=299533&r1=299532&r2=299533
==============================================================================
--- branches/1.6.2/channels/chan_dahdi.c (original)
+++ branches/1.6.2/channels/chan_dahdi.c Wed Dec 22 21:02:31 2010
@@ -1230,6 +1230,7 @@
 	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 @@
 			return -1;
 		}
 		p->mfcr2_call_accepted = 0;
+		p->mfcr2_progress = 0;
 		ast_setstate(ast, AST_STATE_DIALING);
 	}
 #endif /* HAVE_OPENR2 */
@@ -7070,11 +7072,11 @@
 			/* 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;
 			}
 		}
 	}