[asterisk-commits] kmoore: branch 10 r331518 - in /branches/10: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: kmoore
Date: Wed Aug 10 17:23:49 2011
New Revision: 331518

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=331518
Log:
Merged revisions 331517 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r331517 | kmoore | 2011-08-10 17:23:08 -0500 (Wed, 10 Aug 2011) | 10 lines
  
  SIP Notify via AMI or CLI leaks SIP PVTs
  
  Any SIP notify sent via AMI or CLI leaks a SIP PVT with ref count +2.  Removing
  the additional ref just before the invite and adding an unref following it
  corrects the issue as seen via REF_DEBUG.  The unref existed in a distant
  revision and it appears as though the wrong ref operation was removed.
  
  (closes issue ASTERISK-18091)
  Review: https://reviewboard.asterisk.org/r/1332/
........

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

Propchange: branches/10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/10/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/channels/chan_sip.c?view=diff&rev=331518&r1=331517&r2=331518
==============================================================================
--- branches/10/channels/chan_sip.c (original)
+++ branches/10/channels/chan_sip.c Wed Aug 10 17:23:49 2011
@@ -12727,9 +12727,9 @@
 		}
 	}
 
-	dialog_ref(p, "bump the count of p, which transmit_sip_request will decrement.");
 	sip_scheddestroy(p, SIP_TRANS_TIMEOUT);
 	transmit_invite(p, SIP_NOTIFY, 0, 2, NULL);
+	dialog_unref(p, "bump down the count of p since we're done with it.");
 
 	astman_send_ack(s, m, "Notify Sent");
 	ast_variables_destroy(vars);
@@ -18949,9 +18949,9 @@
 
 		/* Recalculate our side, and recalculate Call ID */
 		ast_cli(a->fd, "Sending NOTIFY of type '%s' to '%s'\n", a->argv[2], a->argv[i]);
-		dialog_ref(p, "bump the count of p, which transmit_sip_request will decrement.");
 		sip_scheddestroy(p, SIP_TRANS_TIMEOUT);
 		transmit_invite(p, SIP_NOTIFY, 0, 2, NULL);
+		dialog_unref(p, "bump down the count of p since we're done with it.");
 	}
 
 	return CLI_SUCCESS;