[asterisk-commits] file: branch 1.6.0 r196722 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: file
Date: Tue May 26 08:44:47 2009
New Revision: 196722

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=196722
Log:
Merged revisions 196721 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r196721 | file | 2009-05-26 10:43:13 -0300 (Tue, 26 May 2009) | 7 lines
  
  Fix a bug where the sip unregister CLI command did not completely unregister the peer.
  
  (closes issue #15118)
  Reported by: alecdavis
  Patches:
        chan_sip_unregister.diff2.txt uploaded by alecdavis (license 585)
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_sip.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_sip.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=196722&r1=196721&r2=196722
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Tue May 26 08:44:47 2009
@@ -13457,6 +13457,7 @@
 	
 	if ((peer = find_peer(a->argv[2], NULL, load_realtime, 0))) {
 		if (peer->expire > 0) {
+			AST_SCHED_DEL(sched, peer->expire);
 			expire_register(peer);
 			ast_cli(a->fd, "Unregistered peer \'%s\'\n\n", a->argv[2]);
 		} else {