[asterisk-commits] rmudgett: branch 1.6.0 r193615 - in /branches/1.6.0: ./ channels/chan_misdn.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Mon May 11 14:15:13 2009
New Revision: 193615

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

................
  r193614 | rmudgett | 2009-05-11 14:11:29 -0500 (Mon, 11 May 2009) | 19 lines
  
  Merged revisions 193613 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r193613 | rmudgett | 2009-05-11 14:09:00 -0500 (Mon, 11 May 2009) | 12 lines
    
    Sent wrong message to clear a call we started if the other end has not responed yet.
    
    In the state MISDN_CALLING (i.e. SETUP was sent but no answer has arrived yet),
    it is not allowed to clear the call with RELEASE_COMPLETE.  It must be
    cleared with DISCONNECT.  A RELEASE_COMPLETE is only allowed as an answer
    to a SETUP.  (See Q.931 ch. 5.3.2, 5.3.2.a, 5.3.2.b)
    
    Patches:
        chan-misdn-ccstate7.patch uploaded by customer.
    
    JIRA ABE-1862
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_misdn.c

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

Modified: branches/1.6.0/channels/chan_misdn.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.0/channels/chan_misdn.c?view=diff&rev=193615&r1=193614&r2=193615
==============================================================================
--- branches/1.6.0/channels/chan_misdn.c (original)
+++ branches/1.6.0/channels/chan_misdn.c Mon May 11 14:15:13 2009
@@ -2824,12 +2824,11 @@
 
 	switch (p->state) {
 	case MISDN_INCOMING_SETUP:
-	case MISDN_CALLING:
 		p->state = MISDN_CLEANING;
 		/* This is the only place in misdn_hangup, where we 
 		 * can call release_chan, else it might create lot's of trouble
 		 * */
-		ast_log(LOG_NOTICE, "release channel, in CALLING/INCOMING_SETUP state.. no other events happened\n");
+		ast_log(LOG_NOTICE, "release channel, in INCOMING_SETUP state.. no other events happened\n");
 		release_chan(bc);
 		misdn_lib_send_event( bc, EVENT_RELEASE_COMPLETE);
 		break;
@@ -2850,6 +2849,7 @@
 			misdn_lib_send_event( bc, EVENT_DISCONNECT);
 		break;
       
+	case MISDN_CALLING:
 	case MISDN_ALERTING:
 	case MISDN_PROGRESS:
 	case MISDN_PROCEEDING: