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
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@86617 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index e90eff8..6dd537a 100644 (file)
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -701,10 +701,8 @@ static int misdn_overlap_dial_task (const void *data)
                } 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;

diff --git a/channels/misdn/isdn_lib.c b/channels/misdn/isdn_lib.c
index a5e802b..443bc90 100644 (file)
--- a/channels/misdn/isdn_lib.c
+++ b/channels/misdn/isdn_lib.c
@@ -1247,17 +1247,6 @@ struct misdn_stack* stack_init( int midev, int port, int ptp )
 
                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;