[asterisk-commits] crichter: trunk r86617 - in /trunk: ./ channels/ channels/misdn/

[SVN commits to the Asterisk project]

Author: crichter
Date: Mon Oct 22 05:18:43 2007
New Revision: 86617

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

........
r86598 | crichter | 2007-10-22 11:21:15 +0200 (Mo, 22 Okt 2007) | 1 line

we send DISCONNECT instead of RELEASE/RELEASE_COMPLETE if the dialplan does not match after an overlap call. Also added out_cause=1
........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_misdn.c
    trunk/channels/misdn/isdn_lib.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=86617&r1=86616&r2=86617
==============================================================================
--- trunk/channels/chan_misdn.c (original)
+++ trunk/channels/chan_misdn.c Mon Oct 22 05:18:43 2007
@@ -701,10 +701,8 @@
 		} else {
 misdn_overlap_dial_task_disconnect:
 			hanguptone_indicate(ch);
-			if (ch->bc->nt)
-				misdn_lib_send_event(ch->bc, EVENT_RELEASE_COMPLETE );
-			else
-				misdn_lib_send_event(ch->bc, EVENT_RELEASE);
+			ch->bc->out_cause=1;
+			misdn_lib_send_event(ch->bc, EVENT_DISCONNECT);
 		}
 		ch->overlap_dial_task = -1;
 		return 0;

Modified: trunk/channels/misdn/isdn_lib.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/misdn/isdn_lib.c?view=diff&rev=86617&r1=86616&r2=86617
==============================================================================
--- trunk/channels/misdn/isdn_lib.c (original)
+++ trunk/channels/misdn/isdn_lib.c Mon Oct 22 05:18:43 2007
@@ -1247,17 +1247,6 @@
 
 		stack->nt=1;
 		break;
-
-#ifndef MISDN_1_2
-	case ISDN_PID_L0_TE_U:
-		break;
-	case ISDN_PID_L0_NT_U:
-		break;
-	case ISDN_PID_L0_TE_UP2:
-		break;
-	case ISDN_PID_L0_NT_UP2:
-		break;
-#endif
 	case ISDN_PID_L0_TE_E1:
 		cb_log(8, port, "TE S2M Stack\n");
 		stack->nt=0;