Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
hiredis
Commits
fe215464
Unverified
Commit
fe215464
authored
Aug 09, 2019
by
Mark Nunberg
Committed by
GitHub
Aug 09, 2019
Browse files
Merge pull request #662 from dragonation/master
The setsockopt and getsockopt API diffs from BSD socket and WSA one
parents
b1fa77d0
76394f1b
Changes
1
Hide whitespace changes
Inline
Side-by-side
sockcompat.c
View file @
fe215464
...
...
@@ -189,13 +189,35 @@ int win32_connect(SOCKET sockfd, const struct sockaddr *addr, socklen_t addrlen)
}
int
win32_getsockopt
(
SOCKET
sockfd
,
int
level
,
int
optname
,
void
*
optval
,
socklen_t
*
optlen
)
{
int
ret
=
getsockopt
(
sockfd
,
level
,
optname
,
(
char
*
)
optval
,
optlen
);
int
ret
=
0
;
if
((
level
==
SOL_SOCKET
)
&&
((
optname
==
SO_RCVTIMEO
)
||
(
optname
==
SO_SNDTIMEO
)))
{
if
(
*
optlen
>=
sizeof
(
struct
timeval
))
{
struct
timeval
*
tv
=
optval
;
DWORD
timeout
=
0
;
socklen_t
dwlen
=
0
;
ret
=
getsockopt
(
sockfd
,
level
,
optname
,
(
char
*
)
&
timeout
,
&
dwlen
);
tv
->
tv_sec
=
timeout
/
1000
;
tv
->
tv_usec
=
(
timeout
*
1000
)
%
1000000
;
}
else
{
ret
=
WSAEFAULT
;
}
*
optlen
=
sizeof
(
struct
timeval
);
}
else
{
ret
=
getsockopt
(
sockfd
,
level
,
optname
,
(
char
*
)
optval
,
optlen
);
}
_updateErrno
(
ret
!=
SOCKET_ERROR
);
return
ret
!=
SOCKET_ERROR
?
ret
:
-
1
;
}
int
win32_setsockopt
(
SOCKET
sockfd
,
int
level
,
int
optname
,
const
void
*
optval
,
socklen_t
optlen
)
{
int
ret
=
setsockopt
(
sockfd
,
level
,
optname
,
(
const
char
*
)
optval
,
optlen
);
int
ret
=
0
;
if
((
level
==
SOL_SOCKET
)
&&
((
optname
==
SO_RCVTIMEO
)
||
(
optname
==
SO_SNDTIMEO
)))
{
struct
timeval
*
tv
=
optval
;
DWORD
timeout
=
tv
->
tv_sec
*
1000
+
tv
->
tv_usec
/
1000
;
ret
=
setsockopt
(
sockfd
,
level
,
optname
,
(
const
char
*
)
&
timeout
,
sizeof
(
DWORD
));
}
else
{
ret
=
setsockopt
(
sockfd
,
level
,
optname
,
(
const
char
*
)
optval
,
optlen
);
}
_updateErrno
(
ret
!=
SOCKET_ERROR
);
return
ret
!=
SOCKET_ERROR
?
ret
:
-
1
;
}
...
...
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