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
5c4d7c66
Commit
5c4d7c66
authored
Sep 24, 2011
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
portability fix: use SOCKET_SIZE_TYPE in the handlersocket plugin
parent
14c767ca
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
4 deletions
+7
-4
plugin/handler_socket/handlersocket/hstcpsvr_worker.cpp
plugin/handler_socket/handlersocket/hstcpsvr_worker.cpp
+1
-1
plugin/handler_socket/libhsclient/auto_addrinfo.hpp
plugin/handler_socket/libhsclient/auto_addrinfo.hpp
+3
-0
plugin/handler_socket/libhsclient/socket.cpp
plugin/handler_socket/libhsclient/socket.cpp
+1
-1
plugin/handler_socket/libhsclient/socket.hpp
plugin/handler_socket/libhsclient/socket.hpp
+2
-2
No files found.
plugin/handler_socket/handlersocket/hstcpsvr_worker.cpp
View file @
5c4d7c66
...
@@ -63,7 +63,7 @@ struct hstcpsvr_conn : public dbcallback_i {
...
@@ -63,7 +63,7 @@ struct hstcpsvr_conn : public dbcallback_i {
public:
public:
auto_file
fd
;
auto_file
fd
;
sockaddr_storage
addr
;
sockaddr_storage
addr
;
s
ocklen_
t
addr_len
;
s
ize_socke
t
addr_len
;
dbconnstate
cstate
;
dbconnstate
cstate
;
std
::
string
err
;
std
::
string
err
;
size_t
readsize
;
size_t
readsize
;
...
...
plugin/handler_socket/libhsclient/auto_addrinfo.hpp
View file @
5c4d7c66
...
@@ -9,12 +9,15 @@
...
@@ -9,12 +9,15 @@
#ifndef DENA_AUTO_ADDRINFO_HPP
#ifndef DENA_AUTO_ADDRINFO_HPP
#define DENA_AUTO_ADDRINFO_HPP
#define DENA_AUTO_ADDRINFO_HPP
#include <my_config.h>
#include <sys/types.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/socket.h>
#include <netdb.h>
#include <netdb.h>
#include "util.hpp"
#include "util.hpp"
typedef
SOCKET_SIZE_TYPE
size_socket
;
namespace
dena
{
namespace
dena
{
struct
auto_addrinfo
:
private
noncopyable
{
struct
auto_addrinfo
:
private
noncopyable
{
...
...
plugin/handler_socket/libhsclient/socket.cpp
View file @
5c4d7c66
...
@@ -172,7 +172,7 @@ socket_bind(auto_file& fd, const socket_args& args, std::string& err_r)
...
@@ -172,7 +172,7 @@ socket_bind(auto_file& fd, const socket_args& args, std::string& err_r)
int
int
socket_accept
(
int
listen_fd
,
auto_file
&
fd
,
const
socket_args
&
args
,
socket_accept
(
int
listen_fd
,
auto_file
&
fd
,
const
socket_args
&
args
,
sockaddr_storage
&
addr_r
,
s
ocklen_
t
&
addrlen_r
,
std
::
string
&
err_r
)
sockaddr_storage
&
addr_r
,
s
ize_socke
t
&
addrlen_r
,
std
::
string
&
err_r
)
{
{
fd
.
reset
(
accept
(
listen_fd
,
reinterpret_cast
<
sockaddr
*>
(
&
addr_r
),
fd
.
reset
(
accept
(
listen_fd
,
reinterpret_cast
<
sockaddr
*>
(
&
addr_r
),
&
addrlen_r
));
&
addrlen_r
));
...
...
plugin/handler_socket/libhsclient/socket.hpp
View file @
5c4d7c66
...
@@ -19,7 +19,7 @@ namespace dena {
...
@@ -19,7 +19,7 @@ namespace dena {
struct
socket_args
{
struct
socket_args
{
sockaddr_storage
addr
;
sockaddr_storage
addr
;
s
ocklen_
t
addrlen
;
s
ize_socke
t
addrlen
;
int
family
;
int
family
;
int
socktype
;
int
socktype
;
int
protocol
;
int
protocol
;
...
@@ -43,7 +43,7 @@ void ignore_sigpipe();
...
@@ -43,7 +43,7 @@ void ignore_sigpipe();
int
socket_bind
(
auto_file
&
fd
,
const
socket_args
&
args
,
std
::
string
&
err_r
);
int
socket_bind
(
auto_file
&
fd
,
const
socket_args
&
args
,
std
::
string
&
err_r
);
int
socket_connect
(
auto_file
&
fd
,
const
socket_args
&
args
,
std
::
string
&
err_r
);
int
socket_connect
(
auto_file
&
fd
,
const
socket_args
&
args
,
std
::
string
&
err_r
);
int
socket_accept
(
int
listen_fd
,
auto_file
&
fd
,
const
socket_args
&
args
,
int
socket_accept
(
int
listen_fd
,
auto_file
&
fd
,
const
socket_args
&
args
,
sockaddr_storage
&
addr_r
,
s
ocklen_
t
&
addrlen_r
,
std
::
string
&
err_r
);
sockaddr_storage
&
addr_r
,
s
ize_socke
t
&
addrlen_r
,
std
::
string
&
err_r
);
};
};
...
...
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