hyung-hwan/qse
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

checked O_CLOEXEC availibility

Browse Source
This commit is contained in:
hyung-hwan
2018-01-28 05:17:42 +00:00
parent 4243665288
commit c274cc0fb4
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
qse/lib/si/Socket.cpp
View File

@ -64,8 +64,8 @@ int Socket::open (int domain, int type, int protocol, int traits) QSE_CPP_NOEXCE
bool fcntl_v = 0; bool fcntl_v = 0;
#if defined(SOCK_NONBLOCK) && defined(SOCK_CLOEXEC) #if defined(SOCK_NONBLOCK) && defined(SOCK_CLOEXEC)
if (traits & T_NONBLOCK) type |= SOCK_NONBLOCK; if (traits & Socket::T_NONBLOCK) type |= SOCK_NONBLOCK;
if (traits & T_CLOEXEC) type |= SOCK_CLOEXEC; if (traits & Socket::T_CLOEXEC) type |= SOCK_CLOEXEC;
open_socket: open_socket:
#endif #endif
x = ::socket (domain, type, protocol); x = ::socket (domain, type, protocol);
@ -75,8 +75,10 @@ open_socket:
if (errno == EINVAL && (type & (SOCK_NONBLOCK | SOCK_CLOEXEC))) if (errno == EINVAL && (type & (SOCK_NONBLOCK | SOCK_CLOEXEC)))
{ {
type &= ~(SOCK_NONBLOCK | SOCK_CLOEXEC); type &= ~(SOCK_NONBLOCK | SOCK_CLOEXEC);
if (traits & T_NONBLOCK ) fcntl_v |= O_NONBLOCK; if (traits & Socket::T_NONBLOCK ) fcntl_v |= O_NONBLOCK;
if (traits & T_CLOEXEC) fcntl_v |= O_CLOEXEC; #if defined(O_CLOEXEC)
if (traits & Socket::T_CLOEXEC) fcntl_v |= O_CLOEXEC;
#endif
goto open_socket; goto open_socket;
} }
#endif #endif
@ -87,8 +89,10 @@ open_socket:
#if defined(SOCK_NONBLOCK) && defined(SOCK_CLOEXEC) #if defined(SOCK_NONBLOCK) && defined(SOCK_CLOEXEC)
// do nothing // do nothing
#else #else
if (traits & T_NONBLOCK ) fcntl_v |= O_NONBLOCK; if (traits & Socket::T_NONBLOCK ) fcntl_v |= O_NONBLOCK;
if (traits & T_CLOEXEC) fcntl_v |= O_CLOEXEC; #if defined(O_CLOEXEC)
if (traits & O_CLOEXEC) fcntl_v |= O_CLOEXEC;
#endif
#endif #endif
if (fcntl_v) if (fcntl_v)
@ -170,8 +174,8 @@ int Socket::accept (Socket* newsck, SocketAddress* newaddr, int traits) QSE_CPP_
#if defined(SOCK_NONBLOCK) && defined(SOCK_CLOEXEC) && defined(HAVE_ACCEPT4) #if defined(SOCK_NONBLOCK) && defined(SOCK_CLOEXEC) && defined(HAVE_ACCEPT4)
flag_v = 0; flag_v = 0;
if (traits & T_NONBLOCK ) flag_v |= SOCK_NONBLOCK; if (traits & Socket::T_NONBLOCK ) flag_v |= SOCK_NONBLOCK;
if (traits & T_CLOEXEC) flag_v |= SOCK_CLOEXEC; if (traits & Socket::T_CLOEXEC) flag_v |= SOCK_CLOEXEC;
addrlen = newaddr->getAddrCapa(); addrlen = newaddr->getAddrCapa();
newfd = ::accept4(this->handle, (struct sockaddr*)newaddr->getAddrPtr(), &addrlen, flag_v); newfd = ::accept4(this->handle, (struct sockaddr*)newaddr->getAddrPtr(), &addrlen, flag_v);
@ -200,8 +204,10 @@ int Socket::accept (Socket* newsck, SocketAddress* newaddr, int traits) QSE_CPP_
} }
flag_v = 0; flag_v = 0;
if (traits & T_NONBLOCK ) flag_v |= O_NONBLOCK; if (traits & Socket::T_NONBLOCK ) flag_v |= O_NONBLOCK;
if (traits & T_CLOEXEC) flag_v |= O_CLOEXEC; #if defined(O_CLOEXEC)
if (traits & Socket::T_CLOEXEC) flag_v |= O_CLOEXEC;
#endif
if (flag_v) if (flag_v)
{ {