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
b19b9ca4
Commit
b19b9ca4
authored
10 years ago
by
Roman Tsisyk
Browse files
Options
Downloads
Patches
Plain Diff
Remove broken struct sockaddr definition from FFI
Fixes compatibility with third-party modules.
parent
81ea2958
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/lua/bsdsocket.lua
+6
-10
6 additions, 10 deletions
src/lua/bsdsocket.lua
test/box/bsdsocket.result
+1
-1
1 addition, 1 deletion
test/box/bsdsocket.result
with
7 additions
and
11 deletions
src/lua/bsdsocket.lua
+
6
−
10
View file @
b19b9ca4
...
...
@@ -48,12 +48,6 @@ ffi.cdef[[
struct protoent *getprotobyname(const char *name);
]]
ffi
.
cdef
(
[[
struct sockaddr {
char _data[256]; /* enough to fit any address */
};
]]
);
local
function
sprintf
(
fmt
,
...
)
return
string.format
(
fmt
,
...
)
end
...
...
@@ -133,7 +127,9 @@ socket_methods.error = function(self)
end
end
local
addr
=
ffi
.
new
(
'struct sockaddr'
)
-- addrbuf is equivalent to struct sockaddr_storage
local
addrbuf
=
ffi
.
new
(
'char[128]'
)
-- enough to fit any address
local
addr
=
ffi
.
cast
(
'struct sockaddr *'
,
addrbuf
)
local
addr_len
=
ffi
.
new
(
'socklen_t[1]'
)
socket_methods
.
sysconnect
=
function
(
self
,
host
,
port
)
local
fd
=
check_socket
(
self
)
...
...
@@ -142,7 +138,7 @@ socket_methods.sysconnect = function(self, host, port)
host
=
tostring
(
host
)
port
=
tostring
(
port
)
addr_len
[
0
]
=
ffi
.
sizeof
(
addr
)
addr_len
[
0
]
=
ffi
.
sizeof
(
addr
buf
)
local
res
=
ffi
.
C
.
bsdsocket_local_resolve
(
host
,
port
,
addr
,
addr_len
)
if
res
==
0
then
res
=
ffi
.
C
.
connect
(
fd
,
addr
,
addr_len
[
0
]);
...
...
@@ -274,7 +270,7 @@ socket_methods.bind = function(self, host, port)
host
=
tostring
(
host
)
port
=
tostring
(
port
)
addr_len
[
0
]
=
ffi
.
sizeof
(
addr
)
addr_len
[
0
]
=
ffi
.
sizeof
(
addr
buf
)
local
res
=
ffi
.
C
.
bsdsocket_local_resolve
(
host
,
port
,
addr
,
addr_len
)
if
res
==
0
then
res
=
ffi
.
C
.
bind
(
fd
,
addr
,
addr_len
[
0
]);
...
...
@@ -760,7 +756,7 @@ socket_methods.sendto = function(self, host, port, octets, flags)
port
=
tostring
(
port
)
octets
=
tostring
(
octets
)
addr_len
[
0
]
=
ffi
.
sizeof
(
addr
)
addr_len
[
0
]
=
ffi
.
sizeof
(
addr
buf
)
local
res
=
ffi
.
C
.
bsdsocket_local_resolve
(
host
,
port
,
addr
,
addr_len
)
if
res
==
0
then
res
=
ffi
.
C
.
sendto
(
fd
,
octets
,
string.len
(
octets
),
iflags
,
...
...
This diff is collapsed.
Click to expand it.
test/box/bsdsocket.result
+
1
−
1
View file @
b19b9ca4
...
...
@@ -222,7 +222,7 @@ lua s:getsockopt('SOL_SOCKET', 'SO_DEBUG')
...
lua s:setsockopt('SOL_SOCKET', 'SO_ACCEPTCONN', 1)
---
error: '[string "-- bsdsocket.lua (internal file)..."]:34
5
: Socket option SO_ACCEPTCONN is read only'
error: '[string "-- bsdsocket.lua (internal file)..."]:34
1
: Socket option SO_ACCEPTCONN is read only'
...
lua s:getsockopt('SOL_SOCKET', 'SO_RCVBUF') > 32
---
...
...
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