Merged revisions 189350 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r189350 | file | 2009-04-20 14:05:15 -0300 (Mon, 20 Apr 2009) | 10 lines

  Fix a bug with non-UDP connections that caused dialogs to not get freed.

  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/branches/1.6.1@189352 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 62ab783773e0a6814f4839f17d7f9d62c1903676..dc456ce68aca901285728843493afcadf596a135 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -3160,7 +3160,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 */
        /* 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, "pasing 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;
@@ -3202,6 +3202,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;