[asterisk-commits] qwell: branch 1.6.0 r137533 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: qwell
Date: Wed Aug 13 16:09:36 2008
New Revision: 137533

URL: http://svn.digium.com/view/asterisk?view=rev&rev=137533
Log:
Merged revisions 137532 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r137532 | qwell | 2008-08-13 16:08:58 -0500 (Wed, 13 Aug 2008) | 8 lines

Correctly end locally ended calls.

(closes issue #12170)
Reported by: pj
Patches:
      20080702__issue12170_clear_pendinginvite.diff uploaded by bbryant (license 36)
Tested by: bbryant, pabelanger

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_sip.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=137533&r1=137532&r2=137533
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Wed Aug 13 16:09:36 2008
@@ -14705,7 +14705,10 @@
  	/* Final response, not 200 ? */
  	if (resp >= 300 && (p->invitestate == INV_CALLING || p->invitestate == INV_PROCEEDING || p->invitestate == INV_EARLY_MEDIA ))
  		p->invitestate = INV_COMPLETED;
- 		
+ 	
+	/* Final response, clear out pending invite */
+	if ((resp == 200 || resp >= 300) && p->pendinginvite && seqno == p->pendinginvite)
+		p->pendinginvite = 0;
 
 	switch (resp) {
 	case 100:	/* Trying */