[asterisk-commits] oej: trunk r66367 - in /trunk: ./ channels/chan_sip.c

[asterisk-commits at lists.digium.com]

Author: oej
Date: Tue May 29 05:02:31 2007
New Revision: 66367

URL: http://svn.digium.com/view/asterisk?view=rev&rev=66367
Log:
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

........

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

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=66367&r1=66366&r2=66367
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Tue May 29 05:02:31 2007
@@ -15064,6 +15064,10 @@
 			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)