[asterisk-commits] file: trunk r55003 - in /trunk: ./ channels/chan_agent.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Fri Feb 16 16:20:55 2007
New Revision: 55003

URL: http://svn.digium.com/view/asterisk?view=rev&rev=55003
Log:
Merged revisions 55002 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r55002 | file | 2007-02-16 17:18:46 -0500 (Fri, 16 Feb 2007) | 10 lines

Merged revisions 54999 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r54999 | file | 2007-02-16 17:13:45 -0500 (Fri, 16 Feb 2007) | 2 lines

Do not send indications through ast_indicate in chan_agent but instead go directly to the technology. This way when indications are emulated they happen on the Agent channel and do not screw up formats on the channels. (issue #8439 reported by punkgode)

........

................

Modified:
    trunk/   (props changed)
    trunk/channels/chan_agent.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_agent.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_agent.c?view=diff&rev=55003&r1=55002&r2=55003
==============================================================================
--- trunk/channels/chan_agent.c (original)
+++ trunk/channels/chan_agent.c Fri Feb 16 16:20:55 2007
@@ -593,7 +593,7 @@
 	int res = -1;
 	ast_mutex_lock(&p->lock);
 	if (p->chan)
-		res = ast_indicate_data(p->chan, condition, data, datalen);
+		res = p->chan->tech->indicate ? p->chan->tech->indicate(p->chan, condition, data, datalen) : -1;
 	else
 		res = 0;
 	ast_mutex_unlock(&p->lock);