kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 04:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 66770 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r66770 | tilghman | 2007-05-31 12:15:09 -0500 (Thu, 31 May 2007) | 10 lines

Merged revisions 66744 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r66744 | tilghman | 2007-05-31 10:58:45 -0500 (Thu, 31 May 2007) | 2 lines

Issue 9818 - Fix for issue 8329 breaks pbx_realtime.  Issue 8329 will remain unfixed for pbx_realtime, but only because we lack core API to do it.

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@66771 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2007-05-31 17:16:38 +00:00
parent 9f79587d47
commit e8c1a35607
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/app_macro.c
View File

@@ -280,22 +280,23 @@ static int _macro_exec(struct ast_channel *chan, void *data, int exclusive)
while(ast_exists_extension(chan, chan->context, chan->exten, chan->priority, chan->cid.cid_num)) { while(ast_exists_extension(chan, chan->context, chan->exten, chan->priority, chan->cid.cid_num)) {
struct ast_context *c; struct ast_context *c;
struct ast_exten *e; struct ast_exten *e;
runningapp[0] = '\0';
runningdata[0] = '\0';
/* What application will execute? */ /* What application will execute? */
if (ast_rdlock_contexts()) { if (ast_rdlock_contexts()) {
ast_log(LOG_WARNING, "Failed to lock contexts list\n"); ast_log(LOG_WARNING, "Failed to lock contexts list\n");
e = NULL;
} else { } else {
for (c = ast_walk_contexts(NULL), e = NULL; c; c = ast_walk_contexts(c)) { for (c = ast_walk_contexts(NULL), e = NULL; c; c = ast_walk_contexts(c)) {
if (!strcmp(ast_get_context_name(c), chan->context)) { if (!strcmp(ast_get_context_name(c), chan->context)) {
if (ast_rdlock_context(c)) { if (ast_rdlock_context(c)) {
ast_log(LOG_WARNING, "Unable to lock context?\n"); ast_log(LOG_WARNING, "Unable to lock context?\n");
runningapp[0] = '\0';
runningdata[0] = '\0';
} else { } else {
e = find_matching_priority(c, chan->exten, chan->priority, chan->cid.cid_num); e = find_matching_priority(c, chan->exten, chan->priority, chan->cid.cid_num);
if (e) { /* This will only be undefined for pbx_realtime, which is majorly broken. */
ast_copy_string(runningapp, ast_get_extension_app(e), sizeof(runningapp)); ast_copy_string(runningapp, ast_get_extension_app(e), sizeof(runningapp));
ast_copy_string(runningdata, ast_get_extension_app_data(e), sizeof(runningdata)); ast_copy_string(runningdata, ast_get_extension_app_data(e), sizeof(runningdata));
}
ast_unlock_context(c); ast_unlock_context(c);
} }
break; break;