From dcc96e695905a2069f530395f924f901580b8b0a Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Thu, 15 Apr 2010 20:34:44 +0000 Subject: [PATCH] Merged revisions 257493 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r257493 | tilghman | 2010-04-15 15:30:15 -0500 (Thu, 15 Apr 2010) | 20 lines Merged revisions 257467 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r257467 | tilghman | 2010-04-15 15:24:50 -0500 (Thu, 15 Apr 2010) | 13 lines Don't recreate peer, when responding to a repeated deregistration attempt. When a reply to a deregistration is lost in transmit, the client retries the deregistration. Previously, this would cause a realtime/autocreate peer to be loaded back into memory, after it had already been correctly purged. Instead, we just want to resend the reply without loading the peer. (closes issue #16908) Reported by: kkm Patches: 20100412__issue16908.diff.txt uploaded by tilghman (license 14) Tested by: kkm ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@257510 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index b05e783834..84110f1dd6 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -12984,6 +12984,21 @@ static enum check_auth_result register_verify(struct sip_pvt *p, struct sockaddr ast_string_field_set(p, exten, name); build_contact(p); + if (req->ignore) { + /* Expires is a special case, where we only want to load the peer if this isn't a deregistration attempt */ + const char *expires = get_header(req, "Expires"); + int expire = atoi(expires); + + if (ast_strlen_zero(expires)) { /* No expires header; look in Contact */ + if ((expires = strcasestr(get_header(req, "Contact"), ";expires="))) { + expire = atoi(expires + 9); + } + } + if (!ast_strlen_zero(expires) && expire == 0) { + transmit_response_with_date(p, "200 OK", req); + return 0; + } + } peer = find_peer(name, NULL, TRUE, FINDPEERS, FALSE, 0); if (!(peer && ast_apply_ha(peer->ha, sin))) { /* Peer fails ACL check */