[asterisk-commits] irroot: branch irroot/distrotech-customers-1.8 r334438 - in /team/irroot/dist...

[SVN commits to the Asterisk project]

Author: irroot
Date: Sun Sep  4 06:02:00 2011
New Revision: 334438

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=334438
Log:
Remove my initial patch for orphaned channels afterpickup

Modified:
    team/irroot/distrotech-customers-1.8/channels/chan_sip.c
    team/irroot/distrotech-customers-1.8/main/channel.c
    team/irroot/distrotech-customers-1.8/main/features.c

Modified: team/irroot/distrotech-customers-1.8/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/channels/chan_sip.c?view=diff&rev=334438&r1=334437&r2=334438
==============================================================================
--- team/irroot/distrotech-customers-1.8/channels/chan_sip.c (original)
+++ team/irroot/distrotech-customers-1.8/channels/chan_sip.c Sun Sep  4 06:02:00 2011
@@ -6091,7 +6091,7 @@
 
 	if (!p) {
 		ast_debug(1, "Asked to hangup channel that was not connected\n");
-		return -1;
+		return 0;
 	}
 	if (ast_test_flag(ast, AST_FLAG_ANSWERED_ELSEWHERE) || ast->hangupcause == AST_CAUSE_ANSWERED_ELSEWHERE) {
 		ast_debug(1, "This call was answered elsewhere");

Modified: team/irroot/distrotech-customers-1.8/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/main/channel.c?view=diff&rev=334438&r1=334437&r2=334438
==============================================================================
--- team/irroot/distrotech-customers-1.8/main/channel.c (original)
+++ team/irroot/distrotech-customers-1.8/main/channel.c Sun Sep  4 06:02:00 2011
@@ -6532,9 +6532,6 @@
 	/* Start by disconnecting the original's physical side */
 	if (clonechan->tech->hangup && clonechan->tech->hangup(clonechan)) {
 		ast_log(LOG_WARNING, "Hangup failed!  Strange things may happen!\n");
-		ast_channel_unlock(clonechan);
-		ast_hangup(clonechan);
-		clonechan = NULL;
 		res = -1;
 		goto done;
 	}

Modified: team/irroot/distrotech-customers-1.8/main/features.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/main/features.c?view=diff&rev=334438&r1=334437&r2=334438
==============================================================================
--- team/irroot/distrotech-customers-1.8/main/features.c (original)
+++ team/irroot/distrotech-customers-1.8/main/features.c Sun Sep  4 06:02:00 2011
@@ -6925,7 +6925,7 @@
 
 int ast_can_pickup(struct ast_channel *chan)
 {
-	if (chan->tech_pvt && !chan->pbx && !chan->masq && !ast_test_flag(chan, AST_FLAG_ZOMBIE)
+	if (!chan->pbx && !chan->masq && !ast_test_flag(chan, AST_FLAG_ZOMBIE)
 		&& (chan->_state == AST_STATE_RINGING
 			|| chan->_state == AST_STATE_RING
 			/*