summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Spencer <markster@digium.com>2006-03-09 12:28:07 +0000
committerMark Spencer <markster@digium.com>2006-03-09 12:28:07 +0000
commit0752f8e41ed264b7e7abf09c6eebd45db7084aeb (patch)
tree8de0a64f63001804ad02afd3b6f004dde3de8b12
parentdad9d7709b87969bfffb2556bceec29d80c0623a (diff)
Make sure we clear our sched value before we actually schedule the
dereg. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@12476 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--channels/chan_iax2.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index a52e16821..64165edb0 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -5759,8 +5759,6 @@ static void __expire_registry(void *data)
ast_log(LOG_DEBUG, "Expiring registration for peer '%s'\n", p->name);
/* Reset the address */
memset(&p->addr, 0, sizeof(p->addr));
- /* Reset expire notice */
- p->expire = -1;
/* Reset expiry value */
p->expiry = min_reg_expire;
if (!ast_test_flag(p, IAX_TEMPONLY))
@@ -5778,6 +5776,9 @@ static void __expire_registry(void *data)
static int expire_registry(void *data)
{
+ struct iax2_peer *p = data;
+ /* Reset expire notice */
+ p->expire = -1;
#ifdef SCHED_MULTITHREADED
if (schedule_action(__expire_registry, data))
#endif