[asterisk-commits] mmichelson: branch group/issue8824 r144148 - /team/group/issue8824/apps/

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Tue Sep 23 17:30:10 2008
New Revision: 144148

URL: http://svn.digium.com/view/asterisk?view=rev&rev=144148
Log:
Ensure that the proper connected line information
is copied to the new outgoing channel on a call
forward


Modified:
    team/group/issue8824/apps/app_dial.c
    team/group/issue8824/apps/app_queue.c

Modified: team/group/issue8824/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/group/issue8824/apps/app_dial.c?view=diff&rev=144148&r1=144147&r2=144148
==============================================================================
--- team/group/issue8824/apps/app_dial.c (original)
+++ team/group/issue8824/apps/app_dial.c Tue Sep 23 17:30:10 2008
@@ -472,6 +472,7 @@
 	struct ast_channel *c = o->chan; /* the winner */
 	struct ast_channel *in = num->chan; /* the input channel */
 	struct ast_party_redirecting *apr = &o->chan->redirecting;
+	struct ast_party_connected_line *apc = &o->chan->connected;
 	char *stuff;
 	char *tech;
 	int cause;
@@ -522,7 +523,7 @@
 		c->cid.cid_tns = in->cid.cid_tns;
 
 		ast_party_caller_copy(&c->cid, &in->cid);
-		ast_party_connected_line_copy(&c->connected, &in->connected);
+		ast_party_connected_line_copy(&c->connected, apc);
 
 		ast_redirecting_update(in, apr);
 

Modified: team/group/issue8824/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/group/issue8824/apps/app_queue.c?view=diff&rev=144148&r1=144147&r2=144148
==============================================================================
--- team/group/issue8824/apps/app_queue.c (original)
+++ team/group/issue8824/apps/app_queue.c Tue Sep 23 17:30:10 2008
@@ -2474,6 +2474,7 @@
 					continue;
 				} else if (!ast_strlen_zero(o->chan->call_forward)) {
 					struct ast_party_redirecting *apr = &o->chan->redirecting;
+					struct ast_party_connected_line *apc = &o->chan->connected;
 					char tmpchan[256];
 					char *stuff;
 					char *tech;
@@ -2511,7 +2512,7 @@
 						o->chan->cid.cid_tns = in->cid.cid_tns;
 
 						ast_party_caller_copy(&o->chan->cid, &in->cid);
-						ast_party_connected_line_copy(&o->chan->connected, &in->connected);
+						ast_party_connected_line_copy(&o->chan->connected, apc);
 
 						ast_redirecting_update(in, apr);