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

[SVN commits to the Asterisk project]

Author: twilson
Date: Mon Oct  3 13:44:27 2011
New Revision: 339088

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

Modified:
    branches/10/   (props changed)
    branches/10/channels/chan_sip.c
    branches/10/main/file.c

Propchange: branches/10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/10/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/channels/chan_sip.c?view=diff&rev=339088&r1=339087&r2=339088
==============================================================================
--- branches/10/channels/chan_sip.c (original)
+++ branches/10/channels/chan_sip.c Mon Oct  3 13:44:27 2011
@@ -6825,6 +6825,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/10/main/file.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/main/file.c?view=diff&rev=339088&r1=339087&r2=339088
==============================================================================
--- branches/10/main/file.c (original)
+++ branches/10/main/file.c Mon Oct  3 13:44:27 2011
@@ -1345,6 +1345,7 @@
 				case AST_CONTROL_CONNECTED_LINE:
 				case AST_CONTROL_REDIRECTING:
 				case AST_CONTROL_AOC:
+				case AST_CONTROL_UPDATE_RTP_PEER:
 				case -1:
 					/* Unimportant */
 					break;