diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-12-02 14:55:50 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-12-02 14:55:50 +0000 |
| commit | 2d256221531ce44f4593e950410509c3bd5208a8 (patch) | |
| tree | 575d141c29b8f70b73040c8d1f5d250bf1e2de20 | |
| parent | 343d60c0306cfe55b56fcc49d45c67dc02751575 (diff) | |
Merged revisions 232230 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r232230 | file | 2009-12-02 10:54:28 -0400 (Wed, 02 Dec 2009) | 5 lines
Fix a bug where a scheduled item ID would get retained on registrations in a certain scenario
causing code to execute during reload that should not.
(issue AST-263)
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@232232 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_sip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 727a8ba5d..2e0062653 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -11506,6 +11506,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... @@ -11514,7 +11515,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)); |