From d83ceacc7eaee58ab5d928a20986ba946104d478 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 10 Jun 2025 07:20:51 +0200 Subject: [PATCH] tree-wide: say in log message that we ignore error conditions of certain sockopts Follow our usual style on this. Follow-up for: #37793 --- src/core/socket.c | 40 +++++++++++++++++------------------ src/journal/journald-native.c | 2 +- src/journal/journald-syslog.c | 2 +- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/core/socket.c b/src/core/socket.c index ae1a48c9f52..ec75c22c5c9 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -1021,67 +1021,67 @@ static void socket_apply_socket_options(Socket *s, SocketPort *p, int fd) { if (s->keep_alive) { r = setsockopt_int(fd, SOL_SOCKET, SO_KEEPALIVE, true); if (r < 0) - log_unit_warning_errno(UNIT(s), r, "SO_KEEPALIVE failed: %m"); + log_unit_warning_errno(UNIT(s), r, "SO_KEEPALIVE failed, ignoring: %m"); } if (timestamp_is_set(s->keep_alive_time)) { r = setsockopt_int(fd, SOL_TCP, TCP_KEEPIDLE, s->keep_alive_time / USEC_PER_SEC); if (r < 0) - log_unit_warning_errno(UNIT(s), r, "TCP_KEEPIDLE failed: %m"); + log_unit_warning_errno(UNIT(s), r, "TCP_KEEPIDLE failed, ignoring: %m"); } if (s->keep_alive_interval > 0) { r = setsockopt_int(fd, SOL_TCP, TCP_KEEPINTVL, s->keep_alive_interval / USEC_PER_SEC); if (r < 0) - log_unit_warning_errno(UNIT(s), r, "TCP_KEEPINTVL failed: %m"); + log_unit_warning_errno(UNIT(s), r, "TCP_KEEPINTVL failed, ignoring: %m"); } if (s->keep_alive_cnt > 0) { r = setsockopt_int(fd, SOL_TCP, TCP_KEEPCNT, s->keep_alive_cnt); if (r < 0) - log_unit_warning_errno(UNIT(s), r, "TCP_KEEPCNT failed: %m"); + log_unit_warning_errno(UNIT(s), r, "TCP_KEEPCNT failed, ignoring: %m"); } if (s->defer_accept > 0) { r = setsockopt_int(fd, SOL_TCP, TCP_DEFER_ACCEPT, s->defer_accept / USEC_PER_SEC); if (r < 0) - log_unit_warning_errno(UNIT(s), r, "TCP_DEFER_ACCEPT failed: %m"); + log_unit_warning_errno(UNIT(s), r, "TCP_DEFER_ACCEPT failed, ignoring: %m"); } if (s->no_delay) { if (s->socket_protocol == IPPROTO_SCTP) { r = setsockopt_int(fd, SOL_SCTP, SCTP_NODELAY, true); if (r < 0) - log_unit_warning_errno(UNIT(s), r, "SCTP_NODELAY failed: %m"); + log_unit_warning_errno(UNIT(s), r, "SCTP_NODELAY failed, ignoring: %m"); } else { r = setsockopt_int(fd, SOL_TCP, TCP_NODELAY, true); if (r < 0) - log_unit_warning_errno(UNIT(s), r, "TCP_NODELAY failed: %m"); + log_unit_warning_errno(UNIT(s), r, "TCP_NODELAY failed, ignoring: %m"); } } if (s->broadcast) { r = setsockopt_int(fd, SOL_SOCKET, SO_BROADCAST, true); if (r < 0) - log_unit_warning_errno(UNIT(s), r, "SO_BROADCAST failed: %m"); + log_unit_warning_errno(UNIT(s), r, "SO_BROADCAST failed, ignoring: %m"); } if (s->pass_cred) { r = setsockopt_int(fd, SOL_SOCKET, SO_PASSCRED, true); if (r < 0) - log_unit_warning_errno(UNIT(s), r, "SO_PASSCRED failed: %m"); + log_unit_warning_errno(UNIT(s), r, "SO_PASSCRED failed, ignoring: %m"); } if (s->pass_sec) { r = setsockopt_int(fd, SOL_SOCKET, SO_PASSSEC, true); if (r < 0) - log_unit_full_errno(UNIT(s), ERRNO_IS_NEG_NOT_SUPPORTED(r) ? LOG_DEBUG : LOG_WARNING, r, "SO_PASSSEC failed: %m"); + log_unit_full_errno(UNIT(s), ERRNO_IS_NEG_NOT_SUPPORTED(r) ? LOG_DEBUG : LOG_WARNING, r, "SO_PASSSEC failed, ignoring: %m"); } if (s->pass_pktinfo) { r = socket_set_recvpktinfo(fd, socket_address_family(&p->address), true); if (r < 0) - log_unit_warning_errno(UNIT(s), r, "Failed to enable packet info socket option: %m"); + log_unit_warning_errno(UNIT(s), r, "Failed to enable packet info socket option, ignoring: %m"); } if (s->timestamping != SOCKET_TIMESTAMPING_OFF) { @@ -1095,55 +1095,55 @@ static void socket_apply_socket_options(Socket *s, SocketPort *p, int fd) { if (s->priority >= 0) { r = setsockopt_int(fd, SOL_SOCKET, SO_PRIORITY, s->priority); if (r < 0) - log_unit_warning_errno(UNIT(s), r, "SO_PRIORITY failed: %m"); + log_unit_warning_errno(UNIT(s), r, "SO_PRIORITY failed, ignoring: %m"); } if (s->receive_buffer > 0) { r = fd_set_rcvbuf(fd, s->receive_buffer, false); if (r < 0) log_unit_full_errno(UNIT(s), ERRNO_IS_PRIVILEGE(r) ? LOG_DEBUG : LOG_WARNING, r, - "SO_RCVBUF/SO_RCVBUFFORCE failed: %m"); + "SO_RCVBUF/SO_RCVBUFFORCE failed, ignoring: %m"); } if (s->send_buffer > 0) { r = fd_set_sndbuf(fd, s->send_buffer, false); if (r < 0) log_unit_full_errno(UNIT(s), ERRNO_IS_PRIVILEGE(r) ? LOG_DEBUG : LOG_WARNING, r, - "SO_SNDBUF/SO_SNDBUFFORCE failed: %m"); + "SO_SNDBUF/SO_SNDBUFFORCE failed, ignoring: %m"); } if (s->mark >= 0) { r = setsockopt_int(fd, SOL_SOCKET, SO_MARK, s->mark); if (r < 0) - log_unit_warning_errno(UNIT(s), r, "SO_MARK failed: %m"); + log_unit_warning_errno(UNIT(s), r, "SO_MARK failed, ignoring: %m"); } if (s->ip_tos >= 0) { r = setsockopt_int(fd, IPPROTO_IP, IP_TOS, s->ip_tos); if (r < 0) - log_unit_warning_errno(UNIT(s), r, "IP_TOS failed: %m"); + log_unit_warning_errno(UNIT(s), r, "IP_TOS failed, ignoring: %m"); } if (s->ip_ttl >= 0) { r = socket_set_ttl(fd, socket_address_family(&p->address), s->ip_ttl); if (r < 0) - log_unit_warning_errno(UNIT(s), r, "IP_TTL/IPV6_UNICAST_HOPS failed: %m"); + log_unit_warning_errno(UNIT(s), r, "IP_TTL/IPV6_UNICAST_HOPS failed, ignoring: %m"); } if (s->tcp_congestion) if (setsockopt(fd, SOL_TCP, TCP_CONGESTION, s->tcp_congestion, strlen(s->tcp_congestion)+1) < 0) - log_unit_warning_errno(UNIT(s), errno, "TCP_CONGESTION failed: %m"); + log_unit_warning_errno(UNIT(s), errno, "TCP_CONGESTION failed, ignoring: %m"); if (s->smack_ip_in) { r = mac_smack_apply_fd(fd, SMACK_ATTR_IPIN, s->smack_ip_in); if (r < 0) - log_unit_error_errno(UNIT(s), r, "mac_smack_apply_ip_in_fd: %m"); + log_unit_error_errno(UNIT(s), r, "Failed to apply SMACK label for IP input, ignoring: %m"); } if (s->smack_ip_out) { r = mac_smack_apply_fd(fd, SMACK_ATTR_IPOUT, s->smack_ip_out); if (r < 0) - log_unit_error_errno(UNIT(s), r, "mac_smack_apply_ip_out_fd: %m"); + log_unit_error_errno(UNIT(s), r, "Failed to apply SMACK label for IP output, ignoring: %m"); } } diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c index 8d2459b340c..a428108d145 100644 --- a/src/journal/journald-native.c +++ b/src/journal/journald-native.c @@ -493,7 +493,7 @@ int manager_open_native_socket(Manager *m, const char *native_socket) { if (mac_selinux_use()) { r = setsockopt_int(m->native_fd, SOL_SOCKET, SO_PASSSEC, true); if (r < 0) - log_full_errno(ERRNO_IS_NEG_NOT_SUPPORTED(r) ? LOG_DEBUG : LOG_WARNING, r, "SO_PASSSEC failed: %m"); + log_full_errno(ERRNO_IS_NEG_NOT_SUPPORTED(r) ? LOG_DEBUG : LOG_WARNING, r, "SO_PASSSEC failed, ignoring: %m"); } r = setsockopt_int(m->native_fd, SOL_SOCKET, SO_TIMESTAMP, true); diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c index 3ef36ee7744..f441476f1d6 100644 --- a/src/journal/journald-syslog.c +++ b/src/journal/journald-syslog.c @@ -509,7 +509,7 @@ int manager_open_syslog_socket(Manager *m, const char *syslog_socket) { if (mac_selinux_use()) { r = setsockopt_int(m->syslog_fd, SOL_SOCKET, SO_PASSSEC, true); if (r < 0) - log_full_errno(ERRNO_IS_NEG_NOT_SUPPORTED(r) ? LOG_DEBUG : LOG_WARNING, r, "SO_PASSSEC failed: %m"); + log_full_errno(ERRNO_IS_NEG_NOT_SUPPORTED(r) ? LOG_DEBUG : LOG_WARNING, r, "SO_PASSSEC failed, ignoring: %m"); } r = setsockopt_int(m->syslog_fd, SOL_SOCKET, SO_TIMESTAMP, true); -- 2.47.3