Skip to content

Apply FD_CLOEXEC on sockets #1301

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

Merged
michael-grunder merged 5 commits into from
May 25, 2025
Merged

Apply FD_CLOEXEC on sockets #1301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
386c5c3
Apply FD_CLOEXEC on sockets
May 22, 2025
826a640
Added an options flag, switched to SOCK_CLOEXEC to set the option ato…
May 22, 2025
6e587c7
More elegant flow
May 23, 2025
7753d02
Remove endif comment
lennyly May 23, 2025
fea7e2a
Remove another endif comment
lennyly May 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions hiredis.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -835,6 +835,9 @@ redisContext *redisConnectWithOptions(const redisOptions *options) {
if (options->options & REDIS_OPT_PREFER_IPV6) {
c->flags |= REDIS_PREFER_IPV6;
}
if (options->options & REDIS_OPT_SET_SOCK_CLOEXEC) {
c->flags |= REDIS_OPT_SET_SOCK_CLOEXEC;
}

/* Set any user supplied RESP3 PUSH handler or use freeReplyObject
* as a default unless specifically flagged that we don't want one. */
Expand Down
1 change: 1 addition & 0 deletions hiredis.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ struct redisSsl;
#define REDIS_OPT_PREFER_IPV4 0x20 /* Prefer IPv4 in DNS lookups. */
#define REDIS_OPT_PREFER_IPV6 0x40 /* Prefer IPv6 in DNS lookups. */
#define REDIS_OPT_PREFER_IP_UNSPEC (REDIS_OPT_PREFER_IPV4 | REDIS_OPT_PREFER_IPV6)
#define REDIS_OPT_SET_SOCK_CLOEXEC 0x80 /* Set SOCK_CLOEXEC on socket file descriptor. */

/* In Unix systems a file descriptor is a regular signed int, with -1
* representing an invalid descriptor. In Windows it is a SOCKET
Expand Down
27 changes: 23 additions & 4 deletions net.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,20 @@ static int redisSetReuseAddr(redisContext *c) {

static int redisCreateSocket(redisContext *c, int type) {
redisFD s;
if ((s = socket(type, SOCK_STREAM, 0)) == REDIS_INVALID_FD) {
__redisSetErrorFromErrno(c,REDIS_ERR_IO,NULL);
int flags = SOCK_STREAM;

#ifdef SOCK_CLOEXEC
if (c->flags & REDIS_OPT_SET_SOCK_CLOEXEC) {
flags |= SOCK_CLOEXEC;
}
#endif

if ((s = socket(type, flags, 0)) == REDIS_INVALID_FD) {
__redisSetErrorFromErrno(c, REDIS_ERR_IO, NULL);
return REDIS_ERR;
}
c->fd = s;

if (type == AF_INET) {
if (redisSetReuseAddr(c) == REDIS_ERR) {
return REDIS_ERR;
Expand Down Expand Up @@ -512,11 +521,21 @@ static int _redisContextConnectTcp(redisContext *c, const char *addr, int port,
return REDIS_ERR;
}
for (p = servinfo; p != NULL; p = p->ai_next) {
addrretry:
if ((s = socket(p->ai_family,p->ai_socktype,p->ai_protocol)) == REDIS_INVALID_FD)
addrretry: {
int sock_type = p->ai_socktype;

#ifdef SOCK_CLOEXEC
if (c->flags & REDIS_OPT_SET_SOCK_CLOEXEC) {
sock_type |= SOCK_CLOEXEC;
}
#endif

if ((s = socket(p->ai_family, sock_type, p->ai_protocol)) == REDIS_INVALID_FD)
continue;
}

c->fd = s;

if (redisSetBlocking(c,0) != REDIS_OK)
goto error;
if (c->tcp.source_addr) {
Expand Down
Loading