Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
6988b747
Commit
6988b747
authored
Jun 05, 2001
by
tonu@hundin.mysql.fi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vio.c Vio code bugfix
violite.h Code cleanup
parent
1d05b899
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
4 deletions
+11
-4
include/violite.h
include/violite.h
+0
-3
vio/vio.c
vio/vio.c
+11
-1
No files found.
include/violite.h
View file @
6988b747
...
@@ -210,9 +210,6 @@ struct st_VioSSLConnectorFd *new_VioSSLConnectorFd(
...
@@ -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
}
}
...
...
vio/vio.c
View file @
6988b747
...
@@ -66,13 +66,17 @@ void vio_reset(Vio* vio, enum enum_vio_type type,
...
@@ -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){
...
@@ -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){
...
@@ -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 */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment