[svn-commits] russell: branch group/issue_11972 r105817 - in /team/group/issue_11972: ./ ch...

[SVN commits to the Digium repositories]

Author: russell
Date: Tue Mar  4 16:30:56 2008
New Revision: 105817

URL: http://svn.digium.com/view/asterisk?view=rev&rev=105817
Log:
sync with trunk

Modified:
    team/group/issue_11972/   (props changed)
    team/group/issue_11972/channels/chan_sip.c
    team/group/issue_11972/include/asterisk/tcptls.h
    team/group/issue_11972/main/http.c
    team/group/issue_11972/main/manager.c
    team/group/issue_11972/main/tcptls.c

Propchange: team/group/issue_11972/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/group/issue_11972/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Mar  4 16:30:56 2008
@@ -1,1 +1,1 @@
-/trunk:1-105788
+/trunk:1-105813

Modified: team/group/issue_11972/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/group/issue_11972/channels/chan_sip.c?view=diff&rev=105817&r1=105816&r2=105817
==============================================================================
--- team/group/issue_11972/channels/chan_sip.c (original)
+++ team/group/issue_11972/channels/chan_sip.c Tue Mar  4 16:30:56 2008
@@ -2230,8 +2230,7 @@
 	fclose(ser->f);
 
 	/* XXX this cleanup needs to happen somewhere else. */
-	ast_mutex_destroy(&ser->lock);
-	ast_free(ser);
+	ser = ast_tcptls_server_instance_destroy(ser);
 
 	return NULL;
 }

Modified: team/group/issue_11972/include/asterisk/tcptls.h
URL: http://svn.digium.com/view/asterisk/team/group/issue_11972/include/asterisk/tcptls.h?view=diff&rev=105817&r1=105816&r2=105817
==============================================================================
--- team/group/issue_11972/include/asterisk/tcptls.h (original)
+++ team/group/issue_11972/include/asterisk/tcptls.h Tue Mar  4 16:30:56 2008
@@ -167,4 +167,11 @@
 HOOK_T ast_tcptls_server_read(struct ast_tcptls_server_instance *ser, void *buf, size_t count);
 HOOK_T ast_tcptls_server_write(struct ast_tcptls_server_instance *ser, void *buf, size_t count);
 
+/*!
+ * \brief Destroy a server instance
+ *
+ * \return NULL for convenience
+ */
+struct ast_tcptls_server_instance *ast_tcptls_server_instance_destroy(struct ast_tcptls_server_instance *i);
+
 #endif /* _ASTERISK_SERVER_H */

Modified: team/group/issue_11972/main/http.c
URL: http://svn.digium.com/view/asterisk/team/group/issue_11972/main/http.c?view=diff&rev=105817&r1=105816&r2=105817
==============================================================================
--- team/group/issue_11972/main/http.c (original)
+++ team/group/issue_11972/main/http.c Tue Mar  4 16:30:56 2008
@@ -827,7 +827,7 @@
 
 done:
 	fclose(ser->f);
-	ast_free(ser);
+	ser = ast_tcptls_server_instance_destroy(ser);
 	return NULL;
 }
 

Modified: team/group/issue_11972/main/manager.c
URL: http://svn.digium.com/view/asterisk/team/group/issue_11972/main/manager.c?view=diff&rev=105817&r1=105816&r2=105817
==============================================================================
--- team/group/issue_11972/main/manager.c (original)
+++ team/group/issue_11972/main/manager.c Tue Mar  4 16:30:56 2008
@@ -2882,7 +2882,7 @@
 	destroy_session(s);
 
 done:
-	ast_free(ser);
+	ser = ast_tcptls_server_instance_destroy(ser);
 	return NULL;
 }
 

Modified: team/group/issue_11972/main/tcptls.c
URL: http://svn.digium.com/view/asterisk/team/group/issue_11972/main/tcptls.c?view=diff&rev=105817&r1=105816&r2=105817
==============================================================================
--- team/group/issue_11972/main/tcptls.c (original)
+++ team/group/issue_11972/main/tcptls.c Tue Mar  4 16:30:56 2008
@@ -451,3 +451,9 @@
 	else
 		return ser;
 }
+
+struct ast_tcptls_server_instance *ast_tcptls_server_instance_destroy(struct ast_tcptls_server_instance *i)
+{
+	ast_free(i);
+	return NULL;
+}