The fix for ASTERISK-12292 was a bit too aggressive. You could have
generators pointed at each other on local channels but need to get other
kinds of frames such as DTMF or CONNECTED_LINE frames accross.
........
Merged revisions 414269 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 414270 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 414272 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@414297
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
return 0;
}
- /* do not queue frame if generator is on both unreal channels */
- if (us && ast_channel_generator(us) && ast_channel_generator(other)) {
+ /* do not queue media frames if a generator is on both unreal channels */
+ if (us
+ && (f->frametype == AST_FRAME_VOICE || f->frametype == AST_FRAME_VIDEO)
+ && ast_channel_generator(us)
+ && ast_channel_generator(other)) {
return 0;
}