diff options
| author | unknown <tonu@volk.internalnet> | 2001-11-02 15:34:17 +0200 |
|---|---|---|
| committer | unknown <tonu@volk.internalnet> | 2001-11-02 15:34:17 +0200 |
| commit | e61ecd1abb916335e0fde70547df57230aa8df28 (patch) | |
| tree | 39340e503fc2ad3672d518d59971044e3adc44ed /vio | |
| parent | 131a48807f3b8ffd11b881f3b0a977ae8fd1bb5b (diff) | |
| download | mariadb-git-e61ecd1abb916335e0fde70547df57230aa8df28.tar.gz | |
Removed unused code in VIO
vio/viossl.c:
Removed unused code in VIO
made sslaccept() and sslconnect() more similar
Diffstat (limited to 'vio')
| -rw-r--r-- | vio/vio.c | 2 | ||||
| -rw-r--r-- | vio/viossl.c | 24 |
2 files changed, 1 insertions, 25 deletions
diff --git a/vio/vio.c b/vio/vio.c index 759f9416ddf..6fe0be20906 100644 --- a/vio/vio.c +++ b/vio/vio.c @@ -60,7 +60,6 @@ void vio_reset(Vio* vio, enum enum_vio_type type, vio->vioclose =vio_ssl_close; 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; } @@ -77,7 +76,6 @@ void vio_reset(Vio* vio, enum enum_vio_type type, vio->vioclose =vio_close; 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; } diff --git a/vio/viossl.c b/vio/viossl.c index c87836e56b6..e6c1cd31e41 100644 --- a/vio/viossl.c +++ b/vio/viossl.c @@ -255,32 +255,11 @@ void vio_ssl_in_addr(Vio *vio, struct in_addr *in) } -/* Return 0 if there is data to be read */ - -my_bool vio_ssl_poll_read(Vio *vio,uint timeout) -{ -#ifndef HAVE_POLL - return 0; -#else - struct pollfd fds; - int res; - DBUG_ENTER("vio_ssl_poll"); - fds.fd=vio->sd; - fds.events=POLLIN; - fds.revents=0; - if ((res=poll(&fds,1,(int) timeout*1000)) <= 0) - { - DBUG_RETURN(res < 0 ? 0 : 1); /* Don't return 1 on errors */ - } - DBUG_RETURN(fds.revents & POLLIN ? 0 : 1); -#endif -} - void sslaccept(struct st_VioSSLAcceptorFd* ptr, Vio* vio, long timeout) { - X509* client_cert; char *str; char buf[1024]; + X509* client_cert; DBUG_ENTER("sslaccept"); DBUG_PRINT("enter", ("sd=%d ptr=%p", vio->sd,ptr)); vio_reset(vio,VIO_TYPE_SSL,vio->sd,0,FALSE); @@ -339,7 +318,6 @@ void sslconnect(struct st_VioSSLConnectorFd* ptr, Vio* vio, long timeout) DBUG_ENTER("sslconnect"); DBUG_PRINT("enter", ("sd=%d ptr=%p ctx: %p", vio->sd,ptr,ptr->ssl_context_)); vio_reset(vio,VIO_TYPE_SSL,vio->sd,0,FALSE); - vio->ssl_=0; vio->open_=FALSE; if (!(vio->ssl_ = SSL_new(ptr->ssl_context_))) |