diff options
Diffstat (limited to 'pbx')
-rw-r--r-- | pbx/pbx_dundi.c | 4 | ||||
-rw-r--r-- | pbx/pbx_loopback.c | 8 | ||||
-rw-r--r-- | pbx/pbx_realtime.c | 10 |
3 files changed, 10 insertions, 12 deletions
diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c index 2e257d8ae..e81753213 100644 --- a/pbx/pbx_dundi.c +++ b/pbx/pbx_dundi.c @@ -4382,7 +4382,7 @@ static int dundi_canmatch(struct ast_channel *chan, const char *context, const c return dundi_helper(chan, context, exten, priority, data, DUNDI_FLAG_CANMATCH); } -static int dundi_exec(struct ast_channel *chan, const char *context, const char *exten, int priority, const char *callerid, int newstack, const char *data) +static int dundi_exec(struct ast_channel *chan, const char *context, const char *exten, int priority, const char *callerid, const char *data) { struct dundi_result results[MAX_RESULTS]; int res; @@ -4428,7 +4428,7 @@ static int dundi_exec(struct ast_channel *chan, const char *context, const char snprintf(req, sizeof(req), "%s/%s", results[x].tech, results[x].dest); dial = pbx_findapp("Dial"); if (dial) - res = pbx_exec(chan, dial, req, newstack); + res = pbx_exec(chan, dial, req); } else res = -1; return res; diff --git a/pbx/pbx_loopback.c b/pbx/pbx_loopback.c index 5522e9b09..ffa006527 100644 --- a/pbx/pbx_loopback.c +++ b/pbx/pbx_loopback.c @@ -147,13 +147,11 @@ static int loopback_canmatch(struct ast_channel *chan, const char *context, cons return res; } -static int loopback_exec(struct ast_channel *chan, const char *context, const char *exten, int priority, const char *callerid, int newstack, const char *data) +static int loopback_exec(struct ast_channel *chan, const char *context, const char *exten, int priority, const char *callerid, const char *data) { LOOPBACK_COMMON; - if (newstack) - res = ast_spawn_extension(chan, newcontext, newexten, newpriority, callerid); - else - res = ast_exec_extension(chan, newcontext, newexten, newpriority, callerid); + res = ast_spawn_extension(chan, newcontext, newexten, newpriority, callerid); + /* XXX hmmm... res is overridden ? */ if (newpattern && !ast_extension_match(newpattern, exten)) res = -1; return res; diff --git a/pbx/pbx_realtime.c b/pbx/pbx_realtime.c index 4e9aba1fe..bd9be8c56 100644 --- a/pbx/pbx_realtime.c +++ b/pbx/pbx_realtime.c @@ -177,14 +177,14 @@ static int realtime_canmatch(struct ast_channel *chan, const char *context, cons return res > 0 ? res : 0; } -static int realtime_exec(struct ast_channel *chan, const char *context, const char *exten, int priority, const char *callerid, int newstack, const char *data) +static int realtime_exec(struct ast_channel *chan, const char *context, const char *exten, int priority, const char *callerid, const char *data) { char app[256]; char appdata[512]=""; char *tmp=""; - char tmp1[80]; - char tmp2[80]; - char tmp3[EXT_DATA_SIZE]; + char tmp1[80]; + char tmp2[80]; + char tmp3[EXT_DATA_SIZE]; struct ast_app *a; struct ast_variable *v; REALTIME_COMMON(MODE_MATCH); @@ -218,7 +218,7 @@ static int realtime_exec(struct ast_channel *chan, const char *context, const ch "Uniqueid: %s\r\n", chan->name, chan->context, chan->exten, chan->priority, app, appdata ? appdata : "(NULL)", chan->uniqueid); - res = pbx_exec(chan, a, appdata, newstack); + res = pbx_exec(chan, a, appdata); } else ast_log(LOG_NOTICE, "No such application '%s' for extension '%s' in context '%s'\n", app, exten, context); } |