aboutsummaryrefslogtreecommitdiffstats
path: root/channels
diff options
context:
space:
mode:
authoroej <oej@f38db490-d61c-443f-a65b-d21fe96a405b>2009-09-10 19:07:24 +0000
committeroej <oej@f38db490-d61c-443f-a65b-d21fe96a405b>2009-09-10 19:07:24 +0000
commit21406cd4486afc055efe256cb544cf04011af323 (patch)
tree7557ece6bab765a612c2f43ae92dd9652c567b64 /channels
parent3282d131902fdd7f56c89f88fd8a46abda7cfba0 (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.4@217668 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_sip.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 24cd4706a..eaca16a9b 100644
--- 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)