Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
T
tarantool
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
core
tarantool
Commits
9d475e7e
Commit
9d475e7e
authored
11 years ago
by
Konstantin Osipov
Browse files
Options
Downloads
Plain Diff
Merge branch 'freebsd-fix' into stable
parents
e7977ad2
6c78b6ec
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/coeio.m
+8
-1
8 additions, 1 deletion
src/coeio.m
src/sio.m
+4
-2
4 additions, 2 deletions
src/sio.m
with
12 additions
and
3 deletions
src/coeio.m
+
8
−
1
View file @
9d475e7e
...
...
@@ -228,7 +228,14 @@ getaddrinfo_cb(va_list ap)
*
*
See
for
details
:
https
://
bugs
.
launchpad
.
net
/
tarantool
/+
bug
/
1160877
*/
if
(
rc
==
EAI
_
ADDRFAMILY
||
rc
==
EAI
_
BADFLAGS
)
{
/*
EAI
_
ADDRFAMILY
is
deprecated
on
FreeBSD
*/
#ifdef
EAI
_
ADDRFAMILY
int
is
_
rc
=
EAI
_
BADFLAGS
|
EAI
_
ADDRFAMILY
;
#else
int
is
_
rc
=
EAI
_
BADFLAGS
;
#endif
if
(
rc
==
is
_
rc
)
{
hints
->
ai
_
flags
&=
~
AI
_
ADDRCONFIG
;
rc
=
getaddrinfo
(
host
,
port
,
hints
,
res
)
;
}
...
...
This diff is collapsed.
Click to expand it.
src/sio.m
+
4
−
2
View file @
9d475e7e
...
...
@@ -271,7 +271,8 @@ ssize_t
sio_sendto
(
int
fd
,
const
void
*
buf
,
size_t
len
,
int
flags
,
const
struct
sockaddr_in
*
dest_addr
,
socklen_t
addrlen
)
{
ssize_t
n
=
sendto
(
fd
,
buf
,
len
,
flags
,
dest_addr
,
addrlen
);
ssize_t
n
=
sendto
(
fd
,
buf
,
len
,
flags
,
(
struct
sockaddr
*
)
dest_addr
,
addrlen
);
if
(
n
<
0
&&
errno
!=
EAGAIN
&&
errno
!=
EWOULDBLOCK
&&
errno
!=
EINTR
)
tnt_raise
(
SocketError
,
:
fd
in
:
"sendto(%zd)"
,
len
);
...
...
@@ -283,7 +284,8 @@ ssize_t
sio_recvfrom
(
int
fd
,
void
*
buf
,
size_t
len
,
int
flags
,
struct
sockaddr_in
*
src_addr
,
socklen_t
*
addrlen
)
{
ssize_t
n
=
recvfrom
(
fd
,
buf
,
len
,
flags
,
src_addr
,
addrlen
);
ssize_t
n
=
recvfrom
(
fd
,
buf
,
len
,
flags
,
(
struct
sockaddr
*
)
src_addr
,
addrlen
);
if
(
n
<
0
&&
errno
!=
EAGAIN
&&
errno
!=
EWOULDBLOCK
&&
errno
!=
EINTR
)
tnt_raise
(
SocketError
,
:
fd
in
:
"recvfrom(%zd)"
,
len
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment