From 2644af39b49a00905eaa23d0cd95d3550ef1613b Mon Sep 17 00:00:00 2001
From: Terry Wilson <twilson@digium.com>
Date: Mon, 3 Oct 2011 18:58:33 +0000
Subject: [PATCH] Merged revisions 339088 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10
................
r339088 | twilson | 2011-10-03 11:44:27 -0700 (Mon, 03 Oct 2011) | 17 lines
Merged revisions 339086 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r339086 | twilson | 2011-10-03 11:40:52 -0700 (Mon, 03 Oct 2011) | 10 lines
Properly ignore AST_CONTROL_UPDATE_RTP_PEER in more places
After the change in r336294, the new AST_CONTROL_UPDATE_RTP_PEER frame
is sent when a re-invite happens. If we receive a re-invite from a device
the waitstream_core was not aware of the new control frame and would drop
the call.
(closes issue ASTERISK-18610)
Reported by: Kristijan_Vrban
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@339090 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
channels/chan_sip.c | 2 ++
main/file.c | 1 +
2 files changed, 3 insertions(+)
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index ce321e1b85..1a84aafb80 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -6828,6 +6828,8 @@ static int sip_indicate(struct ast_channel *ast, int condition, const void *data
ast_aoc_destroy_decoded(decoded);
}
break;
+ case AST_CONTROL_UPDATE_RTP_PEER: /* Absorb this since it is handled by the bridge */
+ break;
case -1:
res = -1;
break;
diff --git a/main/file.c b/main/file.c
index f1e5903853..d707386034 100644
--- a/main/file.c
+++ b/main/file.c
@@ -1345,6 +1345,7 @@ static int waitstream_core(struct ast_channel *c, const char *breakon,
case AST_CONTROL_CONNECTED_LINE:
case AST_CONTROL_REDIRECTING:
case AST_CONTROL_AOC:
+ case AST_CONTROL_UPDATE_RTP_PEER:
case -1:
/* Unimportant */
break;
--
GitLab