[svn-commits] file: branch 1.4 r224773 - /branches/1.4/res/res_features.c

[SVN commits to the Digium repositories]

Author: file
Date: Tue Oct 20 12:46:37 2009
New Revision: 224773

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=224773
Log:
Add support for relaying early media in the features attended transfer option.

(closes issue #14828)
Reported by: licedey

Modified:
    branches/1.4/res/res_features.c

Modified: branches/1.4/res/res_features.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/res/res_features.c?view=diff&rev=224773&r1=224772&r2=224773
==============================================================================
--- branches/1.4/res/res_features.c (original)
+++ branches/1.4/res/res_features.c Tue Oct 20 12:46:37 2009
@@ -1480,10 +1480,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)) {
@@ -1515,6 +1517,8 @@
 							f = NULL;
 							break;
 						}
+					} else if (f->frametype == AST_FRAME_VOICE || f->frametype == AST_FRAME_VIDEO) {
+						ast_write(chan, f);
 					}
 				}
 				if (f)