[svn-commits] crichter: branch 1.4 r82249 - in /branches/1.4/channels: ./ misdn/

[SVN commits to the Digium repositories]

Author: crichter
Date: Tue Sep 11 11:01:27 2007
New Revision: 82249

URL: http://svn.digium.com/view/asterisk?view=rev&rev=82249
Log:
fixed a hold/retrieve issue.

Modified:
    branches/1.4/channels/chan_misdn.c
    branches/1.4/channels/misdn/isdn_lib.c

Modified: branches/1.4/channels/chan_misdn.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_misdn.c?view=diff&rev=82249&r1=82248&r2=82249
==============================================================================
--- branches/1.4/channels/chan_misdn.c (original)
+++ branches/1.4/channels/chan_misdn.c Tue Sep 11 11:01:27 2007
@@ -4687,7 +4687,7 @@
 				ret=write(ch->pipe[1], bc->bframe, bc->bframe_len);
 				
 				if (ret<=0) {
-					chan_misdn_log(-1, bc->port, "Write returned <=0 (err=%s) --> hanging up channel\n",strerror(errno));
+					chan_misdn_log(0, bc->port, "Write returned <=0 (err=%s) --> hanging up channel\n",strerror(errno));
 
 					stop_bc_tones(ch);
 					hangup_chan(ch);
@@ -4754,7 +4754,7 @@
 	{
 		struct ast_channel *hold_ast;
 		if (!ch) {
-			chan_misdn_log(4, bc->port, " --> no CH, searching in holded");
+			chan_misdn_log(4, bc->port, " --> no CH, searching in holded\n");
 			ch=find_holded_l3(cl_te, bc->l3_id,1);
 		}
 
@@ -4777,8 +4777,10 @@
 			ast_moh_stop(hold_ast);
 		}
 	
-		if ( misdn_lib_send_event(bc, EVENT_RETRIEVE_ACKNOWLEDGE) < 0)
+		if ( misdn_lib_send_event(bc, EVENT_RETRIEVE_ACKNOWLEDGE) < 0) {
+			chan_misdn_log(4, bc->port, " --> RETRIEVE_ACK failed\n");
 			misdn_lib_send_event(bc, EVENT_RETRIEVE_REJECT);
+		}
 	}
 	break;
     

Modified: branches/1.4/channels/misdn/isdn_lib.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/misdn/isdn_lib.c?view=diff&rev=82249&r1=82248&r2=82249
==============================================================================
--- branches/1.4/channels/misdn/isdn_lib.c (original)
+++ branches/1.4/channels/misdn/isdn_lib.c Tue Sep 11 11:01:27 2007
@@ -1824,6 +1824,7 @@
 				free(hold_bc);
 
 				bc->holded=0;
+				bc->b_stid=0;
 			}
 			
 		}
@@ -2860,7 +2861,6 @@
 		case SSTATUS_L1_DEACTIVATED:
 			cb_log(3, 0, "MGMT: SSTATUS: L1_DEACTIVATED \n");
 			stack->l1link=0;
-
 			clear_l3(stack);
 			break;