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

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index a52e168..64165ed 100644 (file)
--- 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