[Asterisk-cvs] asterisk/channels chan_mgcp.c, 1.127, 1.128 chan_sip.c, 1.772, 1.773 chan_skinny.c, 1.84, 1.85 chan_zap.c, 1.467, 1.468

[russell at lists.digium.com]

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

Modified Files:
	chan_mgcp.c chan_sip.c chan_skinny.c chan_zap.c 
Log Message:
add function to convert a cause code to a string
create MAX_MUSICCLASS instead of using MAX_LANGUAGE


Index: chan_mgcp.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_mgcp.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- chan_mgcp.c	24 Jun 2005 02:15:04 -0000	1.127
+++ chan_mgcp.c	5 Jul 2005 17:16:16 -0000	1.128
@@ -164,7 +164,7 @@
 static char context[AST_MAX_EXTENSION] = "default";
 
 static char language[MAX_LANGUAGE] = "";
-static char musicclass[MAX_LANGUAGE] = "";
+static char musicclass[MAX_MUSICCLASS] = "";
 static char cid_num[AST_MAX_EXTENSION] = "";
 static char cid_name[AST_MAX_EXTENSION] = "";
 
@@ -375,7 +375,7 @@
 	char lastcallerid[AST_MAX_EXTENSION];	/* Last Caller*ID */
 	char call_forward[AST_MAX_EXTENSION];	/* Last Caller*ID */
 	char mailbox[AST_MAX_EXTENSION];
-	char musicclass[MAX_LANGUAGE];
+	char musicclass[MAX_MUSICCLASS];
 	char curtone[80];			/* Current tone */
 	ast_group_t callgroup;
 	ast_group_t pickupgroup;

Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.772
retrieving revision 1.773
diff -u -d -r1.772 -r1.773
--- chan_sip.c	5 Jul 2005 15:08:34 -0000	1.772
+++ chan_sip.c	5 Jul 2005 17:16:16 -0000	1.773
@@ -347,7 +347,7 @@
 
 static int recordhistory = 0;				/* Record SIP history. Off by default */
 
-static char global_musicclass[MAX_LANGUAGE] = "";	/* Global music on hold class */
+static char global_musicclass[MAX_MUSICCLASS] = "";	/* Global music on hold class */
 #define DEFAULT_REALM	"asterisk"
 static char global_realm[MAXHOSTNAMELEN] = DEFAULT_REALM; 	/* Default realm */
 static char regcontext[AST_MAX_EXTENSION] = "";		/* Context for auto-extensions */
@@ -521,7 +521,7 @@
 	char fromname[AST_MAX_EXTENSION];	/* Name to show in the user field */
 	char tohost[MAXHOSTNAMELEN];		/* Host we should put in the "to" field */
 	char language[MAX_LANGUAGE];		/* Default language for this call */
-	char musicclass[MAX_LANGUAGE];          /* Music on Hold class */
+	char musicclass[MAX_MUSICCLASS];          /* Music on Hold class */
 	char rdnis[256];			/* Referring DNIS */
 	char theirtag[256];			/* Their tag */
 	char username[256];			/* [user] name */
@@ -604,7 +604,7 @@
 	char cid_name[80];		/* Caller ID name */
 	char accountcode[AST_MAX_ACCOUNT_CODE];	/* Account code */
 	char language[MAX_LANGUAGE];	/* Default language for this user */
-	char musicclass[MAX_LANGUAGE];  /* Music on Hold class */
+	char musicclass[MAX_MUSICCLASS];/* Music on Hold class */
 	char useragent[256];		/* User agent in SIP request */
 	struct ast_codec_pref prefs;	/* codec prefs */
 	ast_group_t callgroup;		/* Call group */
@@ -648,7 +648,7 @@
 	int outgoinglimit;		/* disabled */
 	char mailbox[AST_MAX_EXTENSION]; /* Mailbox setting for MWI checks */
 	char language[MAX_LANGUAGE];	/* Default language for prompts */
-	char musicclass[MAX_LANGUAGE];  /* Music on Hold class */
+	char musicclass[MAX_MUSICCLASS];/* Music on Hold class */
 	char useragent[256];		/* User agent in SIP request (saved from registration) */
 	struct ast_codec_pref prefs;	/* codec prefs */
 	int lastmsgssent;

Index: chan_skinny.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_skinny.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- chan_skinny.c	24 Jun 2005 02:56:15 -0000	1.84
+++ chan_skinny.c	5 Jul 2005 17:16:16 -0000	1.85
@@ -674,7 +674,7 @@
 static pthread_t accept_t;
 static char context[AST_MAX_EXTENSION] = "default";
 static char language[MAX_LANGUAGE] = "";
-static char musicclass[MAX_LANGUAGE] = "";
+static char musicclass[MAX_MUSICCLASS] = "";
 static char cid_num[AST_MAX_EXTENSION] = "";
 static char cid_name[AST_MAX_EXTENSION] = "";
 static char linelabel[AST_MAX_EXTENSION] ="";
@@ -823,7 +823,7 @@
 	char lastcallerid[AST_MAX_EXTENSION];		/* Last Caller*ID */
 	char call_forward[AST_MAX_EXTENSION];	
 	char mailbox[AST_MAX_EXTENSION];
-	char musicclass[MAX_LANGUAGE];
+	char musicclass[MAX_MUSICCLASS];
 	int curtone;					/* Current tone being played */
 	ast_group_t callgroup;
 	ast_group_t pickupgroup;

Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.467
retrieving revision 1.468
diff -u -d -r1.467 -r1.468
--- chan_zap.c	29 Jun 2005 21:47:44 -0000	1.467
+++ chan_zap.c	5 Jul 2005 17:16:17 -0000	1.468
@@ -172,7 +172,7 @@
 static char defaultozz[64] = "";
 
 static char language[MAX_LANGUAGE] = "";
-static char musicclass[MAX_LANGUAGE] = "";
+static char musicclass[MAX_MUSICCLASS] = "";
 static char progzone[10]= "";
 
 static int usedistinctiveringdetection = 0;
@@ -566,7 +566,7 @@
 	char defcontext[AST_MAX_EXTENSION];
 	char exten[AST_MAX_EXTENSION];
 	char language[MAX_LANGUAGE];
-	char musicclass[MAX_LANGUAGE];
+	char musicclass[MAX_MUSICCLASS];
 	char cid_num[AST_MAX_EXTENSION];
 	int cid_ton;					/* Type Of Number (TON) */
 	char cid_name[AST_MAX_EXTENSION];