[asterisk-commits] file: branch 1.6.0 r224775 - in /branches/1.6.0: ./ main/features.c

[SVN commits to the Asterisk project]

Author: file
Date: Tue Oct 20 12:48:28 2009
New Revision: 224775

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=224775
Log:
Merged revisions 224774 via svnmerge from 
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
  ........
................

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

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/features.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/main/features.c?view=diff&rev=224775&r1=224774&r2=224775
==============================================================================
--- branches/1.6.0/main/features.c (original)
+++ branches/1.6.0/main/features.c Tue Oct 20 12:48:28 2009
@@ -1988,10 +1988,12 @@
 							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 @@
 							}
 						}
 					}
+				} else if (f->frametype == AST_FRAME_VOICE || f->frametype == AST_FRAME_VIDEO) {
+					ast_write(chan, f);
 				}
 				if (f)
 					ast_frfree(f);