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/resolve | |
| parent | 79dec6f5cc0b72d43dfb0469fa68b5cd023fbaf9 (diff) | |
| download | systemd-b1d02191366794dedc345a4c6dc9ebb2adf53bf6.tar.gz | |
tree-wide: port more code over to CMSG_TYPED_DATA()
Diffstat (limited to 'src/resolve')
| -rw-r--r-- | src/resolve/resolved-dns-stream.c | 8 | ||||
| -rw-r--r-- | src/resolve/resolved-manager.c | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/resolve/resolved-dns-stream.c b/src/resolve/resolved-dns-stream.c index 0a10a0d17e..85e4762ba2 100644 --- a/src/resolve/resolved-dns-stream.c +++ b/src/resolve/resolved-dns-stream.c @@ -147,7 +147,7 @@ static int dns_stream_identify(DnsStream *s) { switch (cmsg->cmsg_type) { case IPV6_PKTINFO: { - struct in6_pktinfo *i = (struct in6_pktinfo*) CMSG_DATA(cmsg); + struct in6_pktinfo *i = CMSG_TYPED_DATA(cmsg, struct in6_pktinfo); if (s->ifindex <= 0) s->ifindex = i->ipi6_ifindex; @@ -155,7 +155,7 @@ static int dns_stream_identify(DnsStream *s) { } case IPV6_HOPLIMIT: - s->ttl = *(int *) CMSG_DATA(cmsg); + s->ttl = *CMSG_TYPED_DATA(cmsg, int); break; } @@ -165,7 +165,7 @@ static int dns_stream_identify(DnsStream *s) { switch (cmsg->cmsg_type) { case IP_PKTINFO: { - struct in_pktinfo *i = (struct in_pktinfo*) CMSG_DATA(cmsg); + struct in_pktinfo *i = CMSG_TYPED_DATA(cmsg, struct in_pktinfo); if (s->ifindex <= 0) s->ifindex = i->ipi_ifindex; @@ -173,7 +173,7 @@ static int dns_stream_identify(DnsStream *s) { } case IP_TTL: - s->ttl = *(int *) CMSG_DATA(cmsg); + s->ttl = *CMSG_TYPED_DATA(cmsg, int); break; } } diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c index 57e26f4975..e5e1411a13 100644 --- a/src/resolve/resolved-manager.c +++ b/src/resolve/resolved-manager.c @@ -834,7 +834,7 @@ int manager_recv(Manager *m, int fd, DnsProtocol protocol, DnsPacket **ret) { switch (cmsg->cmsg_type) { case IPV6_PKTINFO: { - struct in6_pktinfo *i = (struct in6_pktinfo*) CMSG_DATA(cmsg); + struct in6_pktinfo *i = CMSG_TYPED_DATA(cmsg, struct in6_pktinfo); if (p->ifindex <= 0) p->ifindex = i->ipi6_ifindex; @@ -844,11 +844,11 @@ int manager_recv(Manager *m, int fd, DnsProtocol protocol, DnsPacket **ret) { } case IPV6_HOPLIMIT: - p->ttl = *(int *) CMSG_DATA(cmsg); + p->ttl = *CMSG_TYPED_DATA(cmsg, int); break; case IPV6_RECVFRAGSIZE: - p->fragsize = *(int *) CMSG_DATA(cmsg); + p->fragsize = *CMSG_TYPED_DATA(cmsg, int); break; } } else if (cmsg->cmsg_level == IPPROTO_IP) { @@ -857,7 +857,7 @@ int manager_recv(Manager *m, int fd, DnsProtocol protocol, DnsPacket **ret) { switch (cmsg->cmsg_type) { case IP_PKTINFO: { - struct in_pktinfo *i = (struct in_pktinfo*) CMSG_DATA(cmsg); + struct in_pktinfo *i = CMSG_TYPED_DATA(cmsg, struct in_pktinfo); if (p->ifindex <= 0) p->ifindex = i->ipi_ifindex; @@ -867,11 +867,11 @@ int manager_recv(Manager *m, int fd, DnsProtocol protocol, DnsPacket **ret) { } case IP_TTL: - p->ttl = *(int *) CMSG_DATA(cmsg); + p->ttl = *CMSG_TYPED_DATA(cmsg, int); break; case IP_RECVFRAGSIZE: - p->fragsize = *(int *) CMSG_DATA(cmsg); + p->fragsize = *CMSG_TYPED_DATA(cmsg, int); break; } } |