From: Automerge script <automerge@asterisk.org>
Date: Sat, 9 Sep 2006 13:03:03 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.12.1-netsec~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=558c7ade17742fa21abfb66905e7615b9f2d00ce;p=thirdparty%2Fasterisk.git

automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42554 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index d217ba81cd..2b73993d71 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -9659,16 +9659,14 @@ static void check_pendings(struct sip_pvt *p)
 {
 	if (ast_test_flag(p, SIP_PENDINGBYE)) {
 		/* if we can't BYE, then this is really a pending CANCEL */
-		if (!ast_test_flag(p, SIP_CAN_BYE)) {
+		if (!ast_test_flag(p, SIP_CAN_BYE))
 			transmit_request_with_auth(p, SIP_CANCEL, p->ocseq, 1, 0);
 			/* Actually don't destroy us yet, wait for the 487 on our original 
 			   INVITE, but do set an autodestruct just in case we never get it. */
-			sip_scheddestroy(p, 32000);
-		} else {
+		else 
 			transmit_request_with_auth(p, SIP_BYE, 0, 1, 1);
-			ast_set_flag(p, SIP_NEEDDESTROY);	
-			ast_clear_flag(p, SIP_NEEDREINVITE);	
-		}
+		ast_clear_flag(p, SIP_PENDINGBYE);	
+		sip_scheddestroy(p, 32000);
 	} else if (ast_test_flag(p, SIP_NEEDREINVITE)) {
 		ast_log(LOG_DEBUG, "Sending pending reinvite on '%s'\n", p->callid);
 		/* Didn't get to reinvite yet, so do it now */