From c7f46150bb0e8ca8e9bec1dbf4f73563c9fea146 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 23 Feb 2024 13:12:57 +0900 Subject: [PATCH] in-addr-util: introduce in{4,6}_addr_is_multicast() --- src/basic/in-addr-util.c | 16 ++++++++++++++-- src/basic/in-addr-util.h | 2 ++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/basic/in-addr-util.c b/src/basic/in-addr-util.c index 8bd9c75d596..82c8ff9a2d4 100644 --- a/src/basic/in-addr-util.c +++ b/src/basic/in-addr-util.c @@ -91,14 +91,26 @@ bool in6_addr_is_link_local_all_nodes(const struct in6_addr *a) { be32toh(a->s6_addr32[3]) == UINT32_C(0x00000001); } +bool in4_addr_is_multicast(const struct in_addr *a) { + assert(a); + + return IN_MULTICAST(be32toh(a->s_addr)); +} + +bool in6_addr_is_multicast(const struct in6_addr *a) { + assert(a); + + return IN6_IS_ADDR_MULTICAST(a); +} + int in_addr_is_multicast(int family, const union in_addr_union *u) { assert(u); if (family == AF_INET) - return IN_MULTICAST(be32toh(u->in.s_addr)); + return in4_addr_is_multicast(&u->in); if (family == AF_INET6) - return IN6_IS_ADDR_MULTICAST(&u->in6); + return in6_addr_is_multicast(&u->in6); return -EAFNOSUPPORT; } diff --git a/src/basic/in-addr-util.h b/src/basic/in-addr-util.h index 9fae3cae453..5c820c6ec6a 100644 --- a/src/basic/in-addr-util.h +++ b/src/basic/in-addr-util.h @@ -40,6 +40,8 @@ static inline bool in_addr_data_is_set(const struct in_addr_data *a) { return in_addr_data_is_null(a); } +bool in4_addr_is_multicast(const struct in_addr *a); +bool in6_addr_is_multicast(const struct in6_addr *a); int in_addr_is_multicast(int family, const union in_addr_union *u); bool in4_addr_is_link_local(const struct in_addr *a); -- 2.47.3