diff options
author | mattf <mattf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-05-16 20:03:31 +0000 |
---|---|---|
committer | mattf <mattf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-05-16 20:03:31 +0000 |
commit | b1bb728e8c01bff7d08c8eb2da591c6da36aec14 (patch) | |
tree | 64abf9bf79657ca24f03badb876c206112463794 /channels/chan_zap.c | |
parent | 5618e1f6b96ab41bc3f2890e31edf775a5e44896 (diff) |
Merged revisions 116797 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r116797 | mattf | 2008-05-16 15:00:04 -0500 (Fri, 16 May 2008) | 1 line
Try to see if we can make our ringback situation a little better
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@116798 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_zap.c')
-rw-r--r-- | channels/chan_zap.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index f8538e5ea..7dfa0ba73 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -9632,7 +9632,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]; @@ -9645,9 +9644,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; |