kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-06 18:03:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 105804 via svnmerge from

Browse Source 
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

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@106305 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2008-03-06 00:13:54 +00:00
parent 36f5261290
commit 908eddfe58
5 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
channels/chan_sip.c
View File

@@ -2238,7 +2238,7 @@ cleanup:
ast_free(me); ast_free(me);
cleanup2: cleanup2:
fclose(ser->f); fclose(ser->f);
ast_free(ser); ser = ast_tcptls_server_instance_destroy(ser);
if (req.socket.lock) { if (req.socket.lock) {
ast_mutex_destroy(req.socket.lock); ast_mutex_destroy(req.socket.lock);

7
include/asterisk/tcptls.h
View File

@@ -166,4 +166,11 @@ void *ast_make_file_from_fd(void *data);
HOOK_T ast_tcptls_server_read(struct ast_tcptls_server_instance *ser, void *buf, size_t count); 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); 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 */ #endif /* _ASTERISK_SERVER_H */

2
main/http.c
View File

@@ -827,7 +827,7 @@ static void *httpd_helper_thread(void *data)
done: done:
fclose(ser->f); fclose(ser->f);
ast_free(ser); ser = ast_tcptls_server_instance_destroy(ser);
return NULL; return NULL;
} }

2
main/manager.c
View File

@@ -2882,7 +2882,7 @@ static void *session_do(void *data)
destroy_session(s); destroy_session(s);
done: done:
ast_free(ser); ser = ast_tcptls_server_instance_destroy(ser);
return NULL; return NULL;
} }

6
main/tcptls.c
View File

@@ -446,3 +446,9 @@ void *ast_make_file_from_fd(void *data)
else else
return ser; return ser;
} }
struct ast_tcptls_server_instance *ast_tcptls_server_instance_destroy(struct ast_tcptls_server_instance *i)
{
ast_free(i);
return NULL;
}