kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 18:55:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Properly ignore AST_CONTROL_UPDATE_RTP_PEER in more places

Browse Source 
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
This commit is contained in:
Terry Wilson
2011-10-03 18:40:52 +00:00
parent 4d9b980ab8
commit a0eb30ea43
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
channels/chan_sip.c
View File

@@ -6775,6 +6775,8 @@ static int sip_indicate(struct ast_channel *ast, int condition, const void *data
ast_aoc_destroy_decoded(decoded); ast_aoc_destroy_decoded(decoded);
} }
break; break;
case AST_CONTROL_UPDATE_RTP_PEER: /* Absorb this since it is handled by the bridge */
break;
case -1: case -1:
res = -1; res = -1;
break; break;

1
main/file.c
View File

@@ -1291,6 +1291,7 @@ static int waitstream_core(struct ast_channel *c, const char *breakon,
case AST_CONTROL_CONNECTED_LINE: case AST_CONTROL_CONNECTED_LINE:
case AST_CONTROL_REDIRECTING: case AST_CONTROL_REDIRECTING:
case AST_CONTROL_AOC: case AST_CONTROL_AOC:
case AST_CONTROL_UPDATE_RTP_PEER:
case -1: case -1:
/* Unimportant */ /* Unimportant */
break; break;