From: Terry Wilson <twilson@digium.com>
Date: Tue, 26 Apr 2011 22:52:25 +0000 (+0000)
Subject: Merged revisions 315671 via svnmerge from
X-Git-Tag: 1.6.2.19-rc1~3^2~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d933f5b74abd8b4ac5de63e86c0ce7e1c5acf85;p=thirdparty%2Fasterisk.git

Merged revisions 315671 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r315671 | twilson | 2011-04-26 15:47:56 -0700 (Tue, 26 Apr 2011) | 11 lines

  Make sure unregistering a peer unlinks it from the peer container

  Instead of mostly copying the code from expire_register, just use the function
  that "does the right thing".

  (closes issue #16033)
  Reported by: kkm
  Patches:
        016033-tilgman-fixed-refcount.diff uploaded by kkm (license 888)
  Tested by: kkm, tilghman, twilson
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@315672 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 08f77ef46e..9db4e1c772 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -12797,25 +12797,10 @@ static enum parse_register_result parse_register_contact(struct sip_pvt *pvt, st
 		return PARSE_REGISTER_QUERY;
 	} else if (!strcasecmp(curi, "*") || !expire) {	/* Unregister this peer */
 		/* This means remove all registrations and return OK */
-		memset(&peer->addr, 0, sizeof(peer->addr));
-		set_socket_transport(&peer->socket, peer->default_outbound_transport);
-
 		AST_SCHED_DEL_UNREF(sched, peer->expire,
 				unref_peer(peer, "remove register expire ref"));
-
-		destroy_association(peer);
-
-		register_peer_exten(peer, FALSE);	/* Remove extension from regexten= setting in sip.conf */
-		ast_string_field_set(peer, fullcontact, "");
-		ast_string_field_set(peer, useragent, "");
-		peer->sipoptions = 0;
-		peer->lastms = 0;
-		peer->portinuri = 0;
-		pvt->expiry = 0;
-
 		ast_verb(3, "Unregistered SIP '%s'\n", peer->name);
-
-		manager_event(EVENT_FLAG_SYSTEM, "PeerStatus", "ChannelType: SIP\r\nPeer: SIP/%s\r\nPeerStatus: Unregistered\r\n", peer->name);
+		expire_register(ref_peer(peer,"add ref for explicit expire_register"));
 		return PARSE_REGISTER_UPDATE;
 	}