[asterisk-commits] crichter: branch 1.2 r62885 - in /branches/1.2/channels: ./ misdn/

[asterisk-commits at lists.digium.com]

Author: crichter
Date: Thu May  3 08:59:00 2007
New Revision: 62885

URL: http://svn.digium.com/view/asterisk?view=rev&rev=62885
Log:
fixed the problem that misdn_write did not return -1 when called with 0 samples in a frame this resultet in a deadlock in some circumstances, when the call ended because of a busy extension.  added encoding of keypad.

Modified:
    branches/1.2/channels/chan_misdn.c
    branches/1.2/channels/misdn/isdn_msg_parser.c

Modified: branches/1.2/channels/chan_misdn.c
URL: http://svn.digium.com/view/asterisk/branches/1.2/channels/chan_misdn.c?view=diff&rev=62885&r1=62884&r2=62885
==============================================================================
--- branches/1.2/channels/chan_misdn.c (original)
+++ branches/1.2/channels/chan_misdn.c Thu May  3 08:59:00 2007
@@ -2308,7 +2308,7 @@
 
 	if ( !frame->samples ) {
 		chan_misdn_log(4, ch->bc->port, "misdn_write: zero write\n");
-		return 0;
+		return -1;
 	}
 
 	if ( ! ch->bc->addr ) {

Modified: branches/1.2/channels/misdn/isdn_msg_parser.c
URL: http://svn.digium.com/view/asterisk/branches/1.2/channels/misdn/isdn_msg_parser.c?view=diff&rev=62885&r1=62884&r2=62885
==============================================================================
--- branches/1.2/channels/misdn/isdn_msg_parser.c (original)
+++ branches/1.2/channels/misdn/isdn_msg_parser.c Thu May  3 08:59:00 2007
@@ -285,6 +285,10 @@
 			enc_ie_redir_nr(&setup->REDIR_NR, msg, 1, 1,  bc->pres, bc->screen, 0, bc->rad, nt,bc);
 	}
 
+	{
+		if (bc->keypad[0])
+			enc_ie_keypad(&setup->CALLED_PN, msg, bc->keypad, nt,bc);
+	}
 	
   
 	if (*bc->display) {