dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

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: http://svn.digium.com/svn/asterisk/trunk@315675 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
twilson 2011-04-26 23:10:58 +00:00
parent 76abbb4a25
commit 4fb56a7810
1 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
channels/chan_sip.c
View File

@ -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;
}