[asterisk-commits] russell: branch 1.4 r91677 - in /branches/1.4/apps: app_dial.c app_queue.c

[SVN commits to the Asterisk project]

Author: russell
Date: Thu Dec  6 20:38:40 2007
New Revision: 91677

URL: http://svn.digium.com/view/asterisk?view=rev&rev=91677
Log:
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)

Modified:
    branches/1.4/apps/app_dial.c
    branches/1.4/apps/app_queue.c

Modified: branches/1.4/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/apps/app_dial.c?view=diff&rev=91677&r1=91676&r2=91677
==============================================================================
--- branches/1.4/apps/app_dial.c (original)
+++ branches/1.4/apps/app_dial.c Thu Dec  6 20:38:40 2007
@@ -1159,7 +1159,7 @@
 			}
 			strcpy(di->interface, interface);
 			AST_LIST_INSERT_TAIL(dialed_interfaces, di, list);
-		} else {
+		} else if (dialed) {
 			AST_LIST_UNLOCK(dialed_interfaces);
 			ast_log(LOG_WARNING, "Skipping dialing interface '%s' again since it has already been dialed\n", di->interface);
 			fulldial++;

Modified: branches/1.4/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/apps/app_queue.c?view=diff&rev=91677&r1=91676&r2=91677
==============================================================================
--- branches/1.4/apps/app_queue.c (original)
+++ branches/1.4/apps/app_queue.c Thu Dec  6 20:38:40 2007
@@ -2604,9 +2604,8 @@
 			}
 			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;