diff options
| author | Lennart Poettering <lennart@poettering.net> | 2023-04-13 10:29:34 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2023-04-13 10:49:23 +0200 |
| commit | b1d02191366794dedc345a4c6dc9ebb2adf53bf6 (patch) | |
| tree | 79418a94a5874c100e7da59845ed777951025d12 /src/libsystemd-network | |
| parent | 79dec6f5cc0b72d43dfb0469fa68b5cd023fbaf9 (diff) | |
| download | systemd-b1d02191366794dedc345a4c6dc9ebb2adf53bf6.tar.gz | |
tree-wide: port more code over to CMSG_TYPED_DATA()
Diffstat (limited to 'src/libsystemd-network')
| -rw-r--r-- | src/libsystemd-network/icmp6-util.c | 4 | ||||
| -rw-r--r-- | src/libsystemd-network/sd-dhcp-client.c | 2 | ||||
| -rw-r--r-- | src/libsystemd-network/sd-dhcp-server.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/libsystemd-network/icmp6-util.c b/src/libsystemd-network/icmp6-util.c index 00a59291a1..fba5c3bd96 100644 --- a/src/libsystemd-network/icmp6-util.c +++ b/src/libsystemd-network/icmp6-util.c @@ -192,7 +192,7 @@ int icmp6_receive(int fd, void *buffer, size_t size, struct in6_addr *ret_dst, if (cmsg->cmsg_level == SOL_IPV6 && cmsg->cmsg_type == IPV6_HOPLIMIT && cmsg->cmsg_len == CMSG_LEN(sizeof(int))) { - int hops = *(int*) CMSG_DATA(cmsg); + int hops = *CMSG_TYPED_DATA(cmsg, int); if (hops != 255) return -EMULTIHOP; @@ -201,7 +201,7 @@ int icmp6_receive(int fd, void *buffer, size_t size, struct in6_addr *ret_dst, if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SO_TIMESTAMP && cmsg->cmsg_len == CMSG_LEN(sizeof(struct timeval))) - triple_timestamp_from_realtime(&t, timeval_load((struct timeval*) CMSG_DATA(cmsg))); + triple_timestamp_from_realtime(&t, timeval_load(CMSG_TYPED_DATA(cmsg, struct timeval))); } if (!triple_timestamp_is_set(&t)) diff --git a/src/libsystemd-network/sd-dhcp-client.c b/src/libsystemd-network/sd-dhcp-client.c index cffe7ba917..f207cf0c1e 100644 --- a/src/libsystemd-network/sd-dhcp-client.c +++ b/src/libsystemd-network/sd-dhcp-client.c @@ -1981,7 +1981,7 @@ static int client_receive_message_raw( cmsg = cmsg_find(&msg, SOL_PACKET, PACKET_AUXDATA, CMSG_LEN(sizeof(struct tpacket_auxdata))); if (cmsg) { - struct tpacket_auxdata *aux = (struct tpacket_auxdata*) CMSG_DATA(cmsg); + struct tpacket_auxdata *aux = CMSG_TYPED_DATA(cmsg, struct tpacket_auxdata); checksum = !(aux->tp_status & TP_STATUS_CSUMNOTREADY); } diff --git a/src/libsystemd-network/sd-dhcp-server.c b/src/libsystemd-network/sd-dhcp-server.c index 5de230aaed..15a0145959 100644 --- a/src/libsystemd-network/sd-dhcp-server.c +++ b/src/libsystemd-network/sd-dhcp-server.c @@ -1310,7 +1310,7 @@ static int server_receive_message(sd_event_source *s, int fd, if (cmsg->cmsg_level == IPPROTO_IP && cmsg->cmsg_type == IP_PKTINFO && cmsg->cmsg_len == CMSG_LEN(sizeof(struct in_pktinfo))) { - struct in_pktinfo *info = (struct in_pktinfo*)CMSG_DATA(cmsg); + struct in_pktinfo *info = CMSG_TYPED_DATA(cmsg, struct in_pktinfo); /* TODO figure out if this can be done as a filter on * the socket, like for IPv6 */ |