Merged revisions 75928 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Thu, 19 Jul 2007 15:53:50 +0000 (15:53 +0000)
committerRussell Bryant <russell@russellbryant.com>
Thu, 19 Jul 2007 15:53:50 +0000 (15:53 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r75928 | russell | 2007-07-19 10:53:15 -0500 (Thu, 19 Jul 2007) | 14 lines

Merged revisions 75927 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r75927 | russell | 2007-07-19 10:49:42 -0500 (Thu, 19 Jul 2007) | 6 lines

When processing full frames, take sequence number wraparound into account when
deciding whether or not we need to request retransmissions by sending a VNAK.
This code could cause VNAKs to be sent erroneously in some cases, and to not
be sent in other cases when it should have been.
(closes issue #10237, reported and patched by mihai)

........

................

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

channels/chan_iax2.c

index f9cd417..23ef729 100644 (file)
@@ -7144,7 +7144,9 @@ static int socket_process(struct iax2_thread *thread)
                                /* If it's not an ACK packet, it's out of order. */
                                ast_debug(1, "Packet arrived out of order (expecting %d, got %d) (frametype = %d, subclass = %d)\n", 
                                        iaxs[fr->callno]->iseqno, fr->oseqno, f.frametype, f.subclass);
-                               if (iaxs[fr->callno]->iseqno > fr->oseqno) {
+                               /* Check to see if we need to request retransmission,
+                                * and take sequence number wraparound into account */
+                               if ((unsigned char) (iaxs[fr->callno]->iseqno - fr->oseqno) < 128) {
                                        /* If we've already seen it, ack it XXX There's a border condition here XXX */
                                        if ((f.frametype != AST_FRAME_IAX) || 
                                                        ((f.subclass != IAX_COMMAND_ACK) && (f.subclass != IAX_COMMAND_INVAL))) {