[Asterisk-cvs] asterisk/channels chan_alsa.c, 1.39, 1.40 chan_mgcp.c, 1.110, 1.111

[markster at lists.digium.com]

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

Modified Files:
	chan_alsa.c chan_mgcp.c 
Log Message:
Allow functions to be written to (bug #2278, with mods)


Index: chan_alsa.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_alsa.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- chan_alsa.c	29 Mar 2005 04:49:24 -0000	1.39
+++ chan_alsa.c	29 Mar 2005 06:16:49 -0000	1.40
@@ -150,7 +150,7 @@
 /* ZZ */
 static struct ast_channel *alsa_request(const char *type, int format, void *data, int *cause);
 static int alsa_digit(struct ast_channel *c, char digit);
-static int alsa_text(struct ast_channel *c, char *text);
+static int alsa_text(struct ast_channel *c, const char *text);
 static int alsa_hangup(struct ast_channel *c);
 static int alsa_answer(struct ast_channel *c);
 static struct ast_frame *alsa_read(struct ast_channel *chan);
@@ -479,7 +479,7 @@
 	return 0;
 }
 
-static int alsa_text(struct ast_channel *c, char *text)
+static int alsa_text(struct ast_channel *c, const char *text)
 {
 	ast_mutex_lock(&alsalock);
 	ast_verbose( " << Console Received text %s >> \n", text);

Index: chan_mgcp.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_mgcp.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- chan_mgcp.c	28 Mar 2005 20:48:24 -0000	1.110
+++ chan_mgcp.c	29 Mar 2005 06:16:49 -0000	1.111
@@ -3711,7 +3711,7 @@
 					e->capability = capability;
 					e->parent = gw;
 					e->dtmfmode = dtmfmode;
-					if (!ep_reload && e->sub->rtp)
+					if (!ep_reload && e->sub && e->sub->rtp)
 						e->dtmfmode |= MGCP_DTMF_INBAND;
 					e->adsi = adsi;
 					e->type = TYPE_LINE;