[asterisk-commits] russell: branch 1.6.0 r106305 - in /branches/1.6.0: ./ channels/ include/aste...

[SVN commits to the Asterisk project]

Author: russell
Date: Wed Mar  5 18:13:54 2008
New Revision: 106305

URL: http://svn.digium.com/view/asterisk?view=rev&rev=106305
Log:
Merged revisions 105804 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r105804 | russell | 2008-03-04 16:28:03 -0600 (Tue, 04 Mar 2008) | 2 lines

add a destroy API call for a server instance

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_sip.c
    branches/1.6.0/include/asterisk/tcptls.h
    branches/1.6.0/main/http.c
    branches/1.6.0/main/manager.c
    branches/1.6.0/main/tcptls.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
--- trunk-merged (original)
+++ trunk-merged Wed Mar  5 18:13:54 2008
@@ -1,1 +1,1 @@
-/trunk:1-105595,105675,105677,105733-105734,105773,105785,106036,106040,106139
+/trunk:1-105595,105675,105677,105733-105734,105773,105785,105804,106036,106040,106139

Modified: branches/1.6.0/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=106305&r1=106304&r2=106305
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Wed Mar  5 18:13:54 2008
@@ -2238,7 +2238,7 @@
 	ast_free(me);
 cleanup2:
 	fclose(ser->f);
-	ast_free(ser);
+	ser = ast_tcptls_server_instance_destroy(ser);
 
 	if (req.socket.lock) {
 		ast_mutex_destroy(req.socket.lock);

Modified: branches/1.6.0/include/asterisk/tcptls.h
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/include/asterisk/tcptls.h?view=diff&rev=106305&r1=106304&r2=106305
==============================================================================
--- branches/1.6.0/include/asterisk/tcptls.h (original)
+++ branches/1.6.0/include/asterisk/tcptls.h Wed Mar  5 18:13:54 2008
@@ -166,4 +166,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: branches/1.6.0/main/http.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/http.c?view=diff&rev=106305&r1=106304&r2=106305
==============================================================================
--- branches/1.6.0/main/http.c (original)
+++ branches/1.6.0/main/http.c Wed Mar  5 18:13:54 2008
@@ -827,7 +827,7 @@
 
 done:
 	fclose(ser->f);
-	ast_free(ser);
+	ser = ast_tcptls_server_instance_destroy(ser);
 	return NULL;
 }
 

Modified: branches/1.6.0/main/manager.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/manager.c?view=diff&rev=106305&r1=106304&r2=106305
==============================================================================
--- branches/1.6.0/main/manager.c (original)
+++ branches/1.6.0/main/manager.c Wed Mar  5 18:13:54 2008
@@ -2882,7 +2882,7 @@
 	destroy_session(s);
 
 done:
-	ast_free(ser);
+	ser = ast_tcptls_server_instance_destroy(ser);
 	return NULL;
 }
 

Modified: branches/1.6.0/main/tcptls.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/tcptls.c?view=diff&rev=106305&r1=106304&r2=106305
==============================================================================
--- branches/1.6.0/main/tcptls.c (original)
+++ branches/1.6.0/main/tcptls.c Wed Mar  5 18:13:54 2008
@@ -446,3 +446,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;
+}