[asterisk-commits] russell: trunk r91678 - in /trunk: ./ apps/app_dial.c apps/app_queue.c

[SVN commits to the Asterisk project]

Author: russell
Date: Thu Dec  6 20:43:21 2007
New Revision: 91678

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

........

Modified:
    trunk/   (props changed)
    trunk/apps/app_dial.c
    trunk/apps/app_queue.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_dial.c?view=diff&rev=91678&r1=91677&r2=91678
==============================================================================
--- trunk/apps/app_dial.c (original)
+++ trunk/apps/app_dial.c Thu Dec  6 20:43:21 2007
@@ -1390,7 +1390,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: trunk/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_queue.c?view=diff&rev=91678&r1=91677&r2=91678
==============================================================================
--- trunk/apps/app_queue.c (original)
+++ trunk/apps/app_queue.c Thu Dec  6 20:43:21 2007
@@ -2851,9 +2851,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;