[svn-commits] mattf: branch 1.6.0 r115599 - in /branches/1.6.0: ./ channels/chan_zap.c

[SVN commits to the Digium repositories]

Author: mattf
Date: Sat May 10 21:24:39 2008
New Revision: 115599

URL: http://svn.digium.com/view/asterisk?view=rev&rev=115599
Log:
Merged revisions 115598 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r115598 | mattf | 2008-05-10 21:19:21 -0500 (Sat, 10 May 2008) | 1 line

Open up audio channel when we get ACM on SS7 event
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_zap.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_zap.c?view=diff&rev=115599&r1=115598&r2=115599
==============================================================================
--- branches/1.6.0/channels/chan_zap.c (original)
+++ branches/1.6.0/channels/chan_zap.c Sat May 10 21:24:39 2008
@@ -9625,6 +9625,7 @@
 					break;
 				} else {
 					struct ast_frame f = { AST_FRAME_CONTROL, AST_CONTROL_PROCEEDING, };
+					struct ast_frame g = { AST_FRAME_CONTROL, AST_CONTROL_PROGRESS, };
 
 					p = linkset->pvts[chanpos];
 
@@ -9637,6 +9638,8 @@
 					ast_mutex_lock(&p->lock);
 					zap_queue_frame(p, &f, linkset);
 					p->proceeding = 1;
+					zap_queue_frame(p, &g, linkset);
+					p->progress = 1;
 
 					ast_mutex_unlock(&p->lock);
 				}