[asterisk-commits] file: branch 1.6.0 r106790 - in /branches/1.6.0: ./ main/channel.c

Fri Mar 7 13:34:46 CST 2008

Author: file
Date: Fri Mar  7 13:34:45 2008
New Revision: 106790

URL: http://svn.digium.com/view/asterisk?view=rev&rev=106790
Log:
Merged revisions 106789 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r106789 | file | 2008-03-07 15:33:09 -0400 (Fri, 07 Mar 2008) | 12 lines

Merged revisions 106788 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r106788 | file | 2008-03-07 15:32:00 -0400 (Fri, 07 Mar 2008) | 4 lines

Ignore source update control frame.
(closes issue #12168)
Reported by: plack

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/channel.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------

--- trunk-merged (original)
+++ trunk-merged Fri Mar  7 13:34:45 2008
@@ -1,1 +1,1 @@
-/trunk:1-105595,105675,105677,105733-105734,105773,105785,105804,105840-105841,105864,105899,105933,106036,106040,106139,106186,106238-106239,106329,106346,106399,106438-106439,106501,106507,106518,106553,106607,106654,106684,106707
+/trunk:1-105595,105675,105677,105733-105734,105773,105785,105804,105840-105841,105864,105899,105933,106036,106040,106139,106186,106238-106239,106329,106346,106399,106438-106439,106501,106507,106518,106553,106607,106654,106684,106707,106789

Modified: branches/1.6.0/main/channel.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/channel.c?view=diff&rev=106790&r1=106789&r2=106790
==============================================================================
--- branches/1.6.0/main/channel.c (original)
+++ branches/1.6.0/main/channel.c Fri Mar  7 13:34:45 2008
@@ -2203,6 +2203,7 @@
 					return -1;
 				case AST_CONTROL_RINGING:
 				case AST_CONTROL_ANSWER:
+				case AST_CONTROL_SRCUPDATE:
 					/* Unimportant */
 					break;
 				default:


