[svn-commits] file: branch 1.6.2 r224777 - in /branches/1.6.2: ./ main/features.c

[SVN commits to the Digium repositories]

Author: file
Date: Tue Oct 20 12:50:05 2009
New Revision: 224777

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=224777
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.2/   (props changed)
    branches/1.6.2/main/features.c

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

Modified: branches/1.6.2/main/features.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/main/features.c?view=diff&rev=224777&r1=224776&r2=224777
==============================================================================
--- branches/1.6.2/main/features.c (original)
+++ branches/1.6.2/main/features.c Tue Oct 20 12:50:05 2009
@@ -2248,10 +2248,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)) {
@@ -2285,6 +2287,8 @@
 						f = NULL;
 						break;
 					}
+				} else if (f->frametype == AST_FRAME_VOICE || f->frametype == AST_FRAME_VIDEO) {
+					ast_write(chan, f);
 				}
 			}
 		}