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 b6824bc8aaaf8919d01fd475e079aa11ddf0612c..8e4e2acf10793689b2674ad78b24a6a1973ec8de 100644 (file)
--- 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 7938d87f08dd294597ee95ff45ef43bca31da6b0..b114f8b29851d68646450a5f20d4173fcfe121e3 100644 (file)
--- 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;