[asterisk-commits] crichter: trunk r72052 - in /trunk: ./ channels/misdn/isdn_lib.c

[SVN commits to the Asterisk project]

Author: crichter
Date: Wed Jun 27 03:08:58 2007
New Revision: 72052

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

................
r72042 | crichter | 2007-06-27 09:58:06 +0200 (Mi, 27 Jun 2007) | 13 lines

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

........
r72040 | crichter | 2007-06-27 09:49:27 +0200 (Mi, 27 Jun 2007) | 1 line

for inbound TE calls, we setup the bchannel when we get the CONNECT_ACKNOWLEDGE, to make sure mISDN has everything ready. removed some #if 0 areas which weren't used anymore.
........
r72041 | crichter | 2007-06-27 09:54:30 +0200 (Mi, 27 Jun 2007) | 1 line

isdn_lib.c didn't compile
........

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

Modified:
    trunk/   (props changed)
    trunk/channels/misdn/isdn_lib.c

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

Modified: trunk/channels/misdn/isdn_lib.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/misdn/isdn_lib.c?view=diff&rev=72052&r1=72051&r2=72052
==============================================================================
--- trunk/channels/misdn/isdn_lib.c (original)
+++ trunk/channels/misdn/isdn_lib.c Wed Jun 27 03:08:58 2007
@@ -1509,6 +1509,7 @@
 		switch (event) {
 
 		case EVENT_CONNECT_ACKNOWLEDGE:
+			setup_bc(bc);
 			break;
 		case EVENT_CONNECT:
 
@@ -1829,20 +1830,6 @@
 		break;
 
 		case CC_CONNECT_ACKNOWLEDGE|INDICATION:
-#if 0
-		{
-			struct misdn_bchannel *bc=find_bc_by_l3id(stack, hh->dinfo);
-			if (bc) {
-				if ( !misdn_cap_is_speech(bc->capability)) {
-					int ret=setup_bc(bc);
-					if (ret == -EINVAL){
-						cb_log(0,bc->port,"send_event: setup_bc failed\n");
-						
-					}
-				}
-			}
-		}
-#endif
 		break;
 		
 		case CC_ALERTING|INDICATION:
@@ -1850,28 +1837,6 @@
 		case CC_SETUP_ACKNOWLEDGE|INDICATION:
 			if(!stack->ptp) break;	
 		case CC_CONNECT|INDICATION:
-		{
-#if 0
-			struct misdn_bchannel *bc=find_bc_by_l3id(stack, hh->dinfo);
-			
-			if (!bc) {
-				msg_t *dmsg;
-				cb_log(0, stack->port,"!!!! We didn't found our bc, dinfo:%x on this port.\n",hh->dinfo);
-				
-				cb_log(0, stack->port, "Releaseing call %x (No free Chan for you..)\n", hh->dinfo);
-				dmsg = create_l3msg(CC_RELEASE_COMPLETE | REQUEST,MT_RELEASE_COMPLETE, hh->dinfo,sizeof(RELEASE_COMPLETE_t), 1);
-				stack->nst.manager_l3(&stack->nst, dmsg);
-				free_msg(msg);
-				return 0;
-				
-			}
-			int ret=setup_bc(bc);
-			if (ret == -EINVAL){
-				cb_log(0,bc->port,"handle_event_nt: setup_bc failed\n");
-				misdn_lib_send_event(bc,EVENT_RELEASE_COMPLETE);
-			}
-#endif
-		}
 		break;
 		case CC_DISCONNECT|INDICATION:
 		{
@@ -3268,23 +3233,15 @@
 
 			RETURN(-ENOCHAN,OUT);
 		}
-#if 0
-	if (stack->nt) {
-		ret=setup_bc(bc);
-		if (ret == -EINVAL) {
-			cb_log(0,bc->port,"send_event: setup_bc failed\n");
-		}
-	}
-#endif
 		break;
 
 	case EVENT_PROGRESS:
 	case EVENT_ALERTING:
 	case EVENT_PROCEEDING:
 	case EVENT_SETUP_ACKNOWLEDGE:
+	case EVENT_CONNECT:
 		if (!stack->nt) break;
 
-	case EVENT_CONNECT:
 	case EVENT_RETRIEVE_ACKNOWLEDGE:
 
 		if (stack->nt) {