]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 292489 via svnmerge from
authorRichard Mudgett <rmudgett@digium.com>
Thu, 21 Oct 2010 01:03:42 +0000 (01:03 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Thu, 21 Oct 2010 01:03:42 +0000 (01:03 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r292489 | rmudgett | 2010-10-20 20:02:50 -0500 (Wed, 20 Oct 2010) | 7 lines

  Send CONNECT_ACKNOWLEDGE for CIS calls too.

  The originator of the Q.SIG call completion signaling link was not changed
  to the active state when the CONNECT message came in.  The T309 processing
  would immediately kill the signaling link because it was not in the active
  state.
........

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

channels/sig_pri.c

index 9f3ebb7bee0088bff9c24404ceab468b70dceae7..bab7ae4d2a168b9febffd02d32c0e6191a43f2ce 100644 (file)
@@ -5063,6 +5063,10 @@ static void *pri_dchannel(void *vpri)
                                break;
                        case PRI_EVENT_ANSWER:
                                if (sig_pri_is_cis_call(e->answer.channel)) {
+#if defined(HAVE_PRI_CALL_WAITING)
+                                       /* Call is CIS so do normal CONNECT_ACKNOWLEDGE. */
+                                       pri_connect_ack(pri->pri, e->answer.call, 0);
+#endif /* defined(HAVE_PRI_CALL_WAITING) */
                                        sig_pri_handle_cis_subcmds(pri, e->e, e->answer.subcmds,
                                                e->answer.call);
                                        break;