[svn-commits] rmudgett: trunk r292490 - in /trunk: ./ channels/sig_pri.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Wed Oct 20 20:03:42 2010
New Revision: 292490

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=292490
Log:
Merged revisions 292489 via svnmerge from 
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.
........

Modified:
    trunk/   (props changed)
    trunk/channels/sig_pri.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/channels/sig_pri.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/sig_pri.c?view=diff&rev=292490&r1=292489&r2=292490
==============================================================================
--- trunk/channels/sig_pri.c (original)
+++ trunk/channels/sig_pri.c Wed Oct 20 20:03:42 2010
@@ -5063,6 +5063,10 @@
 				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;