Merged revisions 319469 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r319469 | rmudgett | 2011-05-17 16:57:56 -0500 (Tue, 17 May 2011) | 22 lines

  Merged revision 319468 from
  https://origsvn.digium.com/svn/asterisk/be/branches/C.3-bier

  ..........
    r319468 | rmudgett | 2011-05-17 16:49:31 -0500 (Tue, 17 May 2011) | 15 lines

    The mISDN HDLC mode is prevented on dialed channels.

    The use of mISDN HDLC mode is prevented if the mISDN dial technology
    option 'h1' is used when config option astdtmf=yes.

    There is a bug in channels/misdn/isdn_lib.c which prevents the use of HDLC
    mode.  Instead of setting the channel to HDLC mode it is set to
    transparent(no dsp, no hdlc), although hdlc is not "no hdlc".  I.e the
    logging message is correct, but the if condition is not.

    Make check the nodsp and hdlc flags.

    JIRA ABE-2787
    JIRA SWP-3437
  ..........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@319471 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/misdn/isdn_lib.c b/channels/misdn/isdn_lib.c
index 68c57af3ce03291d53f7549bb6f8159404d9c63e..79f7fdaf27d8ad886aa49eb3ac022b07055f049c 100644 (file)
--- a/channels/misdn/isdn_lib.c
+++ b/channels/misdn/isdn_lib.c
@@ -1173,7 +1173,7 @@ int setup_bc(struct misdn_bchannel *bc)
 
        cb_log(4, stack->port," --> Channel is %d\n", bc->channel);
 
-       if (bc->nodsp) {
+       if (bc->nodsp && !bc->hdlc) {
                cb_log(2, stack->port," --> TRANSPARENT Mode (no DSP, no HDLC)\n");
                pid.protocol[1] = ISDN_PID_L1_B_64TRANS;
                pid.protocol[2] = ISDN_PID_L2_B_TRANS;