[asterisk-commits] oej: branch oej/invitestate r66364 - in /team/oej/invitestate: ./ channels/

[asterisk-commits at lists.digium.com]

Author: oej
Date: Tue May 29 04:41:53 2007
New Revision: 66364

URL: http://svn.digium.com/view/asterisk?view=rev&rev=66364
Log:
Reset automerge

Modified:
    team/oej/invitestate/   (props changed)
    team/oej/invitestate/channels/chan_sip.c

Propchange: team/oej/invitestate/
------------------------------------------------------------------------------
    automerge = http://www.codename-pineapple.org/

Propchange: team/oej/invitestate/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue May 29 04:41:53 2007
@@ -1,1 +1,1 @@
-/branches/1.2:1-66147
+/branches/1.2:1-66362

Modified: team/oej/invitestate/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/oej/invitestate/channels/chan_sip.c?view=diff&rev=66364&r1=66363&r2=66364
==============================================================================
--- team/oej/invitestate/channels/chan_sip.c (original)
+++ team/oej/invitestate/channels/chan_sip.c Tue May 29 04:41:53 2007
@@ -9789,7 +9789,6 @@
 		if (!ignore)
 			sip_cancel_destroy(p);
 		check_pendings(p);
-		ast_set_flag(p, SIP_CAN_BYE);
 		break;
 	case 180:	/* 180 Ringing */
 		if (!ignore)
@@ -10955,6 +10954,10 @@
 	check_via(p, req);
 	ast_set_flag(p, SIP_ALREADYGONE);	
 	p->invitestate = INV_CANCELLED;	/* When we get an ACK, it will be terminated */
+
+	if (ast_test_flag(p, SIP_INC_COUNT)) 
+		update_call_counter(p, DEC_CALL_LIMIT);
+
 	if (p->rtp) {
 		/* Immediately stop RTP */
 		ast_rtp_stop(p->rtp);