[asterisk-commits] twilson: branch 1.8 r339086 - in /branches/1.8: channels/chan_sip.c main/file.c

[SVN commits to the Asterisk project]

Author: twilson
Date: Mon Oct  3 13:40:52 2011
New Revision: 339086

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=339086
Log:
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

Modified:
    branches/1.8/channels/chan_sip.c
    branches/1.8/main/file.c

Modified: branches/1.8/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/channels/chan_sip.c?view=diff&rev=339086&r1=339085&r2=339086
==============================================================================
--- branches/1.8/channels/chan_sip.c (original)
+++ branches/1.8/channels/chan_sip.c Mon Oct  3 13:40:52 2011
@@ -6775,6 +6775,8 @@
 			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;

Modified: branches/1.8/main/file.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/file.c?view=diff&rev=339086&r1=339085&r2=339086
==============================================================================
--- branches/1.8/main/file.c (original)
+++ branches/1.8/main/file.c Mon Oct  3 13:40:52 2011
@@ -1291,6 +1291,7 @@
 				case AST_CONTROL_CONNECTED_LINE:
 				case AST_CONTROL_REDIRECTING:
 				case AST_CONTROL_AOC:
+				case AST_CONTROL_UPDATE_RTP_PEER:
 				case -1:
 					/* Unimportant */
 					break;