diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-12 22:50:14 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-12 22:50:14 +0000 |
| commit | f3a81a8122a05e058bbd0581b5dc7bb44178974a (patch) | |
| tree | d4e28d906289bab018d72dedf3be2412ff650639 /main/tcptls.c | |
| parent | fb165a268e4a5b779280868589beab30aaacb0f5 (diff) | |
Merged revisions 108295 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r108295 | russell | 2008-03-12 17:13:18 -0500 (Wed, 12 Mar 2008) | 3 lines
Rename ast_tcptls_server_instance to session_instance, since this pertains to
server and client usage.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@108348 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 658ab25ee..67782a08d 100644 --- a/main/tcptls.c +++ b/main/tcptls.c @@ -81,7 +81,7 @@ static int ssl_close(void *cookie) } #endif /* DO_SSL */ -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_session_instance *ser, void *buf, size_t count) { #ifdef DO_SSL if (ser->ssl) @@ -90,7 +90,7 @@ HOOK_T ast_tcptls_server_read(struct ast_tcptls_server_instance *ser, void *buf, return read(ser->fd, buf, 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_session_instance *ser, void *buf, size_t count) { #ifdef DO_SSL if (ser->ssl) @@ -105,7 +105,7 @@ void *ast_tcptls_server_root(void *data) int fd; struct sockaddr_in sin; socklen_t sinlen; - struct ast_tcptls_server_instance *ser; + struct ast_tcptls_session_instance *ser; pthread_t launched; for (;;) { @@ -204,10 +204,10 @@ int ast_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 *ast_tcptls_client_start(struct server_args *desc) +struct ast_tcptls_session_instance *ast_tcptls_client_start(struct server_args *desc) { int flags; - struct ast_tcptls_server_instance *ser = NULL; + struct ast_tcptls_session_instance *ser = NULL; /* Do nothing if nothing has changed */ if(!memcmp(&desc->oldsin, &desc->sin, sizeof(desc->oldsin))) { @@ -353,7 +353,7 @@ void ast_tcptls_server_stop(struct server_args *desc) */ void *ast_make_file_from_fd(void *data) { - struct ast_tcptls_server_instance *ser = data; + struct ast_tcptls_session_instance *ser = data; #ifdef DO_SSL int (*ssl_setup)(SSL *) = (ser->client) ? SSL_connect : SSL_accept; int ret; @@ -447,7 +447,7 @@ void *ast_make_file_from_fd(void *data) return ser; } -struct ast_tcptls_server_instance *ast_tcptls_server_instance_destroy(struct ast_tcptls_server_instance *i) +struct ast_tcptls_session_instance *ast_tcptls_session_instance_destroy(struct ast_tcptls_session_instance *i) { ast_free(i); return NULL; |