Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Thread safe cloexec #1828

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Thread safe cloexec #1828

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50fce53
threadsafe CLOEXEC on platforms that support it
May 1, 2024
fb739db
threadsafe accept on windows, linux
May 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 23 additions & 1 deletion httplib.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3216,7 +3216,12 @@ socket_t create_socket(const std::string &host, const std::string &ip, int port,
const auto addrlen = host.length();
if (addrlen > sizeof(sockaddr_un::sun_path)) { return INVALID_SOCKET; }

#ifdef SOCK_CLOEXEC
auto sock = socket(hints.ai_family, hints.ai_socktype | SOCK_CLOEXEC, hints.ai_protocol);
#else
auto sock = socket(hints.ai_family, hints.ai_socktype, hints.ai_protocol);
#endif

if (sock != INVALID_SOCKET) {
sockaddr_un addr{};
addr.sun_family = AF_UNIX;
Expand All @@ -3226,7 +3231,10 @@ socket_t create_socket(const std::string &host, const std::string &ip, int port,
hints.ai_addrlen = static_cast<socklen_t>(
sizeof(addr) - sizeof(addr.sun_path) + addrlen);

#ifndef SOCK_CLOEXEC
fcntl(sock, F_SETFD, FD_CLOEXEC);
#endif

if (socket_options) { socket_options(sock); }

if (!bind_or_connect(sock, hints)) {
Expand Down Expand Up @@ -3271,11 +3279,17 @@ socket_t create_socket(const std::string &host, const std::string &ip, int port,
sock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
}
#else

#ifdef SOCK_CLOEXEC
auto sock = socket(rp->ai_family, rp->ai_socktype | SOCK_CLOEXEC, rp->ai_protocol);
#else
auto sock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
#endif

#endif
if (sock == INVALID_SOCKET) { continue; }

#ifndef _WIN32
#if !defined _WIN32 && !defined SOCK_CLOEXEC
if (fcntl(sock, F_SETFD, FD_CLOEXEC) == -1) {
close_socket(sock);
continue;
Expand Down Expand Up @@ -6470,7 +6484,15 @@ inline bool Server::listen_internal() {
#ifndef _WIN32
}
#endif

#if defined _WIN32
// sockets conneced via WASAccept inherit flags NO_HANDLE_INHERIT, OVERLAPPED
socket_t sock = WSAAccept(svr_sock_, nullptr, nullptr, nullptr, 0);
#elif defined __linux__
socket_t sock = accept4(svr_sock_, nullptr, nullptr, SOCK_CLOEXEC);
#else
socket_t sock = accept(svr_sock_, nullptr, nullptr);
#endif

if (sock == INVALID_SOCKET) {
if (errno == EMFILE) {
Expand Down