[svn-commits] rizzo: branch rizzo/astobj2 r47676 - /team/rizzo/astobj2/channels/chan_sip.c

[svn-commits at lists.digium.com]

Author: rizzo
Date: Wed Nov 15 11:55:46 2006
New Revision: 47676

URL: http://svn.digium.com/view/asterisk?view=rev&rev=47676
Log:
merge version 47598, Let the peerpoke system destroy it's own packets, please.

Modified:
    team/rizzo/astobj2/channels/chan_sip.c

Modified: team/rizzo/astobj2/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/rizzo/astobj2/channels/chan_sip.c?view=diff&rev=47676&r1=47675&r2=47676
==============================================================================
--- team/rizzo/astobj2/channels/chan_sip.c (original)
+++ team/rizzo/astobj2/channels/chan_sip.c Wed Nov 15 11:55:46 2006
@@ -2039,7 +2039,9 @@
 			ast_channel_unlock(pvt->owner);
 		} else {
 			/* If no channel owner, destroy now */
-			set_destroy(pvt);
+			/* Let the peerpoke system expire packets when the timer expires for poke_noanswer */
+			if (pkt->method != SIP_OPTIONS)
+				set_destroy(pvt);
 		}
 	}