Fix a bug with non-UDP connections that caused dialogs to not get freed.
authorJoshua Colp <jcolp@digium.com>
Mon, 20 Apr 2009 17:05:15 +0000 (17:05 +0000)
committerJoshua Colp <jcolp@digium.com>
Mon, 20 Apr 2009 17:05:15 +0000 (17:05 +0000)
This issue crept up because of a reference count issue on non-UDP based dialogs.
The dialog reference count was increased when transmitting a packet reliably but never
decreased. This caused the dialog structure to hang around despite being unlinked from
the dialogs container.

(closes issue #14919)
Reported by: vrban

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

channels/chan_sip.c

index 39b90a9..c556d91 100644 (file)
@@ -3598,7 +3598,7 @@ static enum sip_result __sip_reliable_xmit(struct sip_pvt *p, int seqno, int res
        /* I removed the code from retrans_pkt that does the same thing so it doesn't get loaded into the scheduler */
        /*! \todo According to the RFC some packets need to be retransmitted even if its TCP, so this needs to get revisited */
        if (!(p->socket.type & SIP_TRANSPORT_UDP)) {
-               xmitres = __sip_xmit(dialog_ref(p, "passing dialog ptr into callback..."), data, len);  /* Send packet */
+               xmitres = __sip_xmit(p, data, len);     /* Send packet */
                if (xmitres == XMIT_ERROR) {    /* Serious network trouble, no need to try again */
                        append_history(p, "XmitErr", "%s", fatal ? "(Critical)" : "(Non-critical)");
                        return AST_FAILURE;
@@ -3641,6 +3641,7 @@ static enum sip_result __sip_reliable_xmit(struct sip_pvt *p, int seqno, int res
                ast_log(LOG_ERROR, "Serious Network Trouble; __sip_xmit returns error for pkt data\n");
                AST_SCHED_DEL(sched, pkt->retransid);
                p->packets = pkt->next;
+               pkt->owner = dialog_unref(pkt->owner,"pkt is being freed, its dialog ref is dead now");
                ast_free(pkt->data);
                ast_free(pkt);
                return AST_FAILURE;