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).

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 24cd4706a164f6563df90edcec8c4cf5295af246..eaca16a9baa15efa107e78db80996e7ee0b161e0 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -1832,11 +1832,6 @@ static int __sip_xmit(struct sip_pvt *p, char *data, int len)
                        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)

diff --git a/utils/Makefile b/utils/Makefile
index 03c4bba609a08a1df78614752e7c3ef903850793..94e812e886937b81a59959633d851092285d1749 100644 (file)
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -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