kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-02 20:08:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 105785 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

........
r105785 | russell | 2008-03-04 16:23:21 -0600 (Tue, 04 Mar 2008) | 2 lines

More public API name changes to use an appropriate ast_ prefix

........


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

14
main/tcptls.c
View File

@@ -81,7 +81,7 @@ static int ssl_close(void *cookie)
}
#endif /* DO_SSL */
HOOK_T 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)
{
#ifdef DO_SSL
if (ser->ssl)
@@ -90,7 +90,7 @@ HOOK_T server_read(struct ast_tcptls_server_instance *ser, void *buf, size_t cou
return read(ser->fd, buf, count);
}
HOOK_T 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)
{
#ifdef DO_SSL
if (ser->ssl)
@@ -99,7 +99,7 @@ HOOK_T server_write(struct ast_tcptls_server_instance *ser, void *buf, size_t co
return write(ser->fd, buf, count);
}
void *server_root(void *data)
void *ast_tcptls_server_root(void *data)
{
struct server_args *desc = data;
int fd;
@@ -196,7 +196,7 @@ static int __ssl_setup(struct ast_tls_config *cfg, int client)
#endif
}
int ssl_setup(struct ast_tls_config *cfg)
int ast_ssl_setup(struct ast_tls_config *cfg)
{
return __ssl_setup(cfg, 0);
}
@@ -204,7 +204,7 @@ int ssl_setup(struct ast_tls_config *cfg)
/*! \brief A generic client routine for a TCP client
* and starts a thread for handling accept()
*/
struct ast_tcptls_server_instance *client_start(struct server_args *desc)
struct ast_tcptls_server_instance *ast_tcptls_client_start(struct server_args *desc)
{
int flags;
struct ast_tcptls_server_instance *ser = NULL;
@@ -271,7 +271,7 @@ error:
* which does the socket/bind/listen and starts a thread for handling
* accept().
*/
void server_start(struct server_args *desc)
void ast_tcptls_server_start(struct server_args *desc)
{
int flags;
int x = 1;
@@ -334,7 +334,7 @@ error:
}
/*! \brief Shutdown a running server if there is one */
void server_stop(struct server_args *desc)
void ast_tcptls_server_stop(struct server_args *desc)
{
if (desc->master != AST_PTHREADT_NULL) {
pthread_cancel(desc->master);