Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv4756/channels
Modified Files:
chan_alsa.c chan_h323.c chan_iax2.c chan_local.c chan_oss.c
chan_sip.c chan_skinny.c chan_zap.c
Log Message:
define an AST_MAX_CONTEXT for use instead of AST_MAX_EXTENSION
Index: chan_alsa.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_alsa.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- chan_alsa.c 24 Jun 2005 02:15:04 -0000 1.45
+++ chan_alsa.c 10 Jul 2005 23:49:57 -0000 1.46
@@ -91,7 +91,7 @@
static const char tdesc[] = "ALSA Console Channel Driver";
static const char config[] = "alsa.conf";
-static char context[AST_MAX_EXTENSION] = "default";
+static char context[AST_MAX_CONTEXT] = "default";
static char language[MAX_LANGUAGE] = "";
static char exten[AST_MAX_EXTENSION] = "s";
@@ -124,7 +124,7 @@
keeps this driver as simple as possible -- as it should be. */
struct ast_channel *owner;
char exten[AST_MAX_EXTENSION];
- char context[AST_MAX_EXTENSION];
+ char context[AST_MAX_CONTEXT];
#if 0
snd_pcm_t *card;
#endif
Index: chan_h323.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_h323.c,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- chan_h323.c 24 Jun 2005 02:15:04 -0000 1.120
+++ chan_h323.c 10 Jul 2005 23:49:57 -0000 1.121
@@ -98,7 +98,7 @@
static const char desc[] = "The NuFone Network's Open H.323 Channel Driver";
static const char tdesc[] = "The NuFone Network's Open H.323 Channel Driver";
static const char config[] = "h323.conf";
-static char default_context[AST_MAX_EXTENSION] = "default";
+static char default_context[AST_MAX_CONTEXT] = "default";
static struct sockaddr_in bindaddr;
/** H.323 configuration values */
@@ -129,7 +129,7 @@
int nonCodecCapability; /* non-audio
capability */
int outgoing; /* Outgoing or
incoming call? */
char exten[AST_MAX_EXTENSION]; /* Requested
extension */
- char context[AST_MAX_EXTENSION]; /* Context
where to start */
+ char context[AST_MAX_CONTEXT]; /* Context
where to start */
char accountcode[256]; /* Account code
*/
char cid_num[80]; /* Caller*id
number, if available */
char cid_name[80]; /* Caller*id
name, if available */
Index: chan_iax2.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_iax2.c,v
retrieving revision 1.316
retrieving revision 1.317
diff -u -d -r1.316 -r1.317
--- chan_iax2.c 8 Jul 2005 21:14:34 -0000 1.316
+++ chan_iax2.c 10 Jul 2005 23:49:57 -0000 1.317
@@ -127,7 +127,7 @@
static char context[80] = "default";
static char language[MAX_LANGUAGE] = "";
-static char regcontext[AST_MAX_EXTENSION] = "";
+static char regcontext[AST_MAX_CONTEXT] = "";
static int max_retries = 4;
static int ping_time = 20;
@@ -217,7 +217,7 @@
#define IAX_STATE_TBD (1 << 2)
struct iax2_context {
- char context[AST_MAX_EXTENSION];
+ char context[AST_MAX_CONTEXT];
struct iax2_context *next;
};
@@ -277,7 +277,7 @@
char secret[80];
char dbsecret[80];
char outkey[80]; /* What key we use to
talk to this peer */
- char context[AST_MAX_EXTENSION]; /* For transfers only */
+ char context[AST_MAX_CONTEXT]; /* For transfers only */
char regexten[AST_MAX_EXTENSION]; /* Extension to
register (if regcontext is used) */
char peercontext[AST_MAX_EXTENSION]; /* Context to pass to
peer */
char mailbox[AST_MAX_EXTENSION]; /* Mailbox */
@@ -605,7 +605,7 @@
#define CACHE_FLAG_MATCHMORE (1 << 7)
static struct iax2_dpcache {
- char peercontext[AST_MAX_EXTENSION];
+ char peercontext[AST_MAX_CONTEXT];
char exten[AST_MAX_EXTENSION];
struct timeval orig;
struct timeval expirey;
@@ -2654,8 +2654,8 @@
char outkey[80];
char timezone[80];
char prefs[32];
- char context[AST_MAX_EXTENSION];
- char peercontext[AST_MAX_EXTENSION];
+ char context[AST_MAX_CONTEXT];
+ char peercontext[AST_MAX_CONTEXT];
};
static int create_addr(const char *peername, struct sockaddr_in *sin, struct
create_addr_info *cai)
Index: chan_local.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_local.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- chan_local.c 24 Jun 2005 02:15:04 -0000 1.50
+++ chan_local.c 10 Jul 2005 23:49:57 -0000 1.51
@@ -87,18 +87,18 @@
};
static struct local_pvt {
- ast_mutex_t lock; /* Channel private lock
*/
- char context[AST_MAX_EXTENSION]; /* Context to call */
+ ast_mutex_t lock; /* Channel private lock */
+ char context[AST_MAX_CONTEXT]; /* Context to call */
char exten[AST_MAX_EXTENSION]; /* Extension to call */
- int reqformat; /* Requested
format */
- int glaredetect; /* Detect glare
on hangup */
- int cancelqueue; /* Cancel queue
*/
- int alreadymasqed; /* Already
masqueraded */
- int launchedpbx; /* Did we
launch the PBX */
+ int reqformat; /* Requested format */
+ int glaredetect; /* Detect glare on hangup */
+ int cancelqueue; /* Cancel queue */
+ int alreadymasqed; /* Already masqueraded */
+ int launchedpbx; /* Did we launch the PBX */
int nooptimization;
- struct ast_channel *owner; /* Master Channel */
- struct ast_channel *chan; /* Outbound channel */
- struct local_pvt *next; /* Next entity */
+ struct ast_channel *owner; /* Master Channel */
+ struct ast_channel *chan; /* Outbound channel */
+ struct local_pvt *next; /* Next entity */
} *locals = NULL;
static int local_queue_frame(struct local_pvt *p, int isoutbound, struct
ast_frame *f, struct ast_channel *us)
Index: chan_oss.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_oss.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- chan_oss.c 24 Jun 2005 02:15:04 -0000 1.51
+++ chan_oss.c 10 Jul 2005 23:49:57 -0000 1.52
@@ -87,7 +87,7 @@
static const char tdesc[] = "OSS Console Channel Driver";
static const char config[] = "oss.conf";
-static char context[AST_MAX_EXTENSION] = "default";
+static char context[AST_MAX_CONTEXT] = "default";
static char language[MAX_LANGUAGE] = "";
static char exten[AST_MAX_EXTENSION] = "s";
@@ -120,7 +120,7 @@
keeps this driver as simple as possible -- as it should be. */
struct ast_channel *owner;
char exten[AST_MAX_EXTENSION];
- char context[AST_MAX_EXTENSION];
+ char context[AST_MAX_CONTEXT];
} oss;
static struct ast_channel *oss_request(const char *type, int format, void
*data, int *cause);
Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.776
retrieving revision 1.777
diff -u -d -r1.776 -r1.777
--- chan_sip.c 8 Jul 2005 21:14:34 -0000 1.776
+++ chan_sip.c 10 Jul 2005 23:49:57 -0000 1.777
@@ -262,7 +262,7 @@
static char default_useragent[AST_MAX_EXTENSION] = DEFAULT_USERAGENT;
#define DEFAULT_CONTEXT "default"
-static char default_context[AST_MAX_EXTENSION] = DEFAULT_CONTEXT;
+static char default_context[AST_MAX_CONTEXT] = DEFAULT_CONTEXT;
static char default_language[MAX_LANGUAGE] = "";
@@ -351,7 +351,7 @@
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 */
+static char regcontext[AST_MAX_CONTEXT] = ""; /* Context for
auto-extensions */
/* Expire slowly */
#define DEFAULT_EXPIRY 900
@@ -516,7 +516,7 @@
int route_persistant; /* Is this the "real" route? */
char from[256]; /* The From: header */
char useragent[256]; /* User agent in SIP request */
- char context[AST_MAX_EXTENSION]; /* Context for this call */
+ char context[AST_MAX_CONTEXT]; /* Context for this call */
char fromdomain[MAXHOSTNAMELEN]; /* Domain to show in the from
field */
char fromuser[AST_MAX_EXTENSION]; /* User to show in the user
field */
char fromname[AST_MAX_EXTENSION]; /* Name to show in the user
field */
@@ -600,7 +600,7 @@
ASTOBJ_COMPONENTS(struct sip_user);
char secret[80]; /* Password */
char md5secret[80]; /* Password in md5 */
- char context[AST_MAX_EXTENSION]; /* Default context for incoming
calls */
+ char context[AST_MAX_CONTEXT]; /* Default context for incoming calls */
char cid_num[80]; /* Caller ID num */
char cid_name[80]; /* Caller ID name */
char accountcode[AST_MAX_ACCOUNT_CODE]; /* Account code */
@@ -631,7 +631,7 @@
char secret[80]; /* Password */
char md5secret[80]; /* Password in MD5 */
struct sip_auth *auth; /* Realm authentication list */
- char context[AST_MAX_EXTENSION]; /* Default context for incoming
calls */
+ char context[AST_MAX_CONTEXT]; /* Default context for incoming calls */
char username[80]; /* Temporary username until
registration */
char accountcode[AST_MAX_ACCOUNT_CODE]; /* Account code */
int amaflags; /* AMA Flags (for billing) */
Index: chan_skinny.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_skinny.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- chan_skinny.c 8 Jul 2005 17:06:53 -0000 1.86
+++ chan_skinny.c 10 Jul 2005 23:49:57 -0000 1.87
@@ -672,7 +672,7 @@
static int skinnysock = -1;
static pthread_t tcp_thread;
static pthread_t accept_t;
-static char context[AST_MAX_EXTENSION] = "default";
+static char context[AST_MAX_CONTEXT] = "default";
static char language[MAX_LANGUAGE] = "";
static char musicclass[MAX_MUSICCLASS] = "";
static char cid_num[AST_MAX_EXTENSION] = "";
@@ -816,7 +816,7 @@
struct skinny_subchannel *sub; /* pointer to our
current connection, channel and stuff */
char accountcode[AST_MAX_ACCOUNT_CODE];
char exten[AST_MAX_EXTENSION]; /* Extention where to
start */
- char context[AST_MAX_EXTENSION];
+ char context[AST_MAX_CONTEXT];
char language[MAX_LANGUAGE];
char cid_num[AST_MAX_EXTENSION]; /* Caller*ID */
char cid_name[AST_MAX_EXTENSION]; /* Caller*ID */
Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.469
retrieving revision 1.470
diff -u -d -r1.469 -r1.470
--- chan_zap.c 10 Jul 2005 16:05:59 -0000 1.469
+++ chan_zap.c 10 Jul 2005 23:49:57 -0000 1.470
@@ -165,7 +165,7 @@
static int cur_emdigitwait = 250; /* Wait time in ms for digits on EM channel
*/
-static char context[AST_MAX_EXTENSION] = "default";
+static char context[AST_MAX_CONTEXT] = "default";
static char cid_num[256] = "";
static char cid_name[256] = "";
static char defaultcic[64] = "";
@@ -371,7 +371,7 @@
pthread_t master; /*
Thread of master */
ast_mutex_t lock; /*
Mutex */
char idleext[AST_MAX_EXTENSION]; /*
Where to idle extra calls */
- char idlecontext[AST_MAX_EXTENSION]; /* What
context to use for idle */
+ char idlecontext[AST_MAX_CONTEXT]; /* What
context to use for idle */
char idledial[AST_MAX_EXTENSION]; /* What
to dial before dumping */
int minunused; /* Min
# of channels to keep empty */
int minidle; /* Min
# of "idling" calls to keep active */
@@ -449,7 +449,7 @@
int ring[3];
};
struct ringContextData {
- char contextData[AST_MAX_EXTENSION];
+ char contextData[AST_MAX_CONTEXT];
};
struct zt_distRings {
struct distRingData ringnum[3];
@@ -562,8 +562,8 @@
struct zt_distRings drings;
- char context[AST_MAX_EXTENSION];
- char defcontext[AST_MAX_EXTENSION];
+ char context[AST_MAX_CONTEXT];
+ char defcontext[AST_MAX_CONTEXT];
char exten[AST_MAX_EXTENSION];
char language[MAX_LANGUAGE];
char musicclass[MAX_MUSICCLASS];
_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs
