database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

vio.c Vio code bugfix

Browse Source 
violite.h	Code cleanup


include/violite.h:
  Code cleanup
vio/vio.c:
  Vio code bugfix
This commit is contained in:
unknown
2001-06-05 02:28:33 +03:00
parent 1da42e7b8a
commit 09db695543
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/violite.h
View File

@@ -210,9 +210,6 @@ struct st_VioSSLConnectorFd *new_VioSSLConnectorFd(
struct st_VioSSLAcceptorFd *new_VioSSLAcceptorFd( struct st_VioSSLAcceptorFd *new_VioSSLAcceptorFd(
const char* key_file,const char* cert_file,const char* ca_file,const char* ca_path); const char* key_file,const char* cert_file,const char* ca_file,const char* ca_path);
Vio* new_VioSSL(struct st_VioSSLAcceptorFd* fd, Vio* sd,int state); Vio* new_VioSSL(struct st_VioSSLAcceptorFd* fd, Vio* sd,int state);
//static int
//init_bio_(struct st_VioSSLAcceptorFd* fd, Vio* sd, int state, int bio_flags);
//void report_errors();
#ifdef __cplusplus #ifdef __cplusplus
} }

12
vio/vio.c
View File

@@ -66,13 +66,17 @@ void vio_reset(Vio* vio, enum enum_vio_type type,
my_socket sd, HANDLE hPipe, my_socket sd, HANDLE hPipe,
my_bool localhost) my_bool localhost)
{ {
DBUG_ENTER("vio_reset");
DBUG_PRINT("enter", ("type=%d sd=%d localhost=%d", type, sd, localhost));
bzero((char*) vio, sizeof(Vio)); bzero((char*) vio, sizeof(Vio));
vio->type = type; vio->type = type;
vio->sd = sd; vio->sd = sd;
vio->hPipe = hPipe; vio->hPipe = hPipe;
vio->localhost= localhost; vio->localhost= localhost;
#ifdef HAVE_VIO #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->viodelete =vio_ssl_delete;
vio->vioerrno =vio_ssl_errno; vio->vioerrno =vio_ssl_errno;
vio->read =vio_ssl_read; vio->read =vio_ssl_read;
@@ -84,6 +88,9 @@ if(type == VIO_TYPE_SSL){
vio->peer_addr =vio_ssl_peer_addr; vio->peer_addr =vio_ssl_peer_addr;
vio->in_addr =vio_ssl_in_addr; vio->in_addr =vio_ssl_in_addr;
vio->poll_read =vio_ssl_poll_read; 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 */ } else { /* default is VIO_TYPE_TCPIP */
vio->viodelete =vio_delete; vio->viodelete =vio_delete;
vio->vioerrno =vio_errno; vio->vioerrno =vio_errno;
@@ -96,9 +103,12 @@ if(type == VIO_TYPE_SSL){
vio->peer_addr =vio_peer_addr; vio->peer_addr =vio_peer_addr;
vio->in_addr =vio_in_addr; vio->in_addr =vio_in_addr;
vio->poll_read =vio_poll_read; vio->poll_read =vio_poll_read;
vio->vioblocking=vio_blocking;
vio->is_blocking=vio_is_blocking;
} }
#endif /* HAVE_VIO */ #endif /* HAVE_VIO */
DBUG_VOID_RETURN;
} }
/* Open the socket or TCP/IP connection and read the fnctl() status */ /* Open the socket or TCP/IP connection and read the fnctl() status */