summaryrefslogtreecommitdiff
path: root/channels
diff options
context:
space:
mode:
authorOlle Johansson <oej@edvina.net>2006-11-14 11:26:06 +0000
committerOlle Johansson <oej@edvina.net>2006-11-14 11:26:06 +0000
commitc2b4c7a9c7ca64fc1f427ff85f015fd59dc38181 (patch)
treef25f2ba1e0b8d32ee249510888c46fb1f9f16742 /channels
parentfb211aa61061c88f5d2929f4489058266fceeea7 (diff)
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
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_sip.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index e626eb145..4985677dc 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 */