[asterisk-commits] crichter: branch 1.4 r44786 - in /branches/1.4: ./ channels/ channels/misdn/

[asterisk-commits at lists.digium.com]

Author: crichter
Date: Tue Oct 10 08:50:26 2006
New Revision: 44786

URL: http://svn.digium.com/view/asterisk?rev=44786&view=rev
Log:
Merged revisions 44785 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r44785 | crichter | 2006-10-10 15:34:33 +0200 (Di, 10 Okt 2006) | 1 line

(re)added support of dynamical enabling hdlc on bchannels
........

Modified:
    branches/1.4/   (props changed)
    branches/1.4/channels/chan_misdn.c
    branches/1.4/channels/misdn/isdn_lib.c

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

Modified: branches/1.4/channels/chan_misdn.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_misdn.c?rev=44786&r1=44785&r2=44786&view=diff
==============================================================================
--- branches/1.4/channels/chan_misdn.c (original)
+++ branches/1.4/channels/chan_misdn.c Tue Oct 10 08:50:26 2006
@@ -4872,7 +4872,10 @@
 			
 			if (strlen(tok) > 1 && tok[1]=='1') {
 				chan_misdn_log(1, ch->bc->port, "SETOPT: HDLC \n");
-				ch->bc->hdlc=1;
+				if (!ch->bc->hdlc) {
+					ch->bc->hdlc=1;
+					misdn_lib_setup_bc(ch->bc);
+				}
 			}  
 			ch->bc->capability=INFO_CAPABILITY_DIGITAL_UNRESTRICTED;
 			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?rev=44786&r1=44785&r2=44786&view=diff
==============================================================================
--- branches/1.4/channels/misdn/isdn_lib.c (original)
+++ branches/1.4/channels/misdn/isdn_lib.c Tue Oct 10 08:50:26 2006
@@ -896,6 +896,7 @@
 
 void misdn_lib_setup_bc(struct misdn_bchannel *bc)
 {
+	clean_up_bc(bc);
 	setup_bc(bc);
 }