diff options
| author | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-10 19:07:24 +0000 |
|---|---|---|
| committer | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-10 19:07:24 +0000 |
| commit | 21406cd4486afc055efe256cb544cf04011af323 (patch) | |
| tree | 7557ece6bab765a612c2f43ae92dd9652c567b64 | |
| parent | 3282d131902fdd7f56c89f88fd8a46abda7cfba0 (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
| -rw-r--r-- | channels/chan_sip.c | 5 | ||||
| -rw-r--r-- | utils/Makefile | 2 |
2 files changed, 1 insertions, 6 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) diff --git a/utils/Makefile b/utils/Makefile index 03c4bba60..94e812e88 100644 --- 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 |