mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-02 11:58:40 +00:00
Mon Feb 24 07:00:01 CET 2003
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@622 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
11
pbx.c
11
pbx.c
@@ -710,12 +710,21 @@ static void pbx_substitute_variables_temp(struct ast_channel *c,char *cp3,char *
|
||||
} else if (!strcmp(cp3, "EXTEN")) {
|
||||
*cp4 = c->exten;
|
||||
} else if (!strncmp(cp3, "EXTEN-", strlen("EXTEN-")) &&
|
||||
/* XXX Remove me eventually */
|
||||
(sscanf(cp3 + strlen("EXTEN-"), "%d", &offset) == 1)) {
|
||||
if (offset < 0)
|
||||
offset=0;
|
||||
if (offset > strlen(c->exten))
|
||||
offset = strlen(c->exten);
|
||||
*cp4 = c->exten + offset;
|
||||
ast_log(LOG_WARNING, "The use of 'EXTEN-foo' has been derprecated in favor of 'EXTEN:foo'\n");
|
||||
} else if (!strncmp(cp3, "EXTEN:", strlen("EXTEN:")) &&
|
||||
(sscanf(cp3 + strlen("EXTEN:"), "%d", &offset) == 1)) {
|
||||
if (offset < 0)
|
||||
offset=0;
|
||||
if (offset > strlen(c->exten))
|
||||
offset = strlen(c->exten);
|
||||
*cp4 = c->exten + offset;
|
||||
} else if (!strcmp(cp3, "RDNIS")) {
|
||||
*cp4 = c->rdnis;
|
||||
if (!(*cp4))
|
||||
@@ -2784,8 +2793,8 @@ int ast_async_goto(struct ast_channel *chan, char *context, char *exten, int pri
|
||||
struct ast_frame *f;
|
||||
tmpchan = ast_channel_alloc(0);
|
||||
if (tmpchan) {
|
||||
ast_setstate(tmpchan, chan->_state);
|
||||
snprintf(tmpchan->name, sizeof(tmpchan->name), "AsyncGoto/%s", chan->name);
|
||||
ast_setstate(tmpchan, chan->_state);
|
||||
/* Make formats okay */
|
||||
tmpchan->readformat = chan->readformat;
|
||||
tmpchan->writeformat = chan->writeformat;
|
||||
|
||||
Reference in New Issue
Block a user