[asterisk-commits] oej: trunk r47598 - in /trunk: ./ channels/chan_sip.c

[asterisk-commits at lists.digium.com]

Author: oej
Date: Tue Nov 14 05:26:06 2006
New Revision: 47598

URL: http://svn.digium.com/view/asterisk?view=rev&rev=47598
Log:
Issue #8272 imported from 1.2/1.4 - Let the peerpoke system destroy it's own packets, please.

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

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

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=47598&r1=47597&r2=47598
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Tue Nov 14 05:26:06 2006
@@ -1925,7 +1925,10 @@
 			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 */