[svn-commits] oej: branch 1.4 r217668 - in /branches/1.4: channels/chan_sip.c utils/Makefile

[SVN commits to the Digium repositories]

Author: oej
Date: Thu Sep 10 14:07:24 2009
New Revision: 217668

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=217668
Log:
Remove harmful code that causes endless loops. 
Remove code that causes loops in registrations. 

We have agreed that the patch that this code was part of was bad. I am ripping out the code that causes 
the issue. putnopvut needs to check the rest of the patch, if it needs to be changed as well.

This solves the issue reported in #15540, but needs more work before we close it (as described above).


Modified:
    branches/1.4/channels/chan_sip.c
    branches/1.4/utils/Makefile

Modified: branches/1.4/channels/chan_sip.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.4/channels/chan_sip.c?view=diff&rev=217668&r1=217667&r2=217668
==============================================================================
--- branches/1.4/channels/chan_sip.c (original)
+++ branches/1.4/channels/chan_sip.c Thu Sep 10 14:07:24 2009
@@ -1832,11 +1832,6 @@
 			res = XMIT_ERROR;	/* Don't bother with trying to transmit again */
 		}
 
-		if (p->registry && p->registry->regstate < REG_STATE_REGISTERED) {
-			AST_SCHED_DEL(sched, p->registry->timeout);
-			p->registry->needdns = TRUE;
-			p->registry->timeout = ast_sched_add(sched, 1, sip_reg_timeout, p->registry);
-		}
 	}
 
 	if (res != len)

Modified: branches/1.4/utils/Makefile
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.4/utils/Makefile?view=diff&rev=217668&r1=217667&r2=217668
==============================================================================
--- branches/1.4/utils/Makefile (original)
+++ branches/1.4/utils/Makefile Thu Sep 10 14:07:24 2009
@@ -26,7 +26,7 @@
 #     changes are made to ast_expr2.y or ast_expr2.fl (or the corresponding .c files),
 #     as a regression test. Others (mere mortals?) need not bother, but they are
 #     more than welcome to play! The regression test itself is in expr2.testinput.
-ALL_UTILS:=astman smsq stereorize streamplayer aelparse muted
+ALL_UTILS:=astman smsq stereorize streamplayer aelparse 
 UTILS:=$(ALL_UTILS)
 
 include $(ASTTOPDIR)/Makefile.rules