diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-06 00:11:09 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-06 00:11:09 +0000 |
| commit | c30ba146debc6b92b6875a7dc1ff951f4a6c6b70 (patch) | |
| tree | 11f7ecd8b9f5e34026e49161c85f2861401f79a5 /main/tcptls.c | |
| parent | cc4b6c80303144f1793c53728265669e35e9868a (diff) | |
Merged revisions 105773 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r105773 | russell | 2008-03-04 16:15:18 -0600 (Tue, 04 Mar 2008) | 2 lines
Rename public object server_instance to ast_tcptls_server_instance
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@106303 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/tcptls.c')
| -rw-r--r-- | main/tcptls.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/main/tcptls.c b/main/tcptls.c index e11155a3e..acb012d60 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 server_instance *ser, void *buf, size_t count) +HOOK_T 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 server_instance *ser, void *buf, size_t count) return read(ser->fd, buf, count); } -HOOK_T server_write(struct server_instance *ser, void *buf, size_t count) +HOOK_T server_write(struct ast_tcptls_server_instance *ser, void *buf, size_t count) { #ifdef DO_SSL if (ser->ssl) @@ -105,7 +105,7 @@ void *server_root(void *data) int fd; struct sockaddr_in sin; socklen_t sinlen; - struct server_instance *ser; + struct ast_tcptls_server_instance *ser; pthread_t launched; for (;;) { @@ -204,10 +204,10 @@ 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 server_instance *client_start(struct server_args *desc) +struct ast_tcptls_server_instance *client_start(struct server_args *desc) { int flags; - struct server_instance *ser = NULL; + struct ast_tcptls_server_instance *ser = NULL; /* Do nothing if nothing has changed */ if(!memcmp(&desc->oldsin, &desc->sin, sizeof(desc->oldsin))) { @@ -353,7 +353,7 @@ void server_stop(struct server_args *desc) */ void *ast_make_file_from_fd(void *data) { - struct server_instance *ser = data; + struct ast_tcptls_server_instance *ser = data; #ifdef DO_SSL int (*ssl_setup)(SSL *) = (ser->client) ? SSL_connect : SSL_accept; int ret; |