From: David Vossel <dvossel@digium.com>
Date: Thu, 2 Sep 2010 16:57:43 +0000 (+0000)
Subject: Merged revisions 284705 via svnmerge from
X-Git-Tag: 11.0.0-beta1~2383
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=804c8c38fd19717fdc01bbb6cbf9d47a31a70342;p=thirdparty%2Fasterisk.git

Merged revisions 284705 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r284705 | dvossel | 2010-09-02 11:56:43 -0500 (Thu, 02 Sep 2010) | 20 lines

  Merged revisions 284704 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ................
    r284704 | dvossel | 2010-09-02 11:48:51 -0500 (Thu, 02 Sep 2010) | 13 lines

    Merged revisions 284703 via svnmerge from
    https://origsvn.digium.com/svn/asterisk/branches/1.4

    ........
      r284703 | dvossel | 2010-09-02 11:47:15 -0500 (Thu, 02 Sep 2010) | 7 lines

      Removed relatedpeer code from sip_autodestruct

      Handling of the relatedpeer structure associated with a
      sip_pvt should be done during the final sip_destruction
      function, not in sip_autodestruct.
    ........
  ................
................


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 432adedfe2..7254bf736e 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -3600,10 +3600,6 @@ static int __sip_autodestruct(const void *data)
 		}
 	}
 
-	if (p->relatedpeer) {
-		p->relatedpeer = unref_peer(p->relatedpeer, "__sip_autodestruct: unref peer p->relatedpeer");	/* Remove link to peer. If it's realtime, make sure it's gone from memory) */
-	}
-
 	/* Reset schedule ID */
 	p->autokillid = -1;