Handle ACK and CANCEL in an invite transaction - even if we get INFO transactions...

(closes issue #10567)
Reported by: jacksch
Tested by: oej
Patch by: oej inspired by suggestions from neutrino88 in the bug tracker

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@102090 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index ff09964e57c57b66711ccf2957051710f8edf5e7..76f00e09082e9d50ad952c4c81d89ae12831586f 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -15178,12 +15178,17 @@ static int handle_request(struct sip_pvt *p, struct sip_request *req, struct soc
        if (option_debug > 3)
                ast_log(LOG_DEBUG, "**** Received %s (%d) - Command in SIP %s\n", sip_methods[p->method].text, sip_methods[p->method].id, cmd); 
 
-       if (p->icseq && (p->icseq > seqno)) {
-               if (option_debug)
-                       ast_log(LOG_DEBUG, "Ignoring too old SIP packet packet %d (expecting >= %d)\n", seqno, p->icseq);
-               if (req->method != SIP_ACK)
-                       transmit_response(p, "503 Server error", req);  /* We must respond according to RFC 3261 sec 12.2 */
-               return -1;
+       if (p->icseq && (p->icseq > seqno) ) {
+               if (p->pendinginvite && seqno == p->pendinginvite && (req->method == SIP_ACK || req->method == SIP_CANCEL)) {
+                       if (option_debug > 2)
+                               ast_log(LOG_DEBUG, "Got CANCEL or ACK on INVITE with transactions in between.\n");
+               }  else {
+                       if (option_debug)
+                               ast_log(LOG_DEBUG, "Ignoring too old SIP packet packet %d (expecting >= %d)\n", seqno, p->icseq);
+                       if (req->method != SIP_ACK)
+                               transmit_response(p, "503 Server error", req);  /* We must respond according to RFC 3261 sec 12.2 */
+                       return -1;
+               }
        } else if (p->icseq &&
                   p->icseq == seqno &&
                   req->method != SIP_ACK &&