[asterisk-commits] dvossel: trunk r284706 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: dvossel
Date: Thu Sep  2 11:57:43 2010
New Revision: 284706

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=284706
Log:
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.
    ........
  ................
................

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=284706&r1=284705&r2=284706
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Thu Sep  2 11:57:43 2010
@@ -3600,10 +3600,6 @@
 		}
 	}
 
-	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;