[svn-commits] file: trunk r89098 - in /trunk: ./ channels/chan_sip.c
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Wed Nov 7 19:14:32 CST 2007
Author: file
Date: Wed Nov 7 19:14:31 2007
New Revision: 89098
URL: http://svn.digium.com/view/asterisk?view=rev&rev=89098
Log:
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
........
Modified:
trunk/ (props changed)
trunk/channels/chan_sip.c
Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=89098&r1=89097&r2=89098
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Wed Nov 7 19:14:31 2007
@@ -1041,6 +1041,7 @@
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 */
@@ -8054,6 +8055,8 @@
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 @@
*/
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
More information about the svn-commits
mailing list