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

Merged revisions 108295 via svnmerge from

Browse Source 
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@108348 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2008-03-12 22:50:14 +00:00
parent 64a69c1348
commit 967d9d2c40
7 changed files with 36 additions and 36 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 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;