[asterisk-commits] dvossel: branch 1.6.2 r236064 - in /branches/1.6.2: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: dvossel
Date: Tue Dec 22 11:04:38 2009
New Revision: 236064

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

................
  r236063 | dvossel | 2009-12-22 11:00:08 -0600 (Tue, 22 Dec 2009) | 18 lines
  
  Merged revisions 236062 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r236062 | dvossel | 2009-12-22 10:58:19 -0600 (Tue, 22 Dec 2009) | 11 lines
    
    fixes issue with p->method incorrectly set to ACK
    
    It is possible for a second ACK to come in for a retransmitted message.
    If an ack does not match an unacked message in our queue, restore the previous
    p->method as this ACK is completely ignored.
    
    (closes issue #16295)
    Reported by: omolenkamp
    Patches:
          issue16295_v2.diff uploaded by dvossel (license 671)
  ........
................

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

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

Modified: branches/1.6.2/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/channels/chan_sip.c?view=diff&rev=236064&r1=236063&r2=236064
==============================================================================
--- branches/1.6.2/channels/chan_sip.c (original)
+++ branches/1.6.2/channels/chan_sip.c Tue Dec 22 11:04:38 2009
@@ -21499,6 +21499,8 @@
 	int debug = sip_debug_test_pvt(p);
 	char *e;
 	int error = 0;
+	int oldmethod = p->method;
+	int acked = 0;
 
 	/* Get Method and Cseq */
 	cseq = get_header(req, "Cseq");
@@ -21671,7 +21673,7 @@
 		if (seqno == p->pendinginvite) {
 			p->invitestate = INV_TERMINATED;
 			p->pendinginvite = 0;
-			__sip_ack(p, seqno, 1 /* response */, 0);
+			acked = __sip_ack(p, seqno, 1 /* response */, 0);
 			if (find_sdp(req)) {
 				if (process_sdp(p, req, SDP_T38_NONE))
 					return -1;
@@ -21680,9 +21682,13 @@
 		} else if (p->glareinvite == seqno) {
 			/* handle ack for the 491 pending sent for glareinvite */
 			p->glareinvite = 0;
-			__sip_ack(p, seqno, 1, 0);
-		}
-		/* Got an ACK that we did not match. Ignore silently */
+			acked = __sip_ack(p, seqno, 1, 0);
+		}
+		if (!acked) {
+			/* Got an ACK that did not match anything. Ignore
+			 * silently and restore previous method */
+			p->method = oldmethod;
+		}
 		if (!p->lastinvite && ast_strlen_zero(p->randdata)) {
 			pvt_set_needdestroy(p, "unmatched ACK");
 		}