aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2003-04-09 05:38:39 +0000
committermarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2003-04-09 05:38:39 +0000
commit95c1ba645871a8eaecd2b278e4376eef4913da12 (patch)
tree5ba87e566c1d762723ba5fa806d21d41d249b2ad
parent885e1f9993e54030cfc00f98ea5809555cb2f6f6 (diff)
Don't send 180 "Ringing" after 183 Session Progres
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@794 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-xchannels/chan_sip.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index a1bd9d7ab..36aa29466 100755
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -1045,8 +1045,12 @@ static int sip_indicate(struct ast_channel *ast, int condition)
switch(condition) {
case AST_CONTROL_RINGING:
if (ast->_state == AST_STATE_RING) {
- transmit_response(p, "180 Ringing", &p->initreq);
- break;
+ if (!p->progress) {
+ transmit_response(p, "180 Ringing", &p->initreq);
+ break;
+ } else {
+ /* Oops, we've sent progress tones. Let Asterisk do it instead */
+ }
}
return -1;
case AST_CONTROL_BUSY: