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 224774 via svnmerge from

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

................
  r224774 | file | 2009-10-20 14:47:34 -0300 (Tue, 20 Oct 2009) | 12 lines
  
  Merged revisions 224773 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r224773 | file | 2009-10-20 14:46:37 -0300 (Tue, 20 Oct 2009) | 5 lines
    
    Add support for relaying early media in the features attended transfer option.
    
    (closes issue #14828)
    Reported by: licedey
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@224775 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2009-10-20 17:48:28 +00:00
parent 43805797d7
commit 2edc76e63c
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
main/features.c
View File

@@ -1988,10 +1988,12 @@ static struct ast_channel *ast_feature_request_and_dial(struct ast_channel *call
f = NULL;
ready=1;
break;
} else if (f->subclass != -1) {
} else if (f->subclass != -1 && f->subclass != AST_CONTROL_PROGRESS) {
ast_log(LOG_NOTICE, "Don't know what to do about control frame: %d\n", f->subclass);
}
/* else who cares */
} else if (f->frametype == AST_FRAME_VOICE || f->frametype == AST_FRAME_VIDEO) {
ast_write(caller, f);
}
} else if (caller && (active_channel == caller)) {
@@ -2027,6 +2029,8 @@ static struct ast_channel *ast_feature_request_and_dial(struct ast_channel *call
}
}
}
} else if (f->frametype == AST_FRAME_VOICE || f->frametype == AST_FRAME_VIDEO) {
ast_write(chan, f);
}
if (f)
ast_frfree(f);