[asterisk-commits] rmudgett: branch group/v14_colp r168617 - /team/group/v14_colp/channels/

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Wed Jan 14 14:59:34 2009
New Revision: 168617

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=168617
Log:
Merged from https://origsvn.digium.com/svn/asterisk/team/group/issue8824

..........
r156010 | mmichelson | 2008-11-11 14:37:29 -0600 (Tue, 11 Nov 2008) | 8 lines

Remove the setting of the channel to AST_STATE_DOWN when doing
a call pickup using the features.conf method. By doing this, the
connected line update contains the proper information after the
call is bridged.

Closes AST-133

Modified:
    team/group/v14_colp/channels/chan_misdn.c
    team/group/v14_colp/channels/chan_sip.c

Modified: team/group/v14_colp/channels/chan_misdn.c
URL: http://svn.digium.com/svn-view/asterisk/team/group/v14_colp/channels/chan_misdn.c?view=diff&rev=168617&r1=168616&r2=168617
==============================================================================
--- team/group/v14_colp/channels/chan_misdn.c (original)
+++ team/group/v14_colp/channels/chan_misdn.c Wed Jan 14 14:59:34 2009
@@ -4960,9 +4960,7 @@
 				if (ast_pickup_call(ch->ast)) {
 					hangup_chan(ch);
 				} else {
-					struct ast_channel *chan = ch->ast;
 					ch->state = MISDN_CALLING_ACKNOWLEDGE;
-					ast_setstate(chan, AST_STATE_DOWN);
 					hangup_chan(ch);
 					ch->ast = NULL;
 					break;
@@ -5190,7 +5188,6 @@
 				hangup_chan(ch);
 			} else {
 				ch->state = MISDN_CALLING_ACKNOWLEDGE;
-				ast_setstate(chan, AST_STATE_DOWN);
 				hangup_chan(ch);
 				ch->ast = NULL;
 				break;

Modified: team/group/v14_colp/channels/chan_sip.c
URL: http://svn.digium.com/svn-view/asterisk/team/group/v14_colp/channels/chan_sip.c?view=diff&rev=168617&r1=168616&r2=168617
==============================================================================
--- team/group/v14_colp/channels/chan_sip.c (original)
+++ team/group/v14_colp/channels/chan_sip.c Wed Jan 14 14:59:34 2009
@@ -15178,7 +15178,6 @@
 					c->hangupcause = AST_CAUSE_CALL_REJECTED;
 				} else {
 					ast_mutex_unlock(&p->lock);
-					ast_setstate(c, AST_STATE_DOWN);
 					c->hangupcause = AST_CAUSE_NORMAL_CLEARING;
 				}
 				p->invitestate = INV_COMPLETED;