diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-10-17 01:25:58 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-17 01:25:58 +0900 |
| commit | 8da2f9e80741ea3dd5058dc3440c0ca80c6436e0 (patch) | |
| tree | d57bdf9c7a6e601b88e205277d82a47948634706 /src/core/socket.c | |
| parent | ea90471a88f98c181e20e10566fe3fd672c7df90 (diff) | |
| parent | 271f518f35af9b27cb3f35d2d8a32b7f8e3bef22 (diff) | |
| download | systemd-8da2f9e80741ea3dd5058dc3440c0ca80c6436e0.tar.gz | |
Merge pull request #10412 from poettering/sockaddr-sun-path
various fixes related to struct sockaddr_un handling
Diffstat (limited to 'src/core/socket.c')
| -rw-r--r-- | src/core/socket.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/core/socket.c b/src/core/socket.c index 06e9956157..f0f6a83a19 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -1014,8 +1014,7 @@ static void socket_apply_socket_options(Socket *s, int fd) { assert(fd >= 0); if (s->keep_alive) { - int one = 1; - if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &one, sizeof(one)) < 0) + if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &const_int_one, sizeof(const_int_one)) < 0) log_unit_warning_errno(UNIT(s), errno, "SO_KEEPALIVE failed: %m"); } @@ -1044,32 +1043,27 @@ static void socket_apply_socket_options(Socket *s, int fd) { } if (s->no_delay) { - int one = 1; - if (s->socket_protocol == IPPROTO_SCTP) { - if (setsockopt(fd, SOL_SCTP, SCTP_NODELAY, &one, sizeof(one)) < 0) + if (setsockopt(fd, SOL_SCTP, SCTP_NODELAY, &const_int_one, sizeof(const_int_one)) < 0) log_unit_warning_errno(UNIT(s), errno, "SCTP_NODELAY failed: %m"); } else { - if (setsockopt(fd, SOL_TCP, TCP_NODELAY, &one, sizeof(one)) < 0) + if (setsockopt(fd, SOL_TCP, TCP_NODELAY, &const_int_one, sizeof(const_int_one)) < 0) log_unit_warning_errno(UNIT(s), errno, "TCP_NODELAY failed: %m"); } } if (s->broadcast) { - int one = 1; - if (setsockopt(fd, SOL_SOCKET, SO_BROADCAST, &one, sizeof(one)) < 0) + if (setsockopt(fd, SOL_SOCKET, SO_BROADCAST, &const_int_one, sizeof(const_int_one)) < 0) log_unit_warning_errno(UNIT(s), errno, "SO_BROADCAST failed: %m"); } if (s->pass_cred) { - int one = 1; - if (setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &one, sizeof(one)) < 0) + if (setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &const_int_one, sizeof(const_int_one)) < 0) log_unit_warning_errno(UNIT(s), errno, "SO_PASSCRED failed: %m"); } if (s->pass_sec) { - int one = 1; - if (setsockopt(fd, SOL_SOCKET, SO_PASSSEC, &one, sizeof(one)) < 0) + if (setsockopt(fd, SOL_SOCKET, SO_PASSSEC, &const_int_one, sizeof(const_int_one)) < 0) log_unit_warning_errno(UNIT(s), errno, "SO_PASSSEC failed: %m"); } |