[svn-commits] mmichelson: trunk r200361 - in /trunk: ./ main/channel.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Fri Jun 12 14:07:51 2009
New Revision: 200361

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=200361
Log:
Merged revisions 200360 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r200360 | mmichelson | 2009-06-12 14:06:41 -0500 (Fri, 12 Jun 2009) | 10 lines
  
  Suppress a warning message and give a better return code when generating
  inband ringing after a call is answered.
  
  (closes issue #15158)
  Reported by: madkins
  Patches:
        15158.patch uploaded by mmichelson (license 60)
  Tested by: madkins
........

Modified:
    trunk/   (props changed)
    trunk/main/channel.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/channel.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/main/channel.c?view=diff&rev=200361&r1=200360&r2=200361
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Fri Jun 12 14:07:51 2009
@@ -3427,6 +3427,16 @@
 	switch (condition) {
 	case AST_CONTROL_RINGING:
 		ts = ast_get_indication_tone(chan->zone, "ring");
+		/* It is common practice for channel drivers to return -1 if trying
+		 * to indicate ringing on a channel which is up. The idea is to let the
+		 * core generate the ringing inband. However, we don't want the
+		 * warning message about not being able to handle the specific indication
+		 * to print nor do we want ast_indicate_data to return an "error" for this
+		 * condition
+		 */
+		if (chan->_state == AST_STATE_UP) {
+			res = 0;
+		}
 		break;
 	case AST_CONTROL_BUSY:
 		ts = ast_get_indication_tone(chan->zone, "busy");