[svn-commits] trunk r32779 - in /trunk/channels: chan_misdn.c misdn/isdn_lib.c

[svn-commits at lists.digium.com]

Author: crichter
Date: Wed Jun  7 08:01:02 2006
New Revision: 32779

URL: http://svn.digium.com/view/asterisk?rev=32779&view=rev
Log:
changed the clean_up_bc function to work proper again. fixed the print with the conference nr. when bridged

Modified:
    trunk/channels/chan_misdn.c
    trunk/channels/misdn/isdn_lib.c

Modified: trunk/channels/chan_misdn.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_misdn.c?rev=32779&r1=32778&r2=32779&view=diff
==============================================================================
--- trunk/channels/chan_misdn.c (original)
+++ trunk/channels/chan_misdn.c Wed Jun  7 08:01:02 2006
@@ -2273,7 +2273,7 @@
 		}
 		
 		/* trying to make a mISDN_dsp conference */
-		chan_misdn_log(1, ch1->bc->port, "I SEND: Making conference with Number:%d\n", (ch1->bc->pid<<1) +1);
+		chan_misdn_log(1, ch1->bc->port, "I SEND: Making conference with Number:%d\n", ch1->bc->pid +1);
 
 		misdn_lib_bridge(ch1->bc,ch2->bc);
 	}
@@ -2281,7 +2281,7 @@
 	if (option_verbose > 2) 
 		ast_verbose(VERBOSE_PREFIX_3 "Native bridging %s and %s\n", c0->name, c1->name);
 
-	chan_misdn_log(1, ch1->bc->port, "* Makeing Native Bridge between %s and %s\n", ch1->bc->oad, ch2->bc->oad);
+	chan_misdn_log(1, ch1->bc->port, "* Making Native Bridge between %s and %s\n", ch1->bc->oad, ch2->bc->oad);
   
 	while(1) {
 		to=-1;

Modified: trunk/channels/misdn/isdn_lib.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/misdn/isdn_lib.c?rev=32779&r1=32778&r2=32779&view=diff
==============================================================================
--- trunk/channels/misdn/isdn_lib.c (original)
+++ trunk/channels/misdn/isdn_lib.c Wed Jun  7 08:01:02 2006
@@ -591,17 +591,16 @@
 		manager_ec_disable(bc);
 	}
 
-	if (bc->bc_state == BCHAN_SETUP) 
-		mISDN_write_frame(stack->midev, buff, bc->layer_id|FLG_MSG_DOWN, MGR_DELLAYER | REQUEST, 0, 0, NULL, TIMEOUT_1SEC);
-	else
-		mISDN_write_frame(stack->midev, buff, bc->addr|FLG_MSG_DOWN, MGR_DELLAYER | REQUEST, 0, 0, NULL, TIMEOUT_1SEC);
-
+	
+	mISDN_write_frame(stack->midev, buff, bc->layer_id|FLG_MSG_DOWN, MGR_DELLAYER | REQUEST, 0, 0, NULL, TIMEOUT_1SEC);
+
+#if 0
 	cb_log(3, stack->port, "$$$ CLEARING STACK\n");
-	
 	ret=mISDN_clear_stack(stack->midev,bc->b_stid);
 	if (ret<0 && errno) {
 		cb_log(-1,stack->port,"clear stack failed [%s]\n",strerror(errno));
 	}
+#endif
 
 	bc->b_stid = 0;
 	bc_state_change(bc, BCHAN_CLEANED);