From: David Vossel <dvossel@digium.com>
Date: Thu, 2 Sep 2010 16:48:51 +0000 (+0000)
Subject: Merged revisions 284703 via svnmerge from
X-Git-Tag: 1.6.2.14-rc1~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3325966e1db81cc36dd91d4f403f98a284719e98;p=thirdparty%2Fasterisk.git

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 26cc5a2144..673a8376e8 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -4004,10 +4004,6 @@ static int __sip_autodestruct(const void *data)
 		}
 	}
 
-	if (p->subscribed == MWI_NOTIFICATION)
-		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;