diff options
| author | Terry Wilson <twilson@digium.com> | 2011-04-26 23:10:58 +0000 |
|---|---|---|
| committer | Terry Wilson <twilson@digium.com> | 2011-04-26 23:10:58 +0000 |
| commit | 181661c617705abfec3018c5ad0b2d870a040bde (patch) | |
| tree | 450e89576f8b1f78984556cd7f1a19c0773ff9c7 | |
| parent | bd354a0378e4b3eb3efa78ab239cc6b031885d50 (diff) | |
Merged revisions 315673 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r315673 | twilson | 2011-04-26 15:56:19 -0700 (Tue, 26 Apr 2011) | 25 lines
Merged revisions 315672 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
................
r315672 | twilson | 2011-04-26 15:52:25 -0700 (Tue, 26 Apr 2011) | 18 lines
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/trunk@315675 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | channels/chan_sip.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 23a1949db..ba96ffec5 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -13561,25 +13561,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; } |