Merged revisions 318783 via svnmerge from
authorRichard Mudgett <rmudgett@digium.com>
Fri, 13 May 2011 01:50:15 +0000 (01:50 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Fri, 13 May 2011 01:50:15 +0000 (01:50 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r318783 | rmudgett | 2011-05-12 20:47:05 -0500 (Thu, 12 May 2011) | 14 lines

  PRI early media won't ring.

  And another way to pass early media.  Don't indicate that there is inband
  information present, just assume that the B channel is connected.

  * Restore clearing the dialing flag Rx squelch unconditionally when a
  PROCEEDING message comes in.

  (closes issue #19268)
  Reported by: tbsky
  Patches:
        issue19268_v1.8.patch uploaded by rmudgett (license 664)
  Tested by: tbsky
........

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

channels/sig_pri.c

index a65679f..6790ec0 100644 (file)
@@ -6368,9 +6368,9 @@ static void *pri_dchannel(void *vpri)
                                        /* Bring voice path up */
                                        pri_queue_control(pri, chanpos, AST_CONTROL_PROGRESS);
                                        pri->pvts[chanpos]->progress = 1;
-                                       sig_pri_set_dialing(pri->pvts[chanpos], 0);
                                        sig_pri_open_media(pri->pvts[chanpos]);
                                }
+                               sig_pri_set_dialing(pri->pvts[chanpos], 0);
                                sig_pri_unlock_private(pri->pvts[chanpos]);
                                break;
                        case PRI_EVENT_FACILITY: