Merged revisions 89097 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r89097 | file | 2007-11-07 21:11:25 -0400 (Wed, 07 Nov 2007) | 8 lines

Add support for allowing one outgoing transaction. This means if a response comes back out of order chan_sip will still handle it. I dream of a chan_sip with real transaction support.
(closes issue #10946)
Reported by: flefoll
(closes issue #10915)
Reported by: ramonpeek
(closes issue #9567)
Reported by: atca_pres

........

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index adfa2cead9e2e4dd76c04e02699cf3e76c204f2b..e84dd20de40e798b4ad44380834998cd6f9d943a 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -1041,6 +1041,7 @@ struct sip_pvt {
        ast_group_t callgroup;                  /*!< Call group */
        ast_group_t pickupgroup;                /*!< Pickup group */
        int lastinvite;                         /*!< Last Cseq of invite */
+       int lastnoninvite;                      /*!< Last Cseq of non-invite */
        struct ast_flags flags[2];              /*!< SIP_ flags */
 
        /* boolean or small integers that don't belong in flags */
@@ -8055,6 +8056,8 @@ static int transmit_notify_with_sipfrag(struct sip_pvt *p, int cseq, char *messa
        if (!p->initreq.headers)
                initialize_initreq(p, &req);
 
+       p->lastnoninvite = p->ocseq;
+
        return send_request(p, &req, XMIT_RELIABLE, p->ocseq);
 }
 
@@ -16220,10 +16223,10 @@ static int handle_incoming(struct sip_pvt *p, struct sip_request *req, struct so
                 */
                int ret = 0;
 
-               if (p->ocseq < seqno) {
+               if (p->ocseq < seqno && seqno != p->lastnoninvite) {
                        ast_debug(1, "Ignoring out of order response %d (expecting %d)\n", seqno, p->ocseq);
                        ret = -1;
-               } else if (p->ocseq != seqno) {
+               } else if (p->ocseq != seqno && seqno != p->lastnoninvite) {
                        /* ignore means "don't do anything with it" but still have to 
                         * respond appropriately.
                         * But in this case this is a response already, so we really