kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-08 10:58:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 200361 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r200361 | mmichelson | 2009-06-12 14:07:51 -0500 (Fri, 12 Jun 2009) | 16 lines
  
  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
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@200362 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2009-06-12 19:08:15 +00:00
parent a5c9e82ebb
commit 660bceff3c
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
main/channel.c
View File

@@ -3063,6 +3063,16 @@ int ast_indicate_data(struct ast_channel *chan, int _condition,
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");