[Asterisk-cvs] asterisk/channels chan_iax2.c, 1.294, 1.295 chan_mgcp.c, 1.121, 1.122 chan_sip.c, 1.739, 1.740 chan_skinny.c, 1.74, 1.75 chan_zap.c, 1.453, 1.454

markster at lists.digium.com markster at lists.digium.com
Wed May 25 13:14:00 CDT 2005


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

Modified Files:
	chan_iax2.c chan_mgcp.c chan_sip.c chan_skinny.c chan_zap.c 
Log Message:
Use defined AST_MAX_ACCOUNT_CODE (bug #4350)


Index: chan_iax2.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_iax2.c,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -d -r1.294 -r1.295
--- chan_iax2.c	19 May 2005 04:31:02 -0000	1.294
+++ chan_iax2.c	25 May 2005 17:18:05 -0000	1.295
@@ -196,7 +196,7 @@
 static int test_jitpct = 0;
 #endif /* IAXTESTS */
 
-static char accountcode[20];
+static char accountcode[AST_MAX_ACCOUNT_CODE];
 static int amaflags = 0;
 static int delayreject = 0;
 static int iax2_encryption = 0;
@@ -249,7 +249,7 @@
 	char dbsecret[80];
 	int authmethods;
 	int encmethods;
-	char accountcode[20];
+	char accountcode[AST_MAX_ACCOUNT_CODE];
 	char inkeys[80];				/* Key(s) this user can use to authenticate to us */
 	char language[MAX_LANGUAGE];
 	int amaflags;
@@ -544,7 +544,7 @@
 	int calling_tns;
 	int calling_pres;
 	char dproot[AST_MAX_EXTENSION];
-	char accountcode[20];
+	char accountcode[AST_MAX_ACCOUNT_CODE];
 	int amaflags;
 	struct iax2_dpcache *dpentries;
 	struct ast_variable *vars;

Index: chan_mgcp.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_mgcp.c,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -d -r1.121 -r1.122
--- chan_mgcp.c	15 May 2005 03:21:51 -0000	1.121
+++ chan_mgcp.c	25 May 2005 17:18:05 -0000	1.122
@@ -211,7 +211,7 @@
 
 /*static int callprogress = 0;*/
 
-static char accountcode[20] = "";
+static char accountcode[AST_MAX_ACCOUNT_CODE] = "";
 
 static char mailbox[AST_MAX_EXTENSION];
 
@@ -361,7 +361,7 @@
 	ast_mutex_t lock;
 	char name[80];
 	struct mgcp_subchannel *sub;		/* pointer to our current connection, channel and stuff */
-	char accountcode[20];
+	char accountcode[AST_MAX_ACCOUNT_CODE];
 	char exten[AST_MAX_EXTENSION];		/* Extention where to start */
 	char context[AST_MAX_EXTENSION];
 	char language[MAX_LANGUAGE];

Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.739
retrieving revision 1.740
diff -u -d -r1.739 -r1.740
--- chan_sip.c	20 May 2005 03:14:41 -0000	1.739
+++ chan_sip.c	25 May 2005 17:18:05 -0000	1.740
@@ -446,7 +446,7 @@
 	char cid_name[256];			/* Caller*ID */
 	char via[256];				/* Via: header */
 	char fullcontact[128];			/* The Contact: that the UA registers with us */
-	char accountcode[20];			/* Account code */
+	char accountcode[AST_MAX_ACCOUNT_CODE];	/* Account code */
 	char our_contact[256];			/* Our contact header */
 	char realm[MAXHOSTNAMELEN];		/* Authorization realm */
 	char nonce[256];			/* Authorization nonce */
@@ -512,7 +512,7 @@
 	char context[AST_MAX_EXTENSION];	/* Default context for incoming calls */
 	char cid_num[80];		/* Caller ID num */
 	char cid_name[80];		/* Caller ID name */
-	char accountcode[20];		/* Account code */
+	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 useragent[256];		/* User agent in SIP request */
@@ -541,7 +541,7 @@
 	struct sip_auth *auth;		/* Realm authentication list */
 	char context[AST_MAX_EXTENSION];	/* Default context for incoming calls */
 	char username[80];		/* Temporary username until registration */ 
-	char accountcode[20];		/* Account code */
+	char accountcode[AST_MAX_ACCOUNT_CODE];	/* Account code */
 	int amaflags;			/* AMA Flags (for billing) */
 	char tohost[MAXHOSTNAMELEN];	/* If not dynamic, IP address */
 	char regexten[AST_MAX_EXTENSION]; /* Extension to register (if regcontext is used) */

Index: chan_skinny.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_skinny.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- chan_skinny.c	24 May 2005 22:24:04 -0000	1.74
+++ chan_skinny.c	25 May 2005 17:18:05 -0000	1.75
@@ -585,7 +585,7 @@
 static int transfer = 0;
 static int cancallforward = 0;
 /* static int busycount = 3;*/
-static char accountcode[20] = "";
+static char accountcode[AST_MAX_ACCOUNT_CODE] = "";
 static char mailbox[AST_MAX_EXTENSION];
 static int amaflags = 0;
 static int callnums = 1;
@@ -704,7 +704,7 @@
 	char name[80];
 	char label[42];					/* Label that shows next to the line buttons */
   	struct skinny_subchannel *sub;			/* pointer to our current connection, channel and stuff */
-	char accountcode[80];
+	char accountcode[AST_MAX_ACCOUNT_CODE];
 	char exten[AST_MAX_EXTENSION];			/* Extention where to start */
 	char context[AST_MAX_EXTENSION];
 	char language[MAX_LANGUAGE];

Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.453
retrieving revision 1.454
diff -u -d -r1.453 -r1.454
--- chan_zap.c	25 May 2005 10:57:15 -0000	1.453
+++ chan_zap.c	25 May 2005 17:18:05 -0000	1.454
@@ -229,7 +229,7 @@
 
 static int callprogress = 0;
 
-static char accountcode[20] = "";
+static char accountcode[AST_MAX_ACCOUNT_CODE] = "";
 
 static char mailbox[AST_MAX_EXTENSION];
 
@@ -580,7 +580,7 @@
 	int destroy;
 	int ignoredtmf;				
 	int inalarm;
-	char accountcode[20];		/* Account code */
+	char accountcode[AST_MAX_ACCOUNT_CODE];		/* Account code */
 	int amaflags;				/* AMA Flags */
 	char didtdd;				/* flag to say its done it once */
 	struct tdd_state *tdd;		/* TDD flag */




More information about the svn-commits mailing list