From: Joshua Colp <jcolp@digium.com>
Date: Mon, 10 Sep 2007 14:26:32 +0000 (+0000)
Subject: (closes issue #10688)
X-Git-Tag: 1.6.0-beta1~3^2~1486
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5fd0dfb923b0f55350495af75da75af25c8d9623;p=thirdparty%2Fasterisk.git

(closes issue #10688)
Reported by: casper
Patches:
      chan_sip.c.82076.diff uploaded by casper (license 55)
Remove double check for zombie flag and optimize things a bit.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82077 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index cb5a8d9072..8208d3b702 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -4036,13 +4036,14 @@ static int sip_hangup(struct ast_channel *ast)
 		p->owner = NULL;  /* Owner will be gone after we return, so take it away */
 		return 0;
 	}
-	if (ast_test_flag(ast, AST_FLAG_ZOMBIE) && p->refer)
-       		ast_debug(1, "SIP Transfer: Hanging up Zombie channel %s after transfer ... Call-ID: %s\n", ast->name, p->callid);
-	else
-		ast_debug(1, "Hangup call %s, SIP callid %s)\n", ast->name, p->callid);
 
-	if (ast_test_flag(ast, AST_FLAG_ZOMBIE)) 
-		ast_debug(1, "Hanging up zombie call. Be scared.\n");
+	if (ast_test_flag(ast, AST_FLAG_ZOMBIE)) {
+		if (p->refer)
+			ast_debug(1, "SIP Transfer: Hanging up Zombie channel %s after transfer ... Call-ID: %s\n", ast->name, p->callid);
+		else
+			ast_debug(1, "Hanging up zombie call. Be scared.\n");
+	} else
+		ast_debug(1, "Hangup call %s, SIP callid %s\n", ast->name, p->callid);
 
 	sip_pvt_lock(p);
 	if (ast_test_flag(&p->flags[0], SIP_INC_COUNT) || ast_test_flag(&p->flags[1], SIP_PAGE2_CALL_ONHOLD)) {