mirror of
https://gitee.com/acl-dev/acl.git
synced 2024-12-13 16:35:35 +08:00
Merge branch 'gitee-master' into gitlab-upstream
This commit is contained in:
commit
da538cc962
@ -182,20 +182,22 @@ void openssl_io::destroy(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef HAS_OPENSSL
|
||||||
|
|
||||||
static bool set_sock_timeo(ACL_SOCKET fd, int opt, int timeout)
|
static bool set_sock_timeo(ACL_SOCKET fd, int opt, int timeout)
|
||||||
{
|
{
|
||||||
if (timeout <= 0) {
|
if (timeout <= 0) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(__APPLE__) || defined(_WIN32) || defined(_WIN64)
|
# if defined(__APPLE__) || defined(_WIN32) || defined(_WIN64)
|
||||||
timeout *= 1000; // From seconds to millisecond.
|
timeout *= 1000; // From seconds to millisecond.
|
||||||
if (setsockopt(fd, SOL_SOCKET, opt, &timeout, sizeof(timeout)) < 0) {
|
if (setsockopt(fd, SOL_SOCKET, opt, &timeout, sizeof(timeout)) < 0) {
|
||||||
logger_error("setsockopt error=%s, timeout=%d, opt=%d, fd=%d",
|
logger_error("setsockopt error=%s, timeout=%d, opt=%d, fd=%d",
|
||||||
last_serror(), timeout, opt, (int) fd);
|
last_serror(), timeout, opt, (int) fd);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
#else // Must be Linux.
|
# else // Must be Linux.
|
||||||
struct timeval tm;
|
struct timeval tm;
|
||||||
tm.tv_sec = timeout;
|
tm.tv_sec = timeout;
|
||||||
tm.tv_usec = 0;
|
tm.tv_usec = 0;
|
||||||
@ -205,10 +207,12 @@ static bool set_sock_timeo(ACL_SOCKET fd, int opt, int timeout)
|
|||||||
last_serror(), timeout, opt, (int) fd);
|
last_serror(), timeout, opt, (int) fd);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
#endif
|
# endif
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
bool openssl_io::open(ACL_VSTREAM* s)
|
bool openssl_io::open(ACL_VSTREAM* s)
|
||||||
{
|
{
|
||||||
if (s == NULL) {
|
if (s == NULL) {
|
||||||
|
Loading…
Reference in New Issue
Block a user