Fix a bug where a scheduled item ID would get retained on registrations in a certain...

causing code to execute during reload that should not.

(issue AST-263)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@232230 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index eab73f7..410bee7 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -12121,6 +12121,7 @@ static int sip_reg_timeout(const void *data)
                r->call = dialog_unref(r->call, "unrefing r->call");
        }
        /* If we have a limit, stop registration and give up */
+       r->timeout = -1;
        if (global_regattempts_max && r->regattempts > global_regattempts_max) {
                /* Ok, enough is enough. Don't try any more */
                /* We could add an external notification here...
@@ -12129,7 +12130,6 @@ static int sip_reg_timeout(const void *data)
                r->regstate = REG_STATE_FAILED;
        } else {
                r->regstate = REG_STATE_UNREGISTERED;
-               r->timeout = -1;
                res=transmit_register(r, SIP_REGISTER, NULL, NULL);
        }
        manager_event(EVENT_FLAG_SYSTEM, "Registry", "ChannelType: SIP\r\nUsername: %s\r\nDomain: %s\r\nStatus: %s\r\n", r->username, r->hostname, regstate2str(r->regstate));