aboutsummaryrefslogtreecommitdiffstats
path: root/channel.c
diff options
context:
space:
mode:
authormarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2005-02-28 06:06:42 +0000
committermarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2005-02-28 06:06:42 +0000
commit44ee08e9d996b1825bcdd386cd1d1f16fb5e7439 (patch)
treeefbbfc9bc474705fcb007ce58c67f66f6fcdf9df /channel.c
parent4bb33e3192f01d1f467a0f8a1af285c7db0837a4 (diff)
Fix queue URL passing (bug #3543)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@5104 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channel.c')
-rwxr-xr-xchannel.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/channel.c b/channel.c
index 3cc5d6730..b9e63f10f 100755
--- a/channel.c
+++ b/channel.c
@@ -1659,6 +1659,14 @@ int ast_write(struct ast_channel *chan, struct ast_frame *fr)
case AST_FRAME_TEXT:
if (chan->pvt->send_text)
res = chan->pvt->send_text(chan, (char *) fr->data);
+ else
+ res = 0;
+ break;
+ case AST_FRAME_HTML:
+ if (chan->pvt->send_html)
+ res = chan->pvt->send_html(chan, fr->subclass, (char *) fr->data, fr->datalen);
+ else
+ res = 0;
break;
case AST_FRAME_VIDEO:
/* XXX Handle translation of video codecs one day XXX */
@@ -2832,6 +2840,7 @@ int ast_channel_bridge(struct ast_channel *c0, struct ast_channel *c1, struct as
(f->frametype == AST_FRAME_TEXT) ||
(f->frametype == AST_FRAME_VIDEO) ||
(f->frametype == AST_FRAME_IMAGE) ||
+ (f->frametype == AST_FRAME_HTML) ||
(f->frametype == AST_FRAME_DTMF)) {
if ((f->frametype == AST_FRAME_DTMF) &&
(config->flags & (AST_BRIDGE_DTMF_CHANNEL_0 | AST_BRIDGE_DTMF_CHANNEL_1))) {