Try to see if we can make our ringback situation a little better

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

1 files changed, 5 insertions, 4 deletions

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index dfc6d6013..fcc8e1546 100644
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -9639,7 +9639,6 @@ static void *ss7_linkset(void *data)
 					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 @@ static void *ss7_linkset(void *data)
 					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;