[Asterisk-cvs] asterisk channel.c, 1.139.2.6, 1.139.2.7 frame.c, 1.36.2.5, 1.36.2.6

[russell at lists.digium.com]

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

Modified Files:
      Tag: v1-0
	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.139.2.6
retrieving revision 1.139.2.7
diff -u -d -r1.139.2.6 -r1.139.2.7
--- channel.c	1 Apr 2005 03:13:38 -0000	1.139.2.6
+++ channel.c	10 May 2005 03:28:01 -0000	1.139.2.7
@@ -1618,6 +1618,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 */
@@ -2677,6 +2685,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) && 
 				(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.36.2.5
retrieving revision 1.36.2.6
diff -u -d -r1.36.2.5 -r1.36.2.6
--- frame.c	5 Apr 2005 07:10:06 -0000	1.36.2.5
+++ frame.c	10 May 2005 03:28:01 -0000	1.36.2.6
@@ -357,7 +357,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);