dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Merged revisions 319204 via svnmerge from 

https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r319204 | twilson | 2011-05-16 13:17:43 -0500 (Mon, 16 May 2011) | 11 lines
  
  Merged revisions 319202 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r319202 | twilson | 2011-05-16 11:00:21 -0700 (Mon, 16 May 2011) | 4 lines
    
    Unlink a peer from peers_by_ip when expiring a registration
    
    Review: https://reviewboard.asterisk.org/r/1218/
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@319212 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
twilson 2011-05-16 18:21:17 +00:00
parent 2e2393c80c
commit cc5a982e47
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
channels/chan_sip.c
View File

@ -13398,6 +13398,11 @@ static int expire_register(const void *data)
if (peer->selfdestruct ||
ast_test_flag(&peer->flags[1], SIP_PAGE2_RTAUTOCLEAR)) {
unlink_peer_from_tables(peer);
} else if (!ast_sockaddr_isnull(&peer->addr)) {
/* If we aren't self-destructing a temp_peer, we still need to unlink the peer
* from the peers_by_ip table, otherwise we end up with multiple copies hanging
* around each time a registration expires and the peer re-registers. */
ao2_t_unlink(peers_by_ip, peer, "ao2_unlink of peer from peers_by_ip table");
}
/* Only clear the addr after we check for destruction. The addr must remain