(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 cb5a8d90722111a754948c9958197bbcd6b4e64e..8208d3b7028abbbda9a23ef39eb60d0727a7ff15 100644 (file)
--- 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)) {