[asterisk-commits] crichter: trunk r71496 - in /trunk: ./ channels/chan_misdn.c

[SVN commits to the Asterisk project]

Author: crichter
Date: Mon Jun 25 04:34:05 2007
New Revision: 71496

URL: http://svn.digium.com/view/asterisk?view=rev&rev=71496
Log:
Merged revisions 71120 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r71120 | crichter | 2007-06-22 17:30:08 +0200 (Fr, 22 Jun 2007) | 9 lines

Merged revisions 69887 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r69887 | crichter | 2007-06-19 15:23:04 +0200 (Di, 19 Jun 2007) | 1 line

when we send out a SETUP, but get no response, we should cleanup everything after reception of a hangup.
........

................

Modified:
    trunk/   (props changed)
    trunk/channels/chan_misdn.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_misdn.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_misdn.c?view=diff&rev=71496&r1=71495&r2=71496
==============================================================================
--- trunk/channels/chan_misdn.c (original)
+++ trunk/channels/chan_misdn.c Mon Jun 25 04:34:05 2007
@@ -2155,7 +2155,7 @@
 			if ( bc->send_dtmf ) 
 				send_digit_to_chan(p,digit);
 		break;
-	}
+}
 
 	return 0;
 }
@@ -2370,6 +2370,11 @@
 	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");
+		release_chan(bc);
 		misdn_lib_send_event( bc, EVENT_RELEASE_COMPLETE);
 		break;
 	case MISDN_HOLDED:
@@ -2380,7 +2385,6 @@
 		if (bc->need_disconnect)
 			misdn_lib_send_event( bc, EVENT_DISCONNECT);
 		break;
-
 	case MISDN_CALLING_ACKNOWLEDGE:
 		start_bc_tones(p);
 		hanguptone_indicate(p);