[asterisk-commits] rmudgett: branch rmudgett/cid r264539 - /team/rmudgett/cid/apps/

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Thu May 20 10:19:15 2010
New Revision: 264539

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=264539
Log:
Attempt to avoid a conflict before it happens.

Modified:
    team/rmudgett/cid/apps/app_dial.c
    team/rmudgett/cid/apps/app_queue.c

Modified: team/rmudgett/cid/apps/app_dial.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/cid/apps/app_dial.c?view=diff&rev=264539&r1=264538&r2=264539
==============================================================================
--- team/rmudgett/cid/apps/app_dial.c (original)
+++ team/rmudgett/cid/apps/app_dial.c Thu May 20 10:19:15 2010
@@ -1917,10 +1917,11 @@
 
 		ast_channel_lock(chan);
 		datastore = ast_channel_datastore_find(chan, &dialed_interface_info, NULL);
-		/* If the incoming channel has previously had connected line information
-		 * set on it (perhaps through the CONNECTED_LINE dialplan function) then
-		 * seed the chanlist's connected line information with this previously
-		 * acquired info
+		/*
+		 * Seed the chanlist's connected line information with previously
+		 * acquired connected line info from the incoming channel.  The
+		 * previously acquired connected line info could have been set
+		 * through the CONNECTED_LINE dialplan function.
 		 */
 		ast_party_connected_line_copy(&tmp->connected, &chan->connected);
 		ast_channel_unlock(chan);

Modified: team/rmudgett/cid/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/cid/apps/app_queue.c?view=diff&rev=264539&r1=264538&r2=264539
==============================================================================
--- team/rmudgett/cid/apps/app_queue.c (original)
+++ team/rmudgett/cid/apps/app_queue.c Thu May 20 10:19:15 2010
@@ -4240,15 +4240,6 @@
 		}
 		AST_LIST_UNLOCK(dialed_interfaces);
 
-		ast_channel_lock(qe->chan);
-		/* If any pre-existing connected line information exists on this
-		 * channel, like from the CONNECTED_LINE dialplan function, use this
-		 * to seed the connected line information. It may, of course, be updated
-		 * during the call
-		 */
-		ast_party_connected_line_copy(&tmp->connected, &qe->chan->connected);
-		ast_channel_unlock(qe->chan);
-		
 		if (di) {
 			free(tmp);
 			continue;
@@ -4274,6 +4265,16 @@
 			AST_LIST_INSERT_TAIL(dialed_interfaces, di, list);
 			AST_LIST_UNLOCK(dialed_interfaces);
 		}
+
+		ast_channel_lock(qe->chan);
+		/*
+		 * Seed the callattempt's connected line information with previously
+		 * acquired connected line info from the queued channel.  The
+		 * previously acquired connected line info could have been set
+		 * through the CONNECTED_LINE dialplan function.
+		 */
+		ast_party_connected_line_copy(&tmp->connected, &qe->chan->connected);
+		ast_channel_unlock(qe->chan);
 
 		tmp->stillgoing = -1;
 		tmp->member = cur;