From 2cfee72f8ec17a23f05022638c9925e50803d61f Mon Sep 17 00:00:00 2001 From: Automerge script Date: Fri, 27 Jan 2006 09:01:17 +0000 Subject: [PATCH] automerge commit git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@8795 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 5d5206567f..8093803684 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -5905,13 +5905,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));