Merged revisions 77939 via svnmerge from

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

........
r77939 | russell | 2007-08-02 11:56:04 -0500 (Thu, 02 Aug 2007) | 4 lines

Add another sanity check to vnak_retransmit().  This check ensures that frames
that have already been marked for deletion don't get retransmitted.
(closes issue #10361, patch from mihai)

........

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

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 806028380135be637a2de3262c4ffbc75cecf8f6..a93ccb69d7611ffb197e2dae53e6f8c4f961d1c6 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -6266,7 +6266,8 @@ static void vnak_retransmit(int callno, int last)
        AST_LIST_TRAVERSE(&frame_queue, f, list) {
                /* Send a copy immediately */
                if ((f->callno == callno) && iaxs[f->callno] &&
-                       ((unsigned char ) (f->oseqno - last) < 128)) {
+                       ((unsigned char ) (f->oseqno - last) < 128) &&
+                       (f->retries >= 0)) {
                        send_packet(f);
                }
        }