diff options
| author | unknown <tonu@hundin.mysql.fi> | 2001-06-05 02:28:33 +0300 |
|---|---|---|
| committer | unknown <tonu@hundin.mysql.fi> | 2001-06-05 02:28:33 +0300 |
| commit | 09db6955439a847a8e90cab4ed8f7a73e0d5091d (patch) | |
| tree | 74d42203860847c841b708510ebd8b1613a5695c /vio/vio.c | |
| parent | 1da42e7b8a4219827f4f435d837f41b1b1919d51 (diff) | |
| download | mariadb-git-09db6955439a847a8e90cab4ed8f7a73e0d5091d.tar.gz | |
vio.c Vio code bugfix
violite.h Code cleanup
include/violite.h:
Code cleanup
vio/vio.c:
Vio code bugfix
Diffstat (limited to 'vio/vio.c')
| -rw-r--r-- | vio/vio.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/vio/vio.c b/vio/vio.c index 689a01f4475..e55949915c0 100644 --- a/vio/vio.c +++ b/vio/vio.c @@ -66,13 +66,17 @@ void vio_reset(Vio* vio, enum enum_vio_type type, my_socket sd, HANDLE hPipe, my_bool localhost) { + DBUG_ENTER("vio_reset"); + DBUG_PRINT("enter", ("type=%d sd=%d localhost=%d", type, sd, localhost)); bzero((char*) vio, sizeof(Vio)); vio->type = type; vio->sd = sd; vio->hPipe = hPipe; vio->localhost= localhost; #ifdef HAVE_VIO -if(type == VIO_TYPE_SSL){ +if(0) { +#ifdef HAVE_OPENSSL +} else if(type == VIO_TYPE_SSL){ vio->viodelete =vio_ssl_delete; vio->vioerrno =vio_ssl_errno; vio->read =vio_ssl_read; @@ -84,6 +88,9 @@ if(type == VIO_TYPE_SSL){ vio->peer_addr =vio_ssl_peer_addr; vio->in_addr =vio_ssl_in_addr; vio->poll_read =vio_ssl_poll_read; + vio->vioblocking=vio_blocking; + vio->is_blocking=vio_is_blocking; +#endif /* HAVE_OPENSSL */ } else { /* default is VIO_TYPE_TCPIP */ vio->viodelete =vio_delete; vio->vioerrno =vio_errno; @@ -96,9 +103,12 @@ if(type == VIO_TYPE_SSL){ vio->peer_addr =vio_peer_addr; vio->in_addr =vio_in_addr; vio->poll_read =vio_poll_read; + vio->vioblocking=vio_blocking; + vio->is_blocking=vio_is_blocking; } #endif /* HAVE_VIO */ + DBUG_VOID_RETURN; } /* Open the socket or TCP/IP connection and read the fnctl() status */ |