mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
59806e1004
Added TCP/IP read/write timeout for windows Check on windows if second server is started with same TCP/IP port BitKeeper/deleted/.del-have_openssl_2.inc~8c9f1a45676b698f: Delete: mysql-test/include/have_openssl_2.inc BitKeeper/deleted/.del-have_openssl_2.require~53bbdfc136fb514: Delete: mysql-test/r/have_openssl_2.require BitKeeper/deleted/.del-openssl_2.test~f2dfa927f19d14f8: Delete: mysql-test/t/openssl_2.test BitKeeper/etc/ignore: added libmysql/vio_priv.h libmysql_r/vio_priv.h client/mysql.cc: vio ssl structure renames include/violite.h: Cleanup violite.h interface (move things to vio_priv.h) libmysql/Makefile.am: Use vio_priv.h libmysql/Makefile.shared: Use vio_priv.h libmysqld/lib_vio.c: Added timeout for windows mysys/my_getopt.c: Indentaion cleanup sql/item_cmpfunc.cc: Remove compiler warnings sql/item_func.cc: Remove compiler warnings sql/mini_client.cc: vio ssl structure renames sql/mysqld.cc: Check on windows if second server is started with same TCP/IP port sql/net_serv.cc: Add read/write timeouts for windows sql/sql_acl.cc: vio ssl structure renames sql/sql_show.cc: vio ssl structure renames vio/vio.c: Added timeouts for windows vio/viosocket.c: Added timeouts for windows vio/viossl.c: Added timeouts for windows Cleaned up structure element names vio/viosslfactories.c: Added timeouts for windows Cleaned up structure element names
133 lines
3.8 KiB
C
133 lines
3.8 KiB
C
/* Copyright (C) 2000 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
/*
|
|
Note that we can't have assertion on file descriptors; The reason for
|
|
this is that during mysql shutdown, another thread can close a file
|
|
we are working on. In this case we should just return read errors from
|
|
the file descriptior.
|
|
*/
|
|
|
|
#include "vio_priv.h"
|
|
|
|
/*
|
|
* Helper to fill most of the Vio* with defaults.
|
|
*/
|
|
|
|
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
|
|
#ifdef HAVE_OPENSSL
|
|
if (type == VIO_TYPE_SSL)
|
|
{
|
|
vio->viodelete =vio_ssl_delete;
|
|
vio->vioerrno =vio_ssl_errno;
|
|
vio->read =vio_ssl_read;
|
|
vio->write =vio_ssl_write;
|
|
vio->fastsend =vio_ssl_fastsend;
|
|
vio->viokeepalive =vio_ssl_keepalive;
|
|
vio->should_retry =vio_ssl_should_retry;
|
|
vio->vioclose =vio_ssl_close;
|
|
vio->peer_addr =vio_ssl_peer_addr;
|
|
vio->in_addr =vio_ssl_in_addr;
|
|
vio->vioblocking =vio_ssl_blocking;
|
|
vio->is_blocking =vio_is_blocking;
|
|
vio->timeout =vio_ssl_timeout;
|
|
}
|
|
else /* default is VIO_TYPE_TCPIP */
|
|
#endif /* HAVE_OPENSSL */
|
|
{
|
|
vio->viodelete =vio_delete;
|
|
vio->vioerrno =vio_errno;
|
|
vio->read =vio_read;
|
|
vio->write =vio_write;
|
|
vio->fastsend =vio_fastsend;
|
|
vio->viokeepalive =vio_keepalive;
|
|
vio->should_retry =vio_should_retry;
|
|
vio->vioclose =vio_close;
|
|
vio->peer_addr =vio_peer_addr;
|
|
vio->in_addr =vio_in_addr;
|
|
vio->vioblocking =vio_blocking;
|
|
vio->is_blocking =vio_is_blocking;
|
|
vio->timeout =vio_timeout;
|
|
}
|
|
#endif /* HAVE_VIO */
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
|
|
/* Open the socket or TCP/IP connection and read the fnctl() status */
|
|
|
|
Vio *vio_new(my_socket sd, enum enum_vio_type type, my_bool localhost)
|
|
{
|
|
Vio *vio;
|
|
DBUG_ENTER("vio_new");
|
|
DBUG_PRINT("enter", ("sd=%d", sd));
|
|
if ((vio = (Vio*) my_malloc(sizeof(*vio),MYF(MY_WME))))
|
|
{
|
|
vio_reset(vio, type, sd, 0, localhost);
|
|
sprintf(vio->desc,
|
|
(vio->type == VIO_TYPE_SOCKET ? "socket (%d)" : "TCP/IP (%d)"),
|
|
vio->sd);
|
|
#if !defined(___WIN__) && !defined(__EMX__) && !defined(OS2)
|
|
#if !defined(NO_FCNTL_NONBLOCK)
|
|
#if defined(__FreeBSD__)
|
|
fcntl(sd, F_SETFL, vio->fcntl_mode); /* Yahoo! FreeBSD patch */
|
|
#endif
|
|
vio->fcntl_mode = fcntl(sd, F_GETFL);
|
|
#elif defined(HAVE_SYS_IOCTL_H) /* hpux */
|
|
/* Non blocking sockets doesn't work good on HPUX 11.0 */
|
|
(void) ioctl(sd,FIOSNBIO,0);
|
|
vio->fcntl_mode &= ~O_NONBLOCK;
|
|
#endif
|
|
#else /* !defined(__WIN__) && !defined(__EMX__) */
|
|
{
|
|
/* set to blocking mode by default */
|
|
ulong arg=0, r;
|
|
r = ioctlsocket(sd,FIONBIO,(void*) &arg, sizeof(arg));
|
|
vio->fcntl_mode &= ~O_NONBLOCK;
|
|
}
|
|
#endif
|
|
}
|
|
DBUG_RETURN(vio);
|
|
}
|
|
|
|
|
|
#ifdef __WIN__
|
|
|
|
Vio *vio_new_win32pipe(HANDLE hPipe)
|
|
{
|
|
Vio *vio;
|
|
DBUG_ENTER("vio_new_handle");
|
|
if ((vio = (Vio*) my_malloc(sizeof(Vio),MYF(MY_WME))))
|
|
{
|
|
vio_reset(vio, VIO_TYPE_NAMEDPIPE, 0, hPipe, TRUE);
|
|
strmov(vio->desc, "named pipe");
|
|
}
|
|
DBUG_RETURN(vio);
|
|
}
|
|
|
|
#endif
|