[asterisk-commits] oej: trunk r47313 - in /trunk: ./ channels/chan_sip.c

[asterisk-commits at lists.digium.com]

Author: oej
Date: Wed Nov  8 02:01:44 2006
New Revision: 47313

URL: http://svn.digium.com/view/asterisk?rev=47313&view=rev
Log:
Destroy dialog properly at unload (rizzo)

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: trunk/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Wed Nov  8 02:01:44 2006
@@ -1,1 +1,1 @@
-menuselect	https://origsvn.digium.com/svn/menuselect/trunk
+menuselect	https://origsvn.digium.com/svn/menuselect/branches/1.0

Propchange: trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Nov  8 02:01:44 2006
@@ -22,4 +22,3 @@
 menuselect-tree
 autom4te.cache
 makeopts.embed_rules
-aclocal.m4

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?rev=47313&r1=47312&r2=47313&view=diff
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Wed Nov  8 02:01:44 2006
@@ -17216,13 +17216,7 @@
 	while (p) {
 		pl = p;
 		p = p->next;
-		/* Free associated memory */
-		ast_mutex_destroy(&pl->pvt_lock);
-		if (pl->chanvars) {
-			ast_variables_destroy(pl->chanvars);
-			pl->chanvars = NULL;
-		}
-		free(pl);
+		__sip_destroy(pl, TRUE, TRUE);
 	}
 	dialoglist = NULL;
 	ast_mutex_unlock(&dialoglock);