diff options
| author | David Vossel <dvossel@digium.com> | 2009-12-22 17:00:08 +0000 |
|---|---|---|
| committer | David Vossel <dvossel@digium.com> | 2009-12-22 17:00:08 +0000 |
| commit | b74201f2b6bd8cfe724b576ac47417f0d9b0519d (patch) | |
| tree | 323d888ea05d36f5095f56de08bfb1bf03f94b34 /channels/chan_sip.c | |
| parent | bbcc80009632a626b6f5a7d63af958addda358be (diff) | |
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: https://origsvn.digium.com/svn/asterisk/trunk@236063 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_sip.c')
| -rw-r--r-- | channels/chan_sip.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 7cfe88679..396db2350 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -22652,6 +22652,8 @@ static int handle_incoming(struct sip_pvt *p, struct sip_request *req, struct so int debug = sip_debug_test_pvt(p); const char *e; int error = 0; + int oldmethod = p->method; + int acked = 0; /* Get Method and Cseq */ cseq = get_header(req, "Cseq"); @@ -22827,7 +22829,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; @@ -22836,9 +22838,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)) { pvt_set_needdestroy(p, "unmatched ACK"); } |