diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-06 00:13:10 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-06 00:13:10 +0000 |
| commit | 35c7172e36a9451010836ed9cc7dd0db37609098 (patch) | |
| tree | 11a76742d1b1294ff1adc9cb73b4f00c13082a8a /main/tcptls.c | |
| parent | c30ba146debc6b92b6875a7dc1ff951f4a6c6b70 (diff) | |
Merged revisions 105785 via svnmerge from
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@106304 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/tcptls.c')
| -rw-r--r-- | main/tcptls.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/main/tcptls.c b/main/tcptls.c index acb012d60..d623420a5 100644 --- a/main/tcptls.c +++ b/main/tcptls.c @@ -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); |