From: Olle Johansson <oej@edvina.net>
Date: Tue, 29 May 2007 10:02:31 +0000 (+0000)
Subject: Merged revisions 66363 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~2561
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36f15091bb03a6964d1700441ee6529d51c01c51;p=thirdparty%2Fasterisk.git

Merged revisions 66363 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r66363 | oej | 2007-05-29 11:41:40 +0200 (Tue, 29 May 2007) | 10 lines

Merged revisions 66349 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r66349 | oej | 2007-05-29 09:53:14 +0200 (Tue, 29 May 2007) | 2 lines

Issue #9802 - Change inuse counter on CANCEL

........

................


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index fed98d4866..981f694ba4 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -15064,6 +15064,10 @@ static int handle_request_cancel(struct sip_pvt *p, struct sip_request *req)
 			ast_log(LOG_DEBUG, "Got CANCEL on an answered call. Ignoring... \n");
 		return 0;
 	}
+
+	if (ast_test_flag(&p->flags[0], SIP_INC_COUNT)) 
+		update_call_counter(p, DEC_CALL_LIMIT);
+
 	stop_media_flows(p); /* Immediately stop RTP, VRTP and UDPTL as applicable */
 
 	if (p->owner)