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

[SVN commits to the Asterisk project]

Author: moy
Date: Thu Aug 20 23:23:52 2009
New Revision: 213475

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=213475
Log:
Merged revisions 213216 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r213216 | moy | 2009-08-19 23:26:59 -0400 (Wed, 19 Aug 2009) | 1 line
  
  fixed bug caused by calling ast_request without calling ast_call on an R2 channel, ie, CHANISAVAIL
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/channels/chan_dahdi.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/channels/chan_dahdi.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.2/channels/chan_dahdi.c?view=diff&rev=213475&r1=213474&r2=213475
==============================================================================
--- branches/1.6.2/channels/chan_dahdi.c (original)
+++ branches/1.6.2/channels/chan_dahdi.c Thu Aug 20 23:23:52 2009
@@ -3544,6 +3544,7 @@
 	if (p->mfcr2) {
 		openr2_calling_party_category_t chancat;
 		int callres = 0;
+		char *c, *l;
 
 		c = strchr(dest, '/');
 		if (c) {
@@ -4524,7 +4525,7 @@
 		}
 #endif
 #ifdef HAVE_OPENR2
-		if (p->mfcr2) {
+		if (p->mfcr2 && p->mfcr2call && openr2_chan_get_direction(p->r2chan) != OR2_DIR_STOPPED) {
 			ast_log(LOG_DEBUG, "disconnecting MFC/R2 call on chan %d\n", p->channel);
 			/* If it's an incoming call, check the mfcr2_forced_release setting */
 			if (openr2_chan_get_direction(p->r2chan) == OR2_DIR_BACKWARD && p->mfcr2_forced_release) {
@@ -4537,6 +4538,9 @@
 				openr2_chan_disconnect_call(p->r2chan, r2cause);
 			}
 			dahdi_r2_update_monitor_count(p->mfcr2, 1);
+		} else if (p->mfcr2call) {
+			ast_log(LOG_DEBUG, "Clearing call request on channel %d\n", p->channel);
+			p->mfcr2call = 0;
 		}
 #endif
 #ifdef HAVE_PRI