From: Terry Wilson <twilson@digium.com>
Date: Mon, 3 Oct 2011 18:40:52 +0000 (+0000)
Subject: Properly ignore AST_CONTROL_UPDATE_RTP_PEER in more places
X-Git-Tag: 1.8.8.0-rc1~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0eb30ea436f97af18faf21692cf72bdb2ce642f;p=thirdparty%2Fasterisk.git

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/branches/1.8@339086 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index b6824bc8aa..8e4e2acf10 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -6775,6 +6775,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 7938d87f08..b114f8b298 100644
--- a/main/file.c
+++ b/main/file.c
@@ -1291,6 +1291,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;