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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index a203d7c09e45f4279ac4a9196e7e75592f727c97..d74d041c055e75b18b9d0a241d6087257f3f6376 100644 (file)
--- 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;