From 6fafc9d4f073cfb910ca31fbd4acb04fbb631f12 Mon Sep 17 00:00:00 2001 From: Olle Johansson Date: Fri, 27 Jan 2006 08:07:43 +0000 Subject: [PATCH] Merged revisions 8785 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r8785 | oej | 2006-01-27 09:02:16 +0100 (Fri, 27 Jan 2006) | 2 lines Issue 6362 - Register without Contact: and Expires: fails (reporter: op) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@8786 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 667f0cfae2..2f03ade0ea 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -5936,13 +5936,11 @@ static enum parse_register_result parse_register_contact(struct sip_pvt *pvt, st it */ if (ast_strlen_zero(c) && ast_strlen_zero(expires)) { + /* If we have an active registration, tell them when the registration is going to expire */ if ((p->expire > -1) && !ast_strlen_zero(p->fullcontact)) { - /* tell them when the registration is going to expire */ pvt->expiry = ast_sched_when(sched, p->expire); - return PARSE_REGISTER_QUERY; - } else { - return PARSE_REGISTER_FAILED; - } + } + return PARSE_REGISTER_QUERY; } else if (!strcasecmp(c, "*") || !expiry) { /* Unregister this peer */ /* This means remove all registrations and return OK */ memset(&p->addr, 0, sizeof(p->addr));