[asterisk-commits] trunk r18835 - in /trunk/channels: chan_misdn.c misdn/isdn_lib.c

[asterisk-commits at lists.digium.com]

Author: crichter
Date: Mon Apr 10 11:50:20 2006
New Revision: 18835

URL: http://svn.digium.com/view/asterisk?rev=18835&view=rev
Log:
fixed some issues, that appear at higher load

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=18835&r1=18834&r2=18835&view=diff
==============================================================================
--- trunk/channels/chan_misdn.c (original)
+++ trunk/channels/chan_misdn.c Mon Apr 10 11:50:20 2006
@@ -2067,7 +2067,6 @@
 
 	if (!len) {
 		chan_misdn_log(4,tmp->bc->port,"misdn_read: ZERO READ\n");
-
 		tmp->frame.frametype = AST_FRAME_NULL;
 		tmp->frame.subclass = 0;
 		return &tmp->frame;
@@ -2885,7 +2884,7 @@
 			close(ch->pipe[0]);
 			close(ch->pipe[1]);
 			
-			if (ast && MISDN_ASTERISK_PVT(ast)) {
+			if (ast && MISDN_ASTERISK_TECH_PVT(ast)) {
 				chan_misdn_log(1, bc->port, "* RELEASING CHANNEL pid:%d ctx:%s dad:%s oad:%s state: %s\n",bc?bc->pid:-1, ast->context, ast->exten,AST_CID_P(ast),misdn_get_ch_state(ch));
 				chan_misdn_log(3, bc->port, " --> * State Down\n");
 				/* copy cause */

Modified: trunk/channels/misdn/isdn_lib.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/misdn/isdn_lib.c?rev=18835&r1=18834&r2=18835&view=diff
==============================================================================
--- trunk/channels/misdn/isdn_lib.c (original)
+++ trunk/channels/misdn/isdn_lib.c Mon Apr 10 11:50:20 2006
@@ -1474,7 +1474,8 @@
 	switch (frm->prim) {
 	case CC_NEW_CR|INDICATION:
 		cb_log(7, stack->port, " --> lib: NEW_CR Ind with l3id:%x on this port.\n",frm->dinfo);
-		handle_new_process(stack, frm); 
+		if (handle_new_process(stack, frm) <0) 
+			return -1;
 		return 1;
 	case CC_NEW_CR|CONFIRM:
 		return 1;
@@ -2306,8 +2307,13 @@
 
 	{
 		struct misdn_bchannel *bc;
-
-		if(handle_cr(stack, frm)) {
+		int ret=handle_cr(stack, frm);
+
+		if (ret<0) {
+			cb_log(3,stack?stack->port:0,"handle_frm: handle_cr <0 prim:%x addr:%x\n", frm->prim, frm->addr);
+		}
+
+		if(ret) {
 			free_msg(msg);
 			return 1;
 		}