diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-12-02 14:55:09 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-12-02 14:55:09 +0000 |
| commit | bed2d2bb442ff61e925081a9379cf545d7bb2b65 (patch) | |
| tree | 4a89a9f6394ccb237abec6358bcd14bde3899429 /channels | |
| parent | c65649b776a247365fa278b70b2910f2ddbb4e3d (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.1@232231 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -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 bbd238aa6..30fdf32e5 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -10712,6 +10712,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... @@ -10720,7 +10721,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)); |