From 9190562b1ea0c6fc0616de7df6d6e537a8c83373 Mon Sep 17 00:00:00 2001 From: dvossel Date: Tue, 22 Dec 2009 17:06:47 +0000 Subject: 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) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@236065 f38db490-d61c-443f-a65b-d21fe96a405b --- channels/chan_sip.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'channels') diff --git a/channels/chan_sip.c b/channels/chan_sip.c index fce524ec1..239fc89be 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -20560,6 +20560,8 @@ static int handle_incoming(struct sip_pvt *p, struct sip_request *req, struct so 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"); @@ -20731,7 +20733,7 @@ static int handle_incoming(struct sip_pvt *p, struct sip_request *req, struct so 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; @@ -20740,9 +20742,13 @@ static int handle_incoming(struct sip_pvt *p, struct sip_request *req, struct so } else if (p->glareinvite == seqno) { /* handle ack for the 491 pending sent for glareinvite */ p->glareinvite = 0; - __sip_ack(p, seqno, 1, 0); + 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; } - /* Got an ACK that we did not match. Ignore silently */ if (!p->lastinvite && ast_strlen_zero(p->randdata)) p->needdestroy = 1; break; -- cgit v1.2.3