diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2023-04-13 18:34:59 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2023-04-16 13:26:58 +0900 |
| commit | b5d39bb3cae7e36c284fcfcc87a42ff8a2bae7f5 (patch) | |
| tree | 339fb56fc9f0c8292db75e60d8c5bcca45bf06ee | |
| parent | 1ebb0953f01051cd85dd5d0a03acf309a8f3c3b9 (diff) | |
| download | systemd-b5d39bb3cae7e36c284fcfcc87a42ff8a2bae7f5.tar.gz | |
tree-wide: also use CMSG_TYPED_DATA() on writing message header
| -rw-r--r-- | src/libsystemd-network/sd-dhcp-server.c | 2 | ||||
| -rw-r--r-- | src/libsystemd/sd-daemon/sd-daemon.c | 2 | ||||
| -rw-r--r-- | src/resolve/resolved-manager.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/libsystemd-network/sd-dhcp-server.c b/src/libsystemd-network/sd-dhcp-server.c index b9c77eafa5..05c0cddfd0 100644 --- a/src/libsystemd-network/sd-dhcp-server.c +++ b/src/libsystemd-network/sd-dhcp-server.c @@ -407,7 +407,7 @@ static int dhcp_server_send_udp(sd_dhcp_server *server, be32_t destination, rather than binding the socket. This will be mostly useful when we gain support for arbitrary number of server addresses */ - pktinfo = (struct in_pktinfo*) CMSG_DATA(cmsg); + pktinfo = CMSG_TYPED_DATA(cmsg, struct in_pktinfo); assert(pktinfo); pktinfo->ipi_ifindex = server->ifindex; diff --git a/src/libsystemd/sd-daemon/sd-daemon.c b/src/libsystemd/sd-daemon/sd-daemon.c index 8dc11aeb30..f2f295d6e4 100644 --- a/src/libsystemd/sd-daemon/sd-daemon.c +++ b/src/libsystemd/sd-daemon/sd-daemon.c @@ -567,7 +567,7 @@ _public_ int sd_pid_notify_with_fds( cmsg->cmsg_type = SCM_CREDENTIALS; cmsg->cmsg_len = CMSG_LEN(sizeof(struct ucred)); - ucred = (struct ucred*) CMSG_DATA(cmsg); + ucred = CMSG_TYPED_DATA(cmsg, struct ucred); ucred->pid = pid != 0 ? pid : getpid_cached(); ucred->uid = getuid(); ucred->gid = getgid(); diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c index e5e1411a13..184d8e3f3d 100644 --- a/src/resolve/resolved-manager.c +++ b/src/resolve/resolved-manager.c @@ -1017,7 +1017,7 @@ static int manager_ipv4_send( cmsg->cmsg_level = IPPROTO_IP; cmsg->cmsg_type = IP_PKTINFO; - pi = (struct in_pktinfo*) CMSG_DATA(cmsg); + pi = CMSG_TYPED_DATA(cmsg, struct in_pktinfo); pi->ipi_ifindex = ifindex; if (source) @@ -1073,7 +1073,7 @@ static int manager_ipv6_send( cmsg->cmsg_level = IPPROTO_IPV6; cmsg->cmsg_type = IPV6_PKTINFO; - pi = (struct in6_pktinfo*) CMSG_DATA(cmsg); + pi = CMSG_TYPED_DATA(cmsg, struct in6_pktinfo); pi->ipi6_ifindex = ifindex; if (source) |