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

[SVN commits to the Asterisk project]

Author: moy
Date: Thu Aug 20 23:25:49 2009
New Revision: 213481

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

........
  r213454 | moy | 2009-08-21 00:09:26 -0400 (Fri, 21 Aug 2009) | 1 line
  
  increment the mfcr2 monitor count when clearing the call request
........

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=213481&r1=213480&r2=213481
==============================================================================
--- branches/1.6.2/channels/chan_dahdi.c (original)
+++ branches/1.6.2/channels/chan_dahdi.c Thu Aug 20 23:25:49 2009
@@ -4540,7 +4540,12 @@
 			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);
+			/* since ast_request() was called but not ast_call() we have not yet dialed
+			and the openr2 stack will not call on_call_end callback, we need to unset
+			the mfcr2call flag and bump the monitor count so the monitor thread can take
+			care of this channel events from now on */
 			p->mfcr2call = 0;
+			dahdi_r2_update_monitor_count(p->mfcr2, 1);
 		}
 #endif
 #ifdef HAVE_PRI