[asterisk-commits] mmichelson: branch group/issue8824 r156010 - /team/group/issue8824/channels/

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Tue Nov 11 14:37:29 2008
New Revision: 156010

URL: http://svn.digium.com/view/asterisk?view=rev&rev=156010
Log:
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/issue8824/channels/chan_misdn.c
    team/group/issue8824/channels/chan_sip.c

Modified: team/group/issue8824/channels/chan_misdn.c
URL: http://svn.digium.com/view/asterisk/team/group/issue8824/channels/chan_misdn.c?view=diff&rev=156010&r1=156009&r2=156010
==============================================================================
--- team/group/issue8824/channels/chan_misdn.c (original)
+++ team/group/issue8824/channels/chan_misdn.c Tue Nov 11 14:37:29 2008
@@ -5050,9 +5050,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;
@@ -5278,7 +5276,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/issue8824/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/group/issue8824/channels/chan_sip.c?view=diff&rev=156010&r1=156009&r2=156010
==============================================================================
--- team/group/issue8824/channels/chan_sip.c (original)
+++ team/group/issue8824/channels/chan_sip.c Tue Nov 11 14:37:29 2008
@@ -19156,7 +19156,6 @@
 					c->hangupcause = AST_CAUSE_CALL_REJECTED;
 				} else {
 					sip_pvt_unlock(p);
-					ast_setstate(c, AST_STATE_DOWN);
 					c->hangupcause = AST_CAUSE_NORMAL_CLEARING;
 				}
 				p->invitestate = INV_COMPLETED;