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

Fix tcptls build when openssl isn't installed

Browse Source 
(closes issue #11813)
Reported by: tzafrir
Patches:
      asterisk-tcptls.diff.txt uploaded by jamesgolovich (license 176)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@99922 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2008-01-23 17:35:54 +00:00
parent 0b2239deae
commit 6100ec9e7d
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
main/tcptls.c
View File

@@ -83,22 +83,20 @@ static int ssl_close(void *cookie)
HOOK_T server_read(struct server_instance *ser, void *buf, size_t count)
{
if (!ser->ssl)
return read(ser->fd, buf, count);
#ifdef DO_SSL
else
if (ser->ssl)
return ssl_read(ser->ssl, buf, count);
#endif
return read(ser->fd, buf, count);
}
HOOK_T server_write(struct server_instance *ser, void *buf, size_t count)
{
if (!ser->ssl)
return write(ser->fd, buf, count);
#ifdef DO_SSL
else
if (ser->ssl)
return ssl_write(ser->ssl, buf, count);
#endif
return write(ser->fd, buf, count);
}
void *server_root(void *data)
@@ -356,9 +354,11 @@ void server_stop(struct server_args *desc)
void *ast_make_file_from_fd(void *data)
{
struct server_instance *ser = data;
#ifdef DO_SSL
int (*ssl_setup)(SSL *) = (ser->client) ? SSL_connect : SSL_accept;
int ret;
char err[256];
#endif
/*
* open a FILE * as appropriate.