[asterisk-commits] file: branch 1.6.1 r232231 - in /branches/1.6.1: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: file
Date: Wed Dec  2 08:55:09 2009
New Revision: 232231

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=232231
Log:
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)
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_sip.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/channels/chan_sip.c?view=diff&rev=232231&r1=232230&r2=232231
==============================================================================
--- branches/1.6.1/channels/chan_sip.c (original)
+++ branches/1.6.1/channels/chan_sip.c Wed Dec  2 08:55:09 2009
@@ -10712,6 +10712,7 @@
 		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 @@
 		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));