[Asterisk-cvs] asterisk channel.c,1.173,1.174 frame.c,1.45,1.46

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv22677

Modified Files:
	channel.c frame.c 
Log Message:
Fix queue URL passing (bug #3543)


Index: channel.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channel.c,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- channel.c	10 Feb 2005 23:46:03 -0000	1.173
+++ channel.c	28 Feb 2005 06:06:42 -0000	1.174
@@ -1659,6 +1659,14 @@
 	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 @@
 			(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))) {

Index: frame.c
===================================================================
RCS file: /usr/cvsroot/asterisk/frame.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- frame.c	26 Jan 2005 02:46:26 -0000	1.45
+++ frame.c	28 Feb 2005 06:06:42 -0000	1.46
@@ -354,7 +354,7 @@
 	/* Forget about being mallocd */
 	f->mallocd = 0;
 	/* Re-write the source */
-	f->src = __FUNCTION__;
+	f->src = (char *)__FUNCTION__;
 	if (f->datalen > sizeof(buf) - sizeof(struct ast_frame)) {
 		/* Really bad read */
 		ast_log(LOG_WARNING, "Strange read (%d bytes)\n", f->datalen);