Merged revisions 91677 via svnmerge from

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

........
r91677 | russell | 2007-12-06 20:38:40 -0600 (Thu, 06 Dec 2007) | 4 lines

Allow dialing local channels from Queue() and Dial() again.  There was a slight
flaw in the code to prevent call forwards from looping that caused this problem.
(related to issue #11486)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91678 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2007-12-07 02:43:21 +00:00
parent 135f315382
commit c72fa81580
2 changed files with 3 additions and 4 deletions

View File

@@ -2851,9 +2851,8 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
}
strcpy(di->interface, cur->interface);
AST_LIST_INSERT_TAIL(dialed_interfaces, di, list);
} else {
if (di)
ast_log(LOG_DEBUG, "Skipping dialing interface '%s' since it has already been dialed\n", di->interface);
} else if (dialed) {
ast_log(LOG_DEBUG, "Skipping dialing interface '%s' since it has already been dialed\n", di->interface);
AST_LIST_UNLOCK(dialed_interfaces);
free(tmp);
continue;