[svn-commits] mattf: trunk r116797 - /trunk/channels/chan_zap.c

[SVN commits to the Digium repositories]

Author: mattf
Date: Fri May 16 15:00:04 2008
New Revision: 116797

URL: http://svn.digium.com/view/asterisk?view=rev&rev=116797
Log:
Try to see if we can make our ringback situation a little better

Modified:
    trunk/channels/chan_zap.c

Modified: trunk/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_zap.c?view=diff&rev=116797&r1=116796&r2=116797
==============================================================================
--- trunk/channels/chan_zap.c (original)
+++ trunk/channels/chan_zap.c Fri May 16 15:00:04 2008
@@ -9639,7 +9639,6 @@
 					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];
 
@@ -9652,9 +9651,11 @@
 					ast_mutex_lock(&p->lock);
 					zap_queue_frame(p, &f, linkset);
 					p->proceeding = 1;
-					zap_queue_frame(p, &g, linkset);
-					p->progress = 1;
-
+					/* Send alerting if subscriber is free */
+					if (e->acm.called_party_status_ind == 1) {
+						p->alerting = 1;
+						p->subs[SUB_REAL].needringing = 1;
+					}
 					ast_mutex_unlock(&p->lock);
 				}
 				break;