Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Typo / whitespace fixes (bug #2052)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3454 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.0
Mark Spencer 22 years ago
parent 09c3679e2d
commit f202a8dbb3
1 changed files with 488 additions and 446 deletions
Show Stats Download Patch File Download Diff File

280
pbx.c
Unescape View File

@ -5,7 +5,7 @@
* *
* Copyright (C) 1999, Mark Spencer * Copyright (C) 1999, Mark Spencer
* *
* Mark Spencer <markster@linux-support.net> * Mark Spencer <markster@digium.com>
* *
* This program is free software, distributed under the terms of * This program is free software, distributed under the terms of
* the GNU General Public License * the GNU General Public License
@ -57,45 +57,40 @@
struct ast_context; struct ast_context;
/* An extension */ /* ast_exten: An extension */
struct ast_exten { struct ast_exten {
char exten[AST_MAX_EXTENSION]; char exten[AST_MAX_EXTENSION]; /* Extension name */
int matchcid; int matchcid; /* Match caller id ? */
char cidmatch[AST_MAX_EXTENSION]; char cidmatch[AST_MAX_EXTENSION]; /* Caller id to match for this extension */
int priority; int priority; /* Priority */
/* An extension */ struct ast_context *parent; /* An extension */
struct ast_context *parent; char app[AST_MAX_EXTENSION]; /* Application to execute */
/* Application to execute */ void *data; /* Data to use */
char app[AST_MAX_EXTENSION]; void (*datad)(void *); /* Data destructor */
/* Data to use */ struct ast_exten *peer; /* Next higher priority with our extension */
void *data; char *registrar; /* Registrar */
/* Data destructor */ struct ast_exten *next; /* Extension with a greater ID */
void (*datad)(void *);
/* Next higher priority with our extension */
struct ast_exten *peer;
/* Registrar */
char *registrar;
/* Extension with a greater ID */
struct ast_exten *next;
}; };
/* ast_include: include= support in extensions.conf */
struct ast_include { struct ast_include {
char name[AST_MAX_EXTENSION]; char name[AST_MAX_EXTENSION];
char rname[AST_MAX_EXTENSION]; char rname[AST_MAX_EXTENSION]; /* Context to include */
char *registrar; char *registrar; /* Registrar */
int hastime; int hastime; /* If time construct exists */
unsigned int monthmask; unsigned int monthmask; /* Mask for month */
unsigned int daymask; unsigned int daymask; /* Mask for date */
unsigned int dowmask; unsigned int dowmask; /* Mask for day of week (mon-sun) */
unsigned int minmask[24]; unsigned int minmask[24]; /* Mask for minute */
struct ast_include *next; struct ast_include *next; /* Link them together */
}; };
/* ast_sw: Switch statement in extensions.conf */
struct ast_sw { struct ast_sw {
char name[AST_MAX_EXTENSION]; char name[AST_MAX_EXTENSION];
char *registrar; char *registrar; /* Registrar */
char data[AST_MAX_EXTENSION]; char data[AST_MAX_EXTENSION]; /* Data load */
struct ast_sw *next; struct ast_sw *next; /* Link them together */
}; };
struct ast_ignorepat { struct ast_ignorepat {
@ -104,38 +99,29 @@ struct ast_ignorepat {
struct ast_ignorepat *next; struct ast_ignorepat *next;
}; };
/* An extension context */ /* ast_context: An extension context */
struct ast_context { struct ast_context {
/* Name of the context */ char name[AST_MAX_EXTENSION]; /* Name of the context */
char name[AST_MAX_EXTENSION]; ast_mutex_t lock; /* A lock to prevent multiple threads from clobbering the context */
/* A lock to prevent multiple threads from clobbering the context */ struct ast_exten *root; /* The root of the list of extensions */
ast_mutex_t lock; struct ast_context *next; /* Link them together */
/* The root of the list of extensions */ struct ast_include *includes; /* Include other contexts */
struct ast_exten *root; struct ast_ignorepat *ignorepats; /* Patterns for which to continue playing dialtone */
/* Link them together */ char *registrar; /* Registrar */
struct ast_context *next; struct ast_sw *alts; /* Alternative switches */
/* Include other contexts */
struct ast_include *includes;
/* Patterns for which to continue playing dialtone */
struct ast_ignorepat *ignorepats;
/* Registrar */
char *registrar;
/* Alternative switches */
struct ast_sw *alts;
}; };
/* An application */ /* ast_app: An application */
struct ast_app { struct ast_app {
/* Name of the application */ char name[AST_MAX_APP]; /* Name of the application */
char name[AST_MAX_APP];
int (*execute)(struct ast_channel *chan, void *data); int (*execute)(struct ast_channel *chan, void *data);
char *synopsis; char *synopsis; /* Synopsis text for 'show applications' */
char *description; char *description; /* Description (help text) for 'show application <name>' */
struct ast_app *next; struct ast_app *next; /* Next app in list */
}; };
/* An extension state notify */ /* ast_state_cb: An extension state notify */
struct ast_state_cb { struct ast_state_cb {
int id; int id;
void *data; void *data;
@ -200,30 +186,35 @@ static struct pbx_builtin {
{ "AbsoluteTimeout", pbx_builtin_atimeout, { "AbsoluteTimeout", pbx_builtin_atimeout,
"Set absolute maximum time of call", "Set absolute maximum time of call",
" AbsoluteTimeout(seconds): Set the absolute maximum amount of time permitted\n" " AbsoluteTimeout(seconds): Set the absolute maximum amount of time permitted\n"
"for a call. A setting of 0 disables the timeout. Always returns 0.\n" }, "for a call. A setting of 0 disables the timeout. Always returns 0.\n"
},
{ "Answer", pbx_builtin_answer, { "Answer", pbx_builtin_answer,
"Answer a channel if ringing", "Answer a channel if ringing",
" Answer(): If the channel is ringing, answer it, otherwise do nothing. \n" " Answer(): If the channel is ringing, answer it, otherwise do nothing. \n"
"Returns 0 unless it tries to answer the channel and fails.\n" }, "Returns 0 unless it tries to answer the channel and fails.\n"
},
{ "BackGround", pbx_builtin_background, { "BackGround", pbx_builtin_background,
"Play a file while awaiting extension", "Play a file while awaiting extension",
" Background(filename): Plays a given file, while simultaneously waiting for\n" " Background(filename): Plays a given file, while simultaneously waiting for\n"
"the user to begin typing an extension. The timeouts do not count until the\n" "the user to begin typing an extension. The timeouts do not count until the\n"
"last BackGround application as ended. Always returns 0.\n" }, "last BackGround application has ended. Always returns 0.\n"
},
{ "Busy", pbx_builtin_busy, { "Busy", pbx_builtin_busy,
"Indicate busy condition and stop", "Indicate busy condition and stop",
" Busy([timeout]): Requests that the channel indicate busy condition and\n" " Busy([timeout]): Requests that the channel indicate busy condition and\n"
"then waits for the user to hang up or the optional timeout to expire.\n" "then waits for the user to hang up or the optional timeout to expire.\n"
"Always returns -1." }, "Always returns -1."
},
{ "Congestion", pbx_builtin_congestion, { "Congestion", pbx_builtin_congestion,
"Indicate congestion and stop", "Indicate congestion and stop",
" Congestion([timeout]): Requests that the channel indicate congestion\n" " Congestion([timeout]): Requests that the channel indicate congestion\n"
"and then waits for the user to hang up or for the optional timeout to\n" "and then waits for the user to hang up or for the optional timeout to\n"
"expire. Always returns -1." }, "expire. Always returns -1."
},
{ "DigitTimeout", pbx_builtin_dtimeout, { "DigitTimeout", pbx_builtin_dtimeout,
"Set maximum timeout between digits", "Set maximum timeout between digits",
@ -234,7 +225,8 @@ static struct pbx_builtin {
"typed in is valid, it will not have to timeout to be tested, so typically\n" "typed in is valid, it will not have to timeout to be tested, so typically\n"
"at the expiry of this timeout, the extension will be considered invalid\n" "at the expiry of this timeout, the extension will be considered invalid\n"
"(and thus control would be passed to the 'i' extension, or if it doesn't\n" "(and thus control would be passed to the 'i' extension, or if it doesn't\n"
"exist the call would be terminated). Always returns 0.\n" }, "exist the call would be terminated). Always returns 0.\n"
},
{ "Goto", pbx_builtin_goto, { "Goto", pbx_builtin_goto,
"Goto a particular priority, extension, or context", "Goto a particular priority, extension, or context",
@ -243,29 +235,34 @@ static struct pbx_builtin {
"The extension BYEXTENSION is special in that it uses the current extension,\n" "The extension BYEXTENSION is special in that it uses the current extension,\n"
"thus permitting you to go to a different context, without specifying a\n" "thus permitting you to go to a different context, without specifying a\n"
"specific extension. Always returns 0, even if the given context, extension,\n" "specific extension. Always returns 0, even if the given context, extension,\n"
"or priority is invalid.\n" }, "or priority is invalid.\n"
},
{ "GotoIf", pbx_builtin_gotoif, { "GotoIf", pbx_builtin_gotoif,
"Conditional goto", "Conditional goto",
" GotoIf(Condition?label1:label2): Go to label 1 if condition is\n" " GotoIf(Condition?label1:label2): Go to label 1 if condition is\n"
"true, to label2 if condition is false. Either label1 or label2 may be\n" "true, to label2 if condition is false. Either label1 or label2 may be\n"
"omitted (in that case, we just don't take the particular branch) but not\n" "omitted (in that case, we just don't take the particular branch) but not\n"
"both. Look for the condition syntax in examples or documentation." }, "both. Look for the condition syntax in examples or documentation."
},
{ "GotoIfTime", pbx_builtin_gotoiftime, { "GotoIfTime", pbx_builtin_gotoiftime,
"Conditional goto on current time", "Conditional goto on current time",
" GotoIfTime(<times>|<weekdays>|<mdays>|<months>?[[context|]extension|]pri):\n" " GotoIfTime(<times>|<weekdays>|<mdays>|<months>?[[context|]extension|]pri):\n"
"If the current time matches the specified time, then branch to the specified\n" "If the current time matches the specified time, then branch to the specified\n"
"extension. Each of the elements may be specified either as '*' (for always)\n" "extension. Each of the elements may be specified either as '*' (for always)\n"
"or as a range. See the include syntax." }, "or as a range. See the 'include' syntax for details."
},
{ "Hangup", pbx_builtin_hangup, { "Hangup", pbx_builtin_hangup,
"Unconditional hangup", "Unconditional hangup",
" Hangup(): Unconditionally hangs up a given channel by returning -1 always.\n" }, " Hangup(): Unconditionally hangs up a given channel by returning -1 always.\n"
},
{ "NoOp", pbx_builtin_noop, { "NoOp", pbx_builtin_noop,
"No operation", "No operation",
" NoOp(): No-operation; Does nothing." }, " NoOp(): No-operation; Does nothing."
},
{ "Prefix", pbx_builtin_prefix, { "Prefix", pbx_builtin_prefix,
"Prepend leading digits", "Prepend leading digits",
@ -276,18 +273,21 @@ static struct pbx_builtin {
" So, for example, if priority 3 of 1212 is Prefix 555, the next step\n" " So, for example, if priority 3 of 1212 is Prefix 555, the next step\n"
"executed will be priority 4 of 5551212. If you switch into an extension\n" "executed will be priority 4 of 5551212. If you switch into an extension\n"
"which has no first step, the PBX will treat it as though the user dialed an\n" "which has no first step, the PBX will treat it as though the user dialed an\n"
"invalid extension.\n" }, "invalid extension.\n"
},
{ "Progress", pbx_builtin_progress, { "Progress", pbx_builtin_progress,
"Indicate progress", "Indicate progress",
" Progress(): Request that the channel indicate in-band progress is available to the user.\n" " Progress(): Request that the channel indicate in-band progress is \n"
"Always returns 0.\n" }, "available to the user.\nAlways returns 0.\n"
},
{ "ResetCDR", pbx_builtin_resetcdr, { "ResetCDR", pbx_builtin_resetcdr,
"Resets the Call Data Record", "Resets the Call Data Record",
" ResetCDR([options]): Causes the Call Data Record to be reset, optionally\n" " ResetCDR([options]): Causes the Call Data Record to be reset, optionally\n"
"storing the current CDR before zeroing it out (if 'w' option is specifed).\n" "storing the current CDR before zeroing it out (if 'w' option is specifed).\n"
"record WILL be stored. Always returns 0.\n" }, "record WILL be stored.\nAlways returns 0.\n"
},
{ "ResponseTimeout", pbx_builtin_rtimeout, { "ResponseTimeout", pbx_builtin_rtimeout,
"Set maximum timeout awaiting response", "Set maximum timeout awaiting response",
@ -295,55 +295,70 @@ static struct pbx_builtin {
"falling through a series of priorities for a channel in which the user may\n" "falling through a series of priorities for a channel in which the user may\n"
"begin typing an extension. If the user does not type an extension in this\n" "begin typing an extension. If the user does not type an extension in this\n"
"amount of time, control will pass to the 't' extension if it exists, and\n" "amount of time, control will pass to the 't' extension if it exists, and\n"
"if not the call would be terminated. Always returns 0.\n" }, "if not the call would be terminated.\nAlways returns 0.\n"
},
{ "Ringing", pbx_builtin_ringing, { "Ringing", pbx_builtin_ringing,
"Indicate ringing tone", "Indicate ringing tone",
" Ringing(): Request that the channel indicate ringing tone to the user.\n" " Ringing(): Request that the channel indicate ringing tone to the user.\n"
"Always returns 0.\n" }, "Always returns 0.\n"
},
{ "SayNumber", pbx_builtin_saynumber, { "SayNumber", pbx_builtin_saynumber,
"Say Number", "Say Number",
" SayNumber(digits[,gender]): Says the passed number\n" }, " SayNumber(digits[,gender]): Says the passed number. SayNumber is using\n"
"the current language setting for the channel. (See app SetLanguage).\n"
},
{ "SayDigits", pbx_builtin_saydigits, { "SayDigits", pbx_builtin_saydigits,
"Say Digits", "Say Digits",
" SayDigits(digits): Says the passed digits\n" }, " SayDigits(digits): Says the passed digits. SayDigits is using the\n"
"current language setting for the channel. (See app setLanguage)\n"
},
{ "SayAlpha", pbx_builtin_saycharacters, { "SayAlpha", pbx_builtin_saycharacters,
"Say Alpha", "Say Alpha",
" SayAlpha(string): Spells the passed string\n" }, " SayAlpha(string): Spells the passed string\n"
},
{ "SayPhonetic", pbx_builtin_sayphonetic, { "SayPhonetic", pbx_builtin_sayphonetic,
"Say Phonetic", "Say Phonetic",
" SayPhonetic(string): Spells the passed string with phonetic alphabet\n" }, " SayPhonetic(string): Spells the passed string with phonetic alphabet\n"
},
{ "SetAccount", pbx_builtin_setaccount, { "SetAccount", pbx_builtin_setaccount,
"Sets account code", "Sets account code",
" SetAccount([account]): Set the channel account code for billing\n" " SetAccount([account]): Set the channel account code for billing\n"
"purposes. Always returns 0.\n" }, "purposes. Always returns 0.\n"
},
{ "SetAMAFlags", pbx_builtin_setamaflags, { "SetAMAFlags", pbx_builtin_setamaflags,
"Sets AMA Flags", "Sets AMA Flags",
" SetAMAFlags([flag]): Set the channel AMA Flags for billing\n" " SetAMAFlags([flag]): Set the channel AMA Flags for billing\n"
"purposes. Always returns 0.\n" }, "purposes. Always returns 0.\n"
},
{ "SetGlobalVar", pbx_builtin_setglobalvar, { "SetGlobalVar", pbx_builtin_setglobalvar,
"Set variable to value", "Set global variable to value",
" SetGlobalVar(#n=value): Sets global variable n to value" }, " SetGlobalVar(#n=value): Sets global variable n to value. Global\n"
"variable are available across channels.\n"
},
{ "SetLanguage", pbx_builtin_setlanguage, { "SetLanguage", pbx_builtin_setlanguage,
"Sets user language", "Sets user language",
" SetLanguage(language): Set the channel language to 'language'. This\n" " SetLanguage(language): Set the channel language to 'language'. This\n"
"information is used for the generation of numbers, and to choose a natural\n" "information is used for the syntax in generation of numbers, and to choose\n"
"language file when available. For example, if language is set to 'fr' and\n" "a natural language file when available.\n"
"the file 'demo-congrats' is requested to be played, if the file 'fr/demo-\n" " For example, if language is set to 'fr' and the file 'demo-congrats' is \n"
"congrats' exists, then it will play that file, and if not will play the\n" "requested to be played, if the file 'fr/demo-congrats' exists, then\n"
"normal 'demo-congrats'. Always returns 0.\n" }, "it will play that file, and if not will play the normal 'demo-congrats'.\n"
"Always returns 0.\n"
},
{ "SetVar", pbx_builtin_setvar, { "SetVar", pbx_builtin_setvar,
"Set variable to value", "Set variable to value",
" Setvar(#n=value): Sets variable n to value" }, " Setvar(#n=value): Sets channel specific variable n to value"
},
{ "StripMSD", pbx_builtin_stripmsd, { "StripMSD", pbx_builtin_stripmsd,
"Strip leading digits", "Strip leading digits",
@ -354,7 +369,8 @@ static struct pbx_builtin {
" So, for example, if priority 3 of 5551212 is StripMSD 3, the next step\n" " So, for example, if priority 3 of 5551212 is StripMSD 3, the next step\n"
"executed will be priority 4 of 1212. If you switch into an extension which\n" "executed will be priority 4 of 1212. If you switch into an extension which\n"
"has no first step, the PBX will treat it as though the user dialed an\n" "has no first step, the PBX will treat it as though the user dialed an\n"
"invalid extension.\n" }, "invalid extension.\n"
},
{ "Suffix", pbx_builtin_suffix, { "Suffix", pbx_builtin_suffix,
"Append trailing digits", "Append trailing digits",
@ -365,40 +381,39 @@ static struct pbx_builtin {
" So, for example, if priority 3 of 555 is Suffix 1212, the next step\n" " So, for example, if priority 3 of 555 is Suffix 1212, the next step\n"
"executed will be priority 4 of 5551212. If you switch into an extension\n" "executed will be priority 4 of 5551212. If you switch into an extension\n"
"which has no first step, the PBX will treat it as though the user dialed an\n" "which has no first step, the PBX will treat it as though the user dialed an\n"
"invalid extension.\n" }, "invalid extension.\n"
},
{ "Wait", pbx_builtin_wait, { "Wait", pbx_builtin_wait,
"Waits for some time", "Waits for some time",
" Wait(seconds): Waits for a specified number of seconds, then returns 0.\n" " Wait(seconds): Waits for a specified number of seconds, then returns 0.\n"
"seconds can be passed with fractions of a second. (eg: 1.5 = 1.5 seconds)\n" }, "seconds can be passed with fractions of a second. (eg: 1.5 = 1.5 seconds)\n"
},
{ "WaitExten", pbx_builtin_waitexten, { "WaitExten", pbx_builtin_waitexten,
"Waits for some time", "Waits for some time",
" Wait(seconds): Waits for the user to enter a new extension for the \n" " Wait(seconds): Waits for the user to enter a new extension for the \n"
"specified number of seconds, then returns 0. Seconds can be passed with\n" "specified number of seconds, then returns 0. Seconds can be passed with\n"
"fractions of a second. (eg: 1.5 = 1.5 seconds)\n" }, "fractions of a second. (eg: 1.5 = 1.5 seconds)\n"
},
}; };
/* Lock for the application list */ AST_MUTEX_DEFINE_STATIC(applock); /* Lock for the application list */
AST_MUTEX_DEFINE_STATIC(applock);
static struct ast_context *contexts = NULL; static struct ast_context *contexts = NULL;
/* Lock for the ast_context list */ AST_MUTEX_DEFINE_STATIC(conlock); /* Lock for the ast_context list */
AST_MUTEX_DEFINE_STATIC(conlock);
static struct ast_app *apps = NULL; static struct ast_app *apps = NULL;
/* Lock for switches */ AST_MUTEX_DEFINE_STATIC(switchlock); /* Lock for switches */
AST_MUTEX_DEFINE_STATIC(switchlock);
struct ast_switch *switches = NULL; struct ast_switch *switches = NULL;
/* Lock for extension state notifys */ AST_MUTEX_DEFINE_STATIC(hintlock); /* Lock for extension state notifys */
AST_MUTEX_DEFINE_STATIC(hintlock);
static int stateid = 1; static int stateid = 1;
struct ast_hint *hints = NULL; struct ast_hint *hints = NULL;
struct ast_state_cb *statecbs = NULL; struct ast_state_cb *statecbs = NULL;
int pbx_exec(struct ast_channel *c, /* Channel */ int pbx_exec(struct ast_channel *c, /* Channel */
struct ast_app *app, struct ast_app *app, /* Application */
void *data, /* Data for execution */ void *data, /* Data for execution */
int newstack) /* Force stack increment */ int newstack) /* Force stack increment */
{ {
@ -411,6 +426,7 @@ int pbx_exec(struct ast_channel *c, /* Channel */
int stack = c->stack; int stack = c->stack;
int (*execute)(struct ast_channel *chan, void *data) = app->execute; int (*execute)(struct ast_channel *chan, void *data) = app->execute;
if (newstack && stack > AST_CHANNEL_MAX_STACK - 2) { if (newstack && stack > AST_CHANNEL_MAX_STACK - 2) {
/* Don't allow us to go over the max number of stacks we /* Don't allow us to go over the max number of stacks we
permit saving. */ permit saving. */
@ -434,14 +450,14 @@ int pbx_exec(struct ast_channel *c, /* Channel */
if (c->cdr) if (c->cdr)
ast_cdr_setapp(c->cdr, app->name, data); ast_cdr_setapp(c->cdr, app->name, data);
// save channel values /* save channel values */
saved_c_appl= c->appl; saved_c_appl= c->appl;
saved_c_data= c->data; saved_c_data= c->data;
c->appl = app->name; c->appl = app->name;
c->data = data; c->data = data;
res = execute(c, data); res = execute(c, data);
// restore channel values /* restore channel values */
c->appl= saved_c_appl; c->appl= saved_c_appl;
c->data= saved_c_data; c->data= saved_c_data;
@ -466,6 +482,7 @@ int pbx_exec(struct ast_channel *c, /* Channel */
struct ast_app *pbx_findapp(char *app) struct ast_app *pbx_findapp(char *app)
{ {
struct ast_app *tmp; struct ast_app *tmp;
if (ast_mutex_lock(&applock)) { if (ast_mutex_lock(&applock)) {
ast_log(LOG_WARNING, "Unable to obtain application lock\n"); ast_log(LOG_WARNING, "Unable to obtain application lock\n");
return NULL; return NULL;
@ -483,6 +500,7 @@ struct ast_app *pbx_findapp(char *app)
static struct ast_switch *pbx_findswitch(char *sw) static struct ast_switch *pbx_findswitch(char *sw)
{ {
struct ast_switch *asw; struct ast_switch *asw;
if (ast_mutex_lock(&switchlock)) { if (ast_mutex_lock(&switchlock)) {
ast_log(LOG_WARNING, "Unable to obtain application lock\n"); ast_log(LOG_WARNING, "Unable to obtain application lock\n");
return NULL; return NULL;
@ -501,6 +519,7 @@ static inline int include_valid(struct ast_include *i)
{ {
struct tm tm; struct tm tm;
time_t t; time_t t;
if (!i->hastime) if (!i->hastime)
return 1; return 1;
time(&t); time(&t);
@ -702,6 +721,7 @@ static struct ast_exten *pbx_find_extension(struct ast_channel *chan, char *cont
struct ast_include *i; struct ast_include *i;
struct ast_sw *sw; struct ast_sw *sw;
struct ast_switch *asw; struct ast_switch *asw;
/* Initialize status if appropriate */ /* Initialize status if appropriate */
if (!*stacklen) { if (!*stacklen) {
*status = STATUS_NO_CONTEXT; *status = STATUS_NO_CONTEXT;
@ -1016,8 +1036,10 @@ void pbx_substitute_variables_helper(struct ast_channel *c,const char *cp1,char
/* Look for a variable */ /* Look for a variable */
nextvar = strstr(whereweare, "${"); nextvar = strstr(whereweare, "${");
/* Look for an expression */
nextexp = strstr(whereweare, "$["); nextexp = strstr(whereweare, "$[");
/* Pick the first one only */
if (nextvar && nextexp) { if (nextvar && nextexp) {
if (nextvar < nextexp) if (nextvar < nextexp)
nextexp = NULL; nextexp = NULL;
@ -1188,6 +1210,7 @@ static int pbx_extension_helper(struct ast_channel *c, char *context, char *exte
char tmp[80]; char tmp[80];
char tmp2[80]; char tmp2[80];
char tmp3[EXT_DATA_SIZE]; char tmp3[EXT_DATA_SIZE];
if (ast_mutex_lock(&conlock)) { if (ast_mutex_lock(&conlock)) {
ast_log(LOG_WARNING, "Unable to obtain lock\n"); ast_log(LOG_WARNING, "Unable to obtain lock\n");
if ((action == HELPER_EXISTS) || (action == HELPER_CANMATCH) || (action == HELPER_MATCHMORE)) if ((action == HELPER_EXISTS) || (action == HELPER_CANMATCH) || (action == HELPER_MATCHMORE))
@ -1282,6 +1305,7 @@ static int pbx_extension_helper(struct ast_channel *c, char *context, char *exte
default: default:
ast_log(LOG_DEBUG, "Shouldn't happen!\n"); ast_log(LOG_DEBUG, "Shouldn't happen!\n");
} }
if ((action != HELPER_EXISTS) && (action != HELPER_CANMATCH) && (action != HELPER_MATCHMORE)) if ((action != HELPER_EXISTS) && (action != HELPER_CANMATCH) && (action != HELPER_MATCHMORE))
return -1; return -1;
else else
@ -1412,17 +1436,17 @@ int ast_device_state_changed(const char *fmt, ...)
} }
if (!strcmp(cur, device)) { if (!strcmp(cur, device)) {
// Found extension execute callbacks /* Found extension execute callbacks */
state = ast_extension_state2(list->exten); state = ast_extension_state2(list->exten);
if ((state != -1) && (state != list->laststate)) { if ((state != -1) && (state != list->laststate)) {
// For general callbacks /* For general callbacks */
cblist = statecbs; cblist = statecbs;
while (cblist) { while (cblist) {
cblist->callback(list->exten->parent->name, list->exten->exten, state, cblist->data); cblist->callback(list->exten->parent->name, list->exten->exten, state, cblist->data);
cblist = cblist->next; cblist = cblist->next;
} }
// For extension callbacks /* For extension callbacks */
cblist = list->callbacks; cblist = list->callbacks;
while (cblist) { while (cblist) {
cblist->callback(list->exten->parent->name, list->exten->exten, state, cblist->data); cblist->callback(list->exten->parent->name, list->exten->exten, state, cblist->data);
@ -1435,10 +1459,8 @@ int ast_device_state_changed(const char *fmt, ...)
} }
cur = rest; cur = rest;
} while (cur); } while (cur);
list = list->next; list = list->next;
} }
ast_mutex_unlock(&hintlock); ast_mutex_unlock(&hintlock);
return 1; return 1;
} }
@ -1460,7 +1482,6 @@ int ast_extension_state_add(char *context, char *exten,
cblist->data = data; cblist->data = data;
ast_mutex_unlock(&hintlock); ast_mutex_unlock(&hintlock);
} }
cblist = cblist->next; cblist = cblist->next;
} }
@ -1557,7 +1578,7 @@ int ast_extension_state_del(int id, ast_state_cb_type callback)
return -1; return -1;
} }
/* id greater zero is a callback with extension */ /* id greater than zero is a callback with extension */
list = hints; list = hints;
while (list) { while (list) {
cblist = list->callbacks; cblist = list->callbacks;
@ -1588,7 +1609,8 @@ static int ast_add_hint(struct ast_exten *e)
{ {
struct ast_hint *list; struct ast_hint *list;
if (!e) return -1; if (!e)
return -1;
ast_mutex_lock(&hintlock); ast_mutex_lock(&hintlock);
list = hints; list = hints;
@ -1623,7 +1645,6 @@ static int ast_change_hint(struct ast_exten *oe, struct ast_exten *ne)
struct ast_hint *list; struct ast_hint *list;
ast_mutex_lock(&hintlock); ast_mutex_lock(&hintlock);
list = hints; list = hints;
while(list) { while(list) {
@ -1668,7 +1689,6 @@ static int ast_remove_hint(struct ast_exten *e)
hints = list->next; hints = list->next;
else else
prev->next = list->next; prev->next = list->next;
free(list); free(list);
ast_mutex_unlock(&hintlock); ast_mutex_unlock(&hintlock);
@ -1963,7 +1983,7 @@ int ast_pbx_start(struct ast_channel *c)
} }
/* /*
* This function locks contexts list by &conlist, search for the rigt context * This function locks contexts list by &conlist, search for the right context
* structure, leave context list locked and call ast_context_remove_include2 * structure, leave context list locked and call ast_context_remove_include2
* which removes include, unlock contexts list and return ... * which removes include, unlock contexts list and return ...
*/ */
@ -2954,10 +2974,9 @@ static void get_timerange(struct ast_include *i, char *times)
int x; int x;
int s1, s2; int s1, s2;
int e1, e2; int e1, e2;
// int cth, ctm; /* int cth, ctm; */
//[PHM 07/01/03] /* start disabling all times, fill the fields with 0's, as they may contain garbage */
//start disabling all times, fill the fields with 0's, as they may contain garbage
memset(i->minmask, 0, sizeof(i->minmask)); memset(i->minmask, 0, sizeof(i->minmask));
/* Star is all times */ /* Star is all times */
@ -3049,6 +3068,7 @@ static unsigned int get_dow(char *dow)
/* The following line is coincidence, really! */ /* The following line is coincidence, really! */
int s, e, x; int s, e, x;
unsigned int mask; unsigned int mask;
/* Check for all days */ /* Check for all days */
if (ast_strlen_zero(dow) || !strcmp(dow, "*")) if (ast_strlen_zero(dow) || !strcmp(dow, "*"))
return (1 << 7) - 1; return (1 << 7) - 1;
@ -3090,6 +3110,7 @@ static unsigned int get_day(char *day)
/* The following line is coincidence, really! */ /* The following line is coincidence, really! */
int s, e, x; int s, e, x;
unsigned int mask; unsigned int mask;
/* Check for all days */ /* Check for all days */
if (ast_strlen_zero(day) || !strcmp(day, "*")) { if (ast_strlen_zero(day) || !strcmp(day, "*")) {
mask = (1 << 30) + ((1 << 30) - 1); mask = (1 << 30) + ((1 << 30) - 1);
@ -3153,6 +3174,7 @@ static unsigned int get_month(char *mon)
/* The following line is coincidence, really! */ /* The following line is coincidence, really! */
int s, e, x; int s, e, x;
unsigned int mask; unsigned int mask;
/* Check for all days */ /* Check for all days */
if (ast_strlen_zero(mon) || !strcmp(mon, "*")) if (ast_strlen_zero(mon) || !strcmp(mon, "*"))
return (1 << 12) - 1; return (1 << 12) - 1;
@ -3190,6 +3212,7 @@ static unsigned int get_month(char *mon)
static void build_timing(struct ast_include *i, char *info) static void build_timing(struct ast_include *i, char *info)
{ {
char *c; char *c;
/* Check for empty just in case */ /* Check for empty just in case */
if (ast_strlen_zero(info)) if (ast_strlen_zero(info))
return; return;
@ -3476,6 +3499,7 @@ int ast_context_add_ignorepat(char *con, char *value, char *registrar)
int ast_context_add_ignorepat2(struct ast_context *con, char *value, char *registrar) int ast_context_add_ignorepat2(struct ast_context *con, char *value, char *registrar)
{ {
struct ast_ignorepat *ignorepat, *ignorepatc, *ignorepatl = NULL; struct ast_ignorepat *ignorepat, *ignorepatc, *ignorepatl = NULL;
ignorepat = malloc(sizeof(struct ast_ignorepat)); ignorepat = malloc(sizeof(struct ast_ignorepat));
if (!ignorepat) { if (!ignorepat) {
ast_log(LOG_ERROR, "Out of memory\n"); ast_log(LOG_ERROR, "Out of memory\n");
@ -3511,6 +3535,7 @@ int ast_ignore_pattern(char *context, char *pattern)
{ {
struct ast_context *con; struct ast_context *con;
struct ast_ignorepat *pat; struct ast_ignorepat *pat;
con = ast_context_find(context); con = ast_context_find(context);
if (con) { if (con) {
pat = con->ignorepats; pat = con->ignorepats;
@ -3558,6 +3583,7 @@ int ast_async_goto(struct ast_channel *chan, char *context, char *exten, int pri
{ {
int res = 0; int res = 0;
ast_mutex_lock(&chan->lock); ast_mutex_lock(&chan->lock);
if (chan->pbx) { if (chan->pbx) {
/* This channel is currently in the PBX */ /* This channel is currently in the PBX */
if (context && !ast_strlen_zero(context)) if (context && !ast_strlen_zero(context))
@ -3637,11 +3663,12 @@ int ast_async_goto_by_name(char *channame, char *context, char *exten, int prior
static void ext_strncpy(char *dst, char *src, int len) static void ext_strncpy(char *dst, char *src, int len)
{ {
int count=0; int count=0;
while(*src && (count < len - 1)) { while(*src && (count < len - 1)) {
switch(*src) { switch(*src) {
case ' ': case ' ':
//otherwise exten => [a-b],1,... doesn't work /* otherwise exten => [a-b],1,... doesn't work */
// case '-': /* case '-': */
/* Ignore */ /* Ignore */
break; break;
default: default:
@ -3687,6 +3714,7 @@ int ast_add_extension2(struct ast_context *con,
*/ */
struct ast_exten *tmp, *e, *el = NULL, *ep = NULL; struct ast_exten *tmp, *e, *el = NULL, *ep = NULL;
int res; int res;
/* Be optimistic: Build the extension structure first */ /* Be optimistic: Build the extension structure first */
tmp = malloc(sizeof(struct ast_exten)); tmp = malloc(sizeof(struct ast_exten));
if (tmp) { if (tmp) {
@ -4142,6 +4170,7 @@ void __ast_context_destroy(struct ast_context *con, char *registrar)
struct ast_sw *sw, *swl= NULL; struct ast_sw *sw, *swl= NULL;
struct ast_exten *e, *el, *en; struct ast_exten *e, *el, *en;
struct ast_ignorepat *ipi, *ipl = NULL; struct ast_ignorepat *ipi, *ipl = NULL;
ast_mutex_lock(&conlock); ast_mutex_lock(&conlock);
tmp = contexts; tmp = contexts;
while(tmp) { while(tmp) {
@ -4309,6 +4338,7 @@ static int pbx_builtin_hangup(struct ast_channel *chan, void *data)
static int pbx_builtin_stripmsd(struct ast_channel *chan, void *data) static int pbx_builtin_stripmsd(struct ast_channel *chan, void *data)
{ {
char newexten[AST_MAX_EXTENSION] = ""; char newexten[AST_MAX_EXTENSION] = "";
if (!data || !atoi(data)) { if (!data || !atoi(data)) {
ast_log(LOG_DEBUG, "Ignoring, since number of digits to strip is 0\n"); ast_log(LOG_DEBUG, "Ignoring, since number of digits to strip is 0\n");
return 0; return 0;
@ -4323,6 +4353,7 @@ static int pbx_builtin_stripmsd(struct ast_channel *chan, void *data)
static int pbx_builtin_prefix(struct ast_channel *chan, void *data) static int pbx_builtin_prefix(struct ast_channel *chan, void *data)
{ {
char newexten[AST_MAX_EXTENSION] = ""; char newexten[AST_MAX_EXTENSION] = "";
if (!data || ast_strlen_zero(data)) { if (!data || ast_strlen_zero(data)) {
ast_log(LOG_DEBUG, "Ignoring, since there is no prefix to add\n"); ast_log(LOG_DEBUG, "Ignoring, since there is no prefix to add\n");
return 0; return 0;
@ -4337,6 +4368,7 @@ static int pbx_builtin_prefix(struct ast_channel *chan, void *data)
static int pbx_builtin_suffix(struct ast_channel *chan, void *data) static int pbx_builtin_suffix(struct ast_channel *chan, void *data)
{ {
char newexten[AST_MAX_EXTENSION] = ""; char newexten[AST_MAX_EXTENSION] = "";
if (!data || ast_strlen_zero(data)) { if (!data || ast_strlen_zero(data)) {
ast_log(LOG_DEBUG, "Ignoring, since there is no suffix to add\n"); ast_log(LOG_DEBUG, "Ignoring, since there is no suffix to add\n");
return 0; return 0;
@ -4365,8 +4397,7 @@ static int pbx_builtin_gotoiftime(struct ast_channel *chan, void *data)
/* Separate the Goto path */ /* Separate the Goto path */
strsep(&ts,"?"); strsep(&ts,"?");
// [PHM 07/01/03] /* struct ast_include include contained garbage here, fixed by zeroing it on get_timerange */
// struct ast_include include contained garbage here, fixed by zeroing it on get_timerange
build_timing(&include, s); build_timing(&include, s);
if (include_valid(&include)) if (include_valid(&include))
res = pbx_builtin_goto(chan, (void *)ts); res = pbx_builtin_goto(chan, (void *)ts);
@ -4377,6 +4408,7 @@ static int pbx_builtin_gotoiftime(struct ast_channel *chan, void *data)
static int pbx_builtin_wait(struct ast_channel *chan, void *data) static int pbx_builtin_wait(struct ast_channel *chan, void *data)
{ {
int ms; int ms;
/* Wait for "n" seconds */ /* Wait for "n" seconds */
if (data && atof((char *)data)) { if (data && atof((char *)data)) {
ms = atof((char *)data) * 1000; ms = atof((char *)data) * 1000;
@ -4388,6 +4420,7 @@ static int pbx_builtin_wait(struct ast_channel *chan, void *data)
static int pbx_builtin_waitexten(struct ast_channel *chan, void *data) static int pbx_builtin_waitexten(struct ast_channel *chan, void *data)
{ {
int ms; int ms;
/* Wait for "n" seconds */ /* Wait for "n" seconds */
if (data && atof((char *)data)) { if (data && atof((char *)data)) {
ms = atof((char *)data) * 1000; ms = atof((char *)data) * 1000;
@ -4399,6 +4432,7 @@ static int pbx_builtin_waitexten(struct ast_channel *chan, void *data)
static int pbx_builtin_background(struct ast_channel *chan, void *data) static int pbx_builtin_background(struct ast_channel *chan, void *data)
{ {
int res; int res;
/* Answer if need be */ /* Answer if need be */
if (chan->_state != AST_STATE_UP) if (chan->_state != AST_STATE_UP)
if (ast_answer(chan)) if (ast_answer(chan))
@ -4417,6 +4451,7 @@ static int pbx_builtin_background(struct ast_channel *chan, void *data)
static int pbx_builtin_atimeout(struct ast_channel *chan, void *data) static int pbx_builtin_atimeout(struct ast_channel *chan, void *data)
{ {
int x = atoi((char *) data); int x = atoi((char *) data);
/* Set the absolute maximum time how long a call can be connected */ /* Set the absolute maximum time how long a call can be connected */
ast_channel_setwhentohangup(chan,x); ast_channel_setwhentohangup(chan,x);
if (option_verbose > 2) if (option_verbose > 2)
@ -4447,6 +4482,7 @@ static int pbx_builtin_goto(struct ast_channel *chan, void *data)
char *s; char *s;
char *exten, *pri, *context; char *exten, *pri, *context;
char *stringp=NULL; char *stringp=NULL;
if (!data || ast_strlen_zero(data)) { if (!data || ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "Goto requires an argument (optional context|optional extension|priority)\n"); ast_log(LOG_WARNING, "Goto requires an argument (optional context|optional extension|priority)\n");
return -1; return -1;
@ -4658,6 +4694,7 @@ static int pbx_builtin_saynumber(struct ast_channel *chan, void *data)
static int pbx_builtin_saydigits(struct ast_channel *chan, void *data) static int pbx_builtin_saydigits(struct ast_channel *chan, void *data)
{ {
int res = 0; int res = 0;
if (data) if (data)
res = ast_say_digit_str(chan, (char *)data, "", chan->language); res = ast_say_digit_str(chan, (char *)data, "", chan->language);
return res; return res;
@ -4666,6 +4703,7 @@ static int pbx_builtin_saydigits(struct ast_channel *chan, void *data)
static int pbx_builtin_saycharacters(struct ast_channel *chan, void *data) static int pbx_builtin_saycharacters(struct ast_channel *chan, void *data)
{ {
int res = 0; int res = 0;
if (data) if (data)
res = ast_say_character_str(chan, (char *)data, "", chan->language); res = ast_say_character_str(chan, (char *)data, "", chan->language);
return res; return res;
@ -4674,6 +4712,7 @@ static int pbx_builtin_saycharacters(struct ast_channel *chan, void *data)
static int pbx_builtin_sayphonetic(struct ast_channel *chan, void *data) static int pbx_builtin_sayphonetic(struct ast_channel *chan, void *data)
{ {
int res = 0; int res = 0;
if (data) if (data)
res = ast_say_phonetic_str(chan, (char *)data, "", chan->language); res = ast_say_phonetic_str(chan, (char *)data, "", chan->language);
return res; return res;
@ -4682,6 +4721,7 @@ static int pbx_builtin_sayphonetic(struct ast_channel *chan, void *data)
int load_pbx(void) int load_pbx(void)
{ {
int x; int x;
/* Initialize the PBX */ /* Initialize the PBX */
if (option_verbose) { if (option_verbose) {
ast_verbose( "Asterisk PBX Core Initializing\n"); ast_verbose( "Asterisk PBX Core Initializing\n");
@ -4692,6 +4732,8 @@ int load_pbx(void)
ast_cli_register(&show_application_cli); ast_cli_register(&show_application_cli);
ast_cli_register(&show_dialplan_cli); ast_cli_register(&show_dialplan_cli);
ast_cli_register(&show_switches_cli); ast_cli_register(&show_switches_cli);
/* Register builtin applications */
for (x=0; x<sizeof(builtins) / sizeof(struct pbx_builtin); x++) { for (x=0; x<sizeof(builtins) / sizeof(struct pbx_builtin); x++) {
if (option_verbose) if (option_verbose)
ast_verbose( VERBOSE_PREFIX_1 "[%s]\n", builtins[x].name); ast_verbose( VERBOSE_PREFIX_1 "[%s]\n", builtins[x].name);

Write Preview
Loading…
Cancel
Save