From: Olle Johansson <oej@edvina.net>
Date: Tue, 14 Nov 2006 11:26:06 +0000 (+0000)
Subject: Issue #8272 imported from 1.2/1.4 - Let the peerpoke system destroy it's own packets... 
X-Git-Tag: 1.6.0-beta1~3^2~3993
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2b4c7a9c7ca64fc1f427ff85f015fd59dc38181;p=thirdparty%2Fasterisk.git

Issue #8272 imported from 1.2/1.4 - Let the peerpoke system destroy it's own packets, please.


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index e626eb1458..4985677dc3 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -1925,7 +1925,10 @@ static int retrans_pkt(void *data)
 			ast_channel_unlock(pkt->owner->owner);
 		} else {
 			/* If no channel owner, destroy now */
-			ast_set_flag(&pkt->owner->flags[0], SIP_NEEDDESTROY);	
+
+			/* Let the peerpoke system expire packets when the timer expires for poke_noanswer */
+			if (pkt->method != SIP_OPTIONS)
+				ast_set_flag(&pkt->owner->flags[0], SIP_NEEDDESTROY);	
 		}
 	}
 	/* Remove the packet */