diff options
31 files changed, 99 insertions, 101 deletions
diff --git a/src/libsystemd-network/icmp6-util.c b/src/libsystemd-network/icmp6-util.c index 4af012534a..d079ad40e9 100644 --- a/src/libsystemd-network/icmp6-util.c +++ b/src/libsystemd-network/icmp6-util.c @@ -145,8 +145,8 @@ int icmp6_send_router_solicitation(int s, const struct ether_addr *ether_addr) { return 0; } -int icmp6_receive(int fd, void *buffer, size_t size, struct in6_addr *dst, - triple_timestamp *timestamp) { +int icmp6_receive(int fd, void *buffer, size_t size, struct in6_addr *ret_dst, + triple_timestamp *ret_timestamp) { CMSG_BUFFER_TYPE(CMSG_SPACE(sizeof(int)) + /* ttl */ CMSG_SPACE(sizeof(struct timeval))) control; @@ -161,6 +161,8 @@ int icmp6_receive(int fd, void *buffer, size_t size, struct in6_addr *dst, .msg_controllen = sizeof(control), }; struct cmsghdr *cmsg; + struct in6_addr addr = {}; + triple_timestamp t; ssize_t len; iov = IOVEC_MAKE(buffer, size); @@ -175,8 +177,8 @@ int icmp6_receive(int fd, void *buffer, size_t size, struct in6_addr *dst, if (msg.msg_namelen == sizeof(struct sockaddr_in6) && sa.in6.sin6_family == AF_INET6) { - *dst = sa.in6.sin6_addr; - if (in_addr_is_link_local(AF_INET6, (union in_addr_union*) dst) <= 0) + addr = sa.in6.sin6_addr; + if (!in6_addr_is_link_local(&addr)) return -EADDRNOTAVAIL; } else if (msg.msg_namelen > 0) @@ -200,11 +202,13 @@ int icmp6_receive(int fd, void *buffer, size_t size, struct in6_addr *dst, if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SO_TIMESTAMP && cmsg->cmsg_len == CMSG_LEN(sizeof(struct timeval))) - triple_timestamp_from_realtime(timestamp, timeval_load((struct timeval*) CMSG_DATA(cmsg))); + triple_timestamp_from_realtime(&t, timeval_load((struct timeval*) CMSG_DATA(cmsg))); } - if (!triple_timestamp_is_set(timestamp)) - triple_timestamp_get(timestamp); + if (!triple_timestamp_is_set(&t)) + triple_timestamp_get(&t); + *ret_dst = addr; + *ret_timestamp = t; return 0; } diff --git a/src/libsystemd-network/icmp6-util.h b/src/libsystemd-network/icmp6-util.h index 50d21b5b59..f7ad26b5e6 100644 --- a/src/libsystemd-network/icmp6-util.h +++ b/src/libsystemd-network/icmp6-util.h @@ -20,5 +20,5 @@ int icmp6_bind_router_solicitation(int ifindex); int icmp6_bind_router_advertisement(int ifindex); int icmp6_send_router_solicitation(int s, const struct ether_addr *ether_addr); -int icmp6_receive(int fd, void *buffer, size_t size, struct in6_addr *dst, - triple_timestamp *timestamp); +int icmp6_receive(int fd, void *buffer, size_t size, struct in6_addr *ret_dst, + triple_timestamp *ret_timestamp); diff --git a/src/libsystemd-network/ndisc-router.c b/src/libsystemd-network/ndisc-router.c index 3cb71dbdac..c88293a923 100644 --- a/src/libsystemd-network/ndisc-router.c +++ b/src/libsystemd-network/ndisc-router.c @@ -56,7 +56,7 @@ _public_ int sd_ndisc_router_get_address(sd_ndisc_router *rt, struct in6_addr *r assert_return(rt, -EINVAL); assert_return(ret_addr, -EINVAL); - if (IN6_IS_ADDR_UNSPECIFIED(&rt->address)) + if (in6_addr_is_null(&rt->address)) return -ENODATA; *ret_addr = rt->address; diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c index f362770c4f..2184073f19 100644 --- a/src/libsystemd-network/sd-dhcp6-client.c +++ b/src/libsystemd-network/sd-dhcp6-client.c @@ -171,7 +171,7 @@ int sd_dhcp6_client_set_local_address( assert_return(client, -EINVAL); assert_return(local_address, -EINVAL); - assert_return(in_addr_is_link_local(AF_INET6, (const union in_addr_union *) local_address) > 0, -EINVAL); + assert_return(in6_addr_is_link_local(local_address) > 0, -EINVAL); assert_return(IN_SET(client->state, DHCP6_STATE_STOPPED), -EBUSY); @@ -1693,7 +1693,7 @@ int sd_dhcp6_client_start(sd_dhcp6_client *client) { assert_return(client, -EINVAL); assert_return(client->event, -EINVAL); assert_return(client->ifindex > 0, -EINVAL); - assert_return(in_addr_is_link_local(AF_INET6, (const union in_addr_union *) &client->local_address) > 0, -EINVAL); + assert_return(in6_addr_is_link_local(&client->local_address) > 0, -EINVAL); if (!IN_SET(client->state, DHCP6_STATE_STOPPED)) return -EBUSY; diff --git a/src/libsystemd-network/sd-ipv4ll.c b/src/libsystemd-network/sd-ipv4ll.c index 3af7d89bf0..a83c9b06de 100644 --- a/src/libsystemd-network/sd-ipv4ll.c +++ b/src/libsystemd-network/sd-ipv4ll.c @@ -186,7 +186,7 @@ int sd_ipv4ll_is_running(sd_ipv4ll *ll) { static bool ipv4ll_address_is_valid(const struct in_addr *address) { assert(address); - if (!in_addr_is_link_local(AF_INET, (const union in_addr_union *) address)) + if (!in4_addr_is_link_local(address)) return false; return !IN_SET(be32toh(address->s_addr) & 0x0000FF00U, 0x0000U, 0xFF00U); diff --git a/src/libsystemd-network/sd-radv.c b/src/libsystemd-network/sd-radv.c index 8beb845d79..b34263568e 100644 --- a/src/libsystemd-network/sd-radv.c +++ b/src/libsystemd-network/sd-radv.c @@ -167,7 +167,7 @@ static int radv_send(sd_radv *ra, const struct in6_addr *dst, uint32_t router_li if (r < 0) return r; - if (dst && !IN6_IS_ADDR_UNSPECIFIED(dst)) + if (dst && in6_addr_is_set(dst)) dst_addr.sin6_addr = *dst; adv.nd_ra_type = ND_ROUTER_ADVERT; @@ -536,7 +536,7 @@ _public_ int sd_radv_add_prefix(sd_radv *ra, sd_radv_prefix *p, int dynamic) { return -EINVAL; /* Refuse prefixes that don't have a prefix set */ - if (IN6_IS_ADDR_UNSPECIFIED(&p->opt.in6_addr)) + if (in6_addr_is_null(&p->opt.in6_addr)) return -ENOEXEC; LIST_FOREACH(prefix, cur, ra->prefixes) { @@ -631,9 +631,7 @@ _public_ sd_radv_prefix *sd_radv_remove_prefix(sd_radv *ra, if (prefixlen != cur->opt.prefixlen) continue; - if (!in_addr_equal(AF_INET6, - (union in_addr_union *)prefix, - (union in_addr_union *)&cur->opt.in6_addr)) + if (!in6_addr_equal(prefix, &cur->opt.in6_addr)) continue; LIST_REMOVE(prefix, ra->prefixes, cur); diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c index 492bb68e32..ae673ddf5b 100644 --- a/src/network/generator/network-generator.c +++ b/src/network/generator/network-generator.c @@ -360,7 +360,7 @@ static int network_set_address(Context *context, const char *ifname, int family, union in_addr_union *addr, union in_addr_union *peer) { Network *network; - if (in_addr_is_null(family, addr) != 0) + if (!in_addr_is_set(family, addr)) return 0; network = network_get(context, ifname); @@ -375,7 +375,7 @@ static int network_set_route(Context *context, const char *ifname, int family, u Network *network; int r; - if (in_addr_is_null(family, gateway) != 0) + if (!in_addr_is_set(family, gateway)) return 0; network = network_get(context, ifname); @@ -1000,7 +1000,7 @@ static int address_dump(Address *address, FILE *f) { if (r < 0) return r; - if (in_addr_is_null(address->family, &address->peer) == 0) { + if (in_addr_is_set(address->family, &address->peer)) { r = in_addr_to_string(address->family, &address->peer, &peer); if (r < 0) return r; @@ -1021,7 +1021,7 @@ static int route_dump(Route *route, FILE *f) { _cleanup_free_ char *dest = NULL, *gateway = NULL; int r; - if (in_addr_is_null(route->family, &route->dest) == 0) { + if (in_addr_is_set(route->family, &route->dest)) { r = in_addr_prefix_to_string(route->family, &route->dest, route->prefixlen, &dest); if (r < 0) return r; diff --git a/src/network/netdev/geneve.c b/src/network/netdev/geneve.c index edf92ec93c..fd0b5119e7 100644 --- a/src/network/netdev/geneve.c +++ b/src/network/netdev/geneve.c @@ -90,7 +90,7 @@ static int netdev_geneve_create(NetDev *netdev) { return log_netdev_error_errno(netdev, r, "Could not append IFLA_GENEVE_ID attribute: %m"); } - if (in_addr_is_null(v->remote_family, &v->remote) == 0) { + if (in_addr_is_set(v->remote_family, &v->remote)) { if (v->remote_family == AF_INET) r = sd_netlink_message_append_in_addr(m, IFLA_GENEVE_REMOTE, &v->remote.in); else diff --git a/src/network/netdev/l2tp-tunnel.c b/src/network/netdev/l2tp-tunnel.c index a909b15764..32ec024558 100644 --- a/src/network/netdev/l2tp-tunnel.c +++ b/src/network/netdev/l2tp-tunnel.c @@ -252,7 +252,7 @@ static int l2tp_acquire_local_address_one(L2tpTunnel *t, Address *a, union in_ad if (a->family != t->family) return -EINVAL; - if (in_addr_is_null(a->family, &a->in_addr_peer) <= 0) + if (in_addr_is_set(a->family, &a->in_addr_peer)) return -EINVAL; if (t->local_address_type == NETDEV_L2TP_LOCAL_ADDRESS_STATIC && @@ -275,7 +275,7 @@ static int l2tp_acquire_local_address(L2tpTunnel *t, Link *link, union in_addr_u assert(ret); assert(IN_SET(t->family, AF_INET, AF_INET6)); - if (!in_addr_is_null(t->family, &t->local)) { + if (in_addr_is_set(t->family, &t->local)) { /* local address is explicitly specified. */ *ret = t->local; return 0; @@ -435,7 +435,7 @@ int config_parse_l2tp_tunnel_address( addr_type = l2tp_local_address_type_from_string(rvalue); if (addr_type >= 0) { - if (in_addr_is_null(t->family, &t->remote) != 0) + if (!in_addr_is_set(t->family, &t->remote)) /* If Remote= is not specified yet, then also clear family. */ t->family = AF_UNSPEC; @@ -682,7 +682,7 @@ static int netdev_l2tp_tunnel_verify(NetDev *netdev, const char *filename) { "%s: L2TP tunnel with invalid address family configured. Ignoring", filename); - if (in_addr_is_null(t->family, &t->remote)) + if (!in_addr_is_set(t->family, &t->remote)) return log_netdev_error_errno(netdev, SYNTHETIC_ERRNO(EINVAL), "%s: L2TP tunnel without a remote address configured. Ignoring", filename); diff --git a/src/network/netdev/tunnel.c b/src/network/netdev/tunnel.c index fdaec488a2..2fab269397 100644 --- a/src/network/netdev/tunnel.c +++ b/src/network/netdev/tunnel.c @@ -468,7 +468,7 @@ static int netdev_tunnel_verify(NetDev *netdev, const char *filename) { "vti/ipip/sit/gre tunnel without a local/remote IPv4 address configured in %s. Ignoring", filename); if (IN_SET(netdev->kind, NETDEV_KIND_GRETAP, NETDEV_KIND_ERSPAN) && - (t->family != AF_INET || in_addr_is_null(t->family, &t->remote))) + (t->family != AF_INET || !in_addr_is_set(t->family, &t->remote))) return log_netdev_error_errno(netdev, SYNTHETIC_ERRNO(EINVAL), "gretap/erspan tunnel without a remote IPv4 address configured in %s. Ignoring", filename); @@ -478,7 +478,7 @@ static int netdev_tunnel_verify(NetDev *netdev, const char *filename) { "vti6/ip6tnl/ip6gre tunnel without a local/remote IPv6 address configured in %s. Ignoring", filename); if (netdev->kind == NETDEV_KIND_IP6GRETAP && - (t->family != AF_INET6 || in_addr_is_null(t->family, &t->remote))) + (t->family != AF_INET6 || !in_addr_is_set(t->family, &t->remote))) return log_netdev_error_errno(netdev, SYNTHETIC_ERRNO(EINVAL), "ip6gretap tunnel without a remote IPv6 address configured in %s. Ignoring", filename); @@ -530,11 +530,9 @@ int config_parse_tunnel_address(const char *unit, *addr = IN_ADDR_NULL; /* As a special case, if both the local and remote addresses are - * unspecified, also clear the address family. - */ - if (t->family != AF_UNSPEC && - in_addr_is_null(t->family, &t->local) != 0 && - in_addr_is_null(t->family, &t->remote) != 0) + * unspecified, also clear the address family. */ + if (!in_addr_is_set(t->family, &t->local) && + !in_addr_is_set(t->family, &t->remote)) t->family = AF_UNSPEC; return 0; } diff --git a/src/network/netdev/vxlan.c b/src/network/netdev/vxlan.c index 6748f67f8f..52d8b3736c 100644 --- a/src/network/netdev/vxlan.c +++ b/src/network/netdev/vxlan.c @@ -37,14 +37,14 @@ static int netdev_vxlan_fill_message_create(NetDev *netdev, Link *link, sd_netli return log_netdev_error_errno(netdev, r, "Could not append IFLA_VXLAN_ID attribute: %m"); } - if (in_addr_is_null(v->group_family, &v->group) == 0) { + if (in_addr_is_set(v->group_family, &v->group)) { if (v->group_family == AF_INET) r = sd_netlink_message_append_in_addr(m, IFLA_VXLAN_GROUP, &v->group.in); else r = sd_netlink_message_append_in6_addr(m, IFLA_VXLAN_GROUP6, &v->group.in6); if (r < 0) return log_netdev_error_errno(netdev, r, "Could not append IFLA_VXLAN_GROUP attribute: %m"); - } else if (in_addr_is_null(v->remote_family, &v->remote) == 0) { + } else if (in_addr_is_set(v->remote_family, &v->remote)) { if (v->remote_family == AF_INET) r = sd_netlink_message_append_in_addr(m, IFLA_VXLAN_GROUP, &v->remote.in); else @@ -53,7 +53,7 @@ static int netdev_vxlan_fill_message_create(NetDev *netdev, Link *link, sd_netli return log_netdev_error_errno(netdev, r, "Could not append IFLA_VXLAN_GROUP attribute: %m"); } - if (in_addr_is_null(v->local_family, &v->local) == 0) { + if (in_addr_is_set(v->local_family, &v->local)) { if (v->local_family == AF_INET) r = sd_netlink_message_append_in_addr(m, IFLA_VXLAN_LOCAL, &v->local.in); else @@ -354,7 +354,7 @@ static int netdev_vxlan_verify(NetDev *netdev, const char *filename) { if (!v->dest_port && v->generic_protocol_extension) v->dest_port = 4790; - if (in_addr_is_null(v->group_family, &v->group) == 0 && in_addr_is_null(v->remote_family, &v->remote) == 0) + if (in_addr_is_set(v->group_family, &v->group) && in_addr_is_set(v->remote_family, &v->remote)) return log_netdev_warning_errno(netdev, SYNTHETIC_ERRNO(EINVAL), "%s: VXLAN both 'Group=' and 'Remote=' cannot be specified. Ignoring.", filename); diff --git a/src/network/networkctl.c b/src/network/networkctl.c index 1dd3438abd..763d5ef37d 100644 --- a/src/network/networkctl.c +++ b/src/network/networkctl.c @@ -1787,7 +1787,7 @@ static int link_status_one( if (r < 0) return table_log_add_error(r); } else if (STRPTR_IN_SET(info->netdev_kind, "ipip", "sit", "gre", "gretap", "erspan", "vti")) { - if (!in_addr_is_null(AF_INET, &info->local)) { + if (in_addr_is_set(AF_INET, &info->local)) { r = table_add_many(table, TABLE_EMPTY, TABLE_STRING, "Local:", @@ -1796,7 +1796,7 @@ static int link_status_one( return table_log_add_error(r); } - if (!in_addr_is_null(AF_INET, &info->remote)) { + if (in_addr_is_set(AF_INET, &info->remote)) { r = table_add_many(table, TABLE_EMPTY, TABLE_STRING, "Remote:", @@ -1805,7 +1805,7 @@ static int link_status_one( return table_log_add_error(r); } } else if (STRPTR_IN_SET(info->netdev_kind, "ip6gre", "ip6gretap", "ip6erspan", "vti6")) { - if (!in_addr_is_null(AF_INET6, &info->local)) { + if (in_addr_is_set(AF_INET6, &info->local)) { r = table_add_many(table, TABLE_EMPTY, TABLE_STRING, "Local:", @@ -1814,7 +1814,7 @@ static int link_status_one( return table_log_add_error(r); } - if (!in_addr_is_null(AF_INET6, &info->remote)) { + if (in_addr_is_set(AF_INET6, &info->remote)) { r = table_add_many(table, TABLE_EMPTY, TABLE_STRING, "Remote:", @@ -1830,14 +1830,14 @@ static int link_status_one( if (r < 0) return table_log_add_error(r); - if (info->has_tunnel_ipv4 && !in_addr_is_null(AF_INET, &info->remote)) { + if (info->has_tunnel_ipv4 && in_addr_is_set(AF_INET, &info->remote)) { r = table_add_many(table, TABLE_EMPTY, TABLE_STRING, "Remote:", TABLE_IN_ADDR, &info->remote); if (r < 0) return table_log_add_error(r); - } else if (!in_addr_is_null(AF_INET6, &info->remote)) { + } else if (in_addr_is_set(AF_INET6, &info->remote)) { r = table_add_many(table, TABLE_EMPTY, TABLE_STRING, "Remote:", diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c index d862e45e61..dd7c28ec6e 100644 --- a/src/network/networkd-address.c +++ b/src/network/networkd-address.c @@ -130,7 +130,8 @@ Address *address_free(Address *address) { if (n->address == address) free(set_remove(address->link->ndisc_addresses, n)); - if (in_addr_equal(AF_INET6, &address->in_addr, (const union in_addr_union *) &address->link->ipv6ll_address)) + if (address->family == AF_INET6 && + in6_addr_equal(&address->in_addr.in6, &address->link->ipv6ll_address)) memzero(&address->link->ipv6ll_address, sizeof(struct in6_addr)); } @@ -147,7 +148,9 @@ static bool address_may_have_broadcast(const Address *a) { /* A /31 or /32 IPv4 address does not have a broadcast address. * See https://tools.ietf.org/html/rfc3021 */ - return a->family == AF_INET && in4_addr_is_null(&a->in_addr_peer.in) && a->prefixlen <= 30; + return a->family == AF_INET && + in_addr_is_null(AF_INET, &a->in_addr_peer) && + a->prefixlen <= 30; } static uint32_t address_prefix(const Address *a) { @@ -397,7 +400,7 @@ static int address_update(Address *address, const Address *src) { if (address->family == AF_INET6 && in_addr_is_link_local(AF_INET6, &address->in_addr) > 0 && - IN6_IS_ADDR_UNSPECIFIED(&address->link->ipv6ll_address) > 0) { + in6_addr_is_null(&address->link->ipv6ll_address)) { r = link_ipv6ll_gained(address->link, &address->in_addr.in6); if (r < 0) @@ -487,7 +490,7 @@ static void log_address_debug(const Address *address, const char *str, const Lin bool has_peer; (void) in_addr_to_string(address->family, &address->in_addr, &addr); - has_peer = in_addr_is_null(address->family, &address->in_addr_peer) == 0; + has_peer = in_addr_is_set(address->family, &address->in_addr_peer); if (has_peer) (void) in_addr_to_string(address->family, &address->in_addr_peer, &peer); @@ -788,10 +791,7 @@ static int address_acquire(Link *link, const Address *original, Address **ret) { assert(ret); /* Something useful was configured? just use it */ - r = in_addr_is_null(original->family, &original->in_addr); - if (r < 0) - return r; - if (r == 0) { + if (in_addr_is_set(original->family, &original->in_addr)) { *ret = NULL; return 0; } @@ -891,7 +891,7 @@ int address_configure( if (r < 0) return log_link_error_errno(link, r, "Could not set scope: %m"); - if (in_addr_is_null(address->family, &address->in_addr_peer) == 0) { + if (in_addr_is_set(address->family, &address->in_addr_peer)) { r = netlink_message_append_in_addr_union(req, IFA_ADDRESS, address->family, &address->in_addr_peer); if (r < 0) return log_link_error_errno(link, r, "Could not append IFA_ADDRESS attribute: %m"); diff --git a/src/network/networkd-dhcp-server.c b/src/network/networkd-dhcp-server.c index 9a9f1eabe5..2c533c6f8d 100644 --- a/src/network/networkd-dhcp-server.c +++ b/src/network/networkd-dhcp-server.c @@ -47,7 +47,7 @@ static Address* link_find_dhcp_server_address(Link *link) { /* The first statically configured address if there is any */ ORDERED_HASHMAP_FOREACH(address, link->network->addresses_by_section) if (address->family == AF_INET && - !in_addr_is_null(address->family, &address->in_addr)) + in_addr_is_set(address->family, &address->in_addr)) return address; /* If that didn't work, find a suitable address we got from the pool */ diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c index 1559e0cfd8..b0c783c774 100644 --- a/src/network/networkd-dhcp4.c +++ b/src/network/networkd-dhcp4.c @@ -122,7 +122,7 @@ static int route_scope_from_address(const Route *route, const struct in_addr *se assert(self_addr); if (in4_addr_is_localhost(&route->dst.in) || - (!in4_addr_is_null(self_addr) && in4_addr_equal(&route->dst.in, self_addr))) + (in4_addr_is_set(self_addr) && in4_addr_equal(&route->dst.in, self_addr))) return RT_SCOPE_HOST; else if (in4_addr_is_null(&route->gw.in)) return RT_SCOPE_LINK; @@ -835,7 +835,7 @@ static int dhcp4_update_address(Link *link, bool announce) { if (r < 0 && r != -ENODATA) return log_link_error_errno(link, r, "DHCP error: Could not get gateway: %m"); - if (r > 0 && !in4_addr_is_null(&router[0])) + if (r > 0 && in4_addr_is_set(&router[0])) log_struct(LOG_INFO, LOG_LINK_INTERFACE(link), LOG_LINK_MESSAGE(link, "DHCPv4 address "IPV4_ADDRESS_FMT_STR"/%u via "IPV4_ADDRESS_FMT_STR, diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c index eb9fabb2ae..bb37a0bf71 100644 --- a/src/network/networkd-dhcp6.c +++ b/src/network/networkd-dhcp6.c @@ -379,7 +379,7 @@ static int dhcp6_set_pd_address( address->in_addr = *prefix; - if (!in_addr_is_null(AF_INET6, &link->network->dhcp6_pd_token)) + if (in_addr_is_set(AF_INET6, &link->network->dhcp6_pd_token)) memcpy(address->in_addr.in6.s6_addr + 8, link->network->dhcp6_pd_token.in6.s6_addr + 8, 8); else { r = generate_ipv6_eui_64_address(link, &address->in_addr.in6); @@ -1235,7 +1235,7 @@ int dhcp6_request_address(Link *link, int ir) { assert(link); assert(link->dhcp6_client); assert(link->network); - assert(in_addr_is_link_local(AF_INET6, (const union in_addr_union*) &link->ipv6ll_address) > 0); + assert(in6_addr_is_link_local(&link->ipv6ll_address)); r = sd_dhcp6_client_is_running(link->dhcp6_client); if (r < 0) diff --git a/src/network/networkd-fdb.c b/src/network/networkd-fdb.c index 4cd430e8ae..e4e727038f 100644 --- a/src/network/networkd-fdb.c +++ b/src/network/networkd-fdb.c @@ -142,7 +142,7 @@ static int fdb_entry_configure(Link *link, FdbEntry *fdb_entry) { return log_link_error_errno(link, r, "Could not append NDA_VLAN attribute: %m"); } - if (!in_addr_is_null(fdb_entry->family, &fdb_entry->destination_addr)) { + if (in_addr_is_set(fdb_entry->family, &fdb_entry->destination_addr)) { r = netlink_message_append_in_addr_union(req, NDA_DST, fdb_entry->family, &fdb_entry->destination_addr); if (r < 0) return log_link_error_errno(link, r, "Could not append NDA_DST attribute: %m"); diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index aacfc31c52..b3cf43f4a8 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -766,9 +766,8 @@ void link_check_ready(Link *link) { bool has_ndisc_address = false; NDiscAddress *n; - if (link_ipv6ll_enabled(link) && - in_addr_is_null(AF_INET6, (const union in_addr_union*) &link->ipv6ll_address)) - return (void) log_link_debug(link, "%s(): IPv6LL is not configured.", __func__); + if (link_ipv6ll_enabled(link) && !in6_addr_is_set(&link->ipv6ll_address)) + return (void) log_link_debug(link, "%s(): IPv6LL is not configured yet.", __func__); SET_FOREACH(n, link->ndisc_addresses) if (!n->marked) { @@ -1156,7 +1155,7 @@ static int link_acquire_ipv6_conf(Link *link) { if (link->radv) { assert(link->radv); - assert(in_addr_is_link_local(AF_INET6, (const union in_addr_union*)&link->ipv6ll_address) > 0); + assert(in6_addr_is_link_local(&link->ipv6ll_address)); log_link_debug(link, "Starting IPv6 Router Advertisements"); @@ -1173,7 +1172,7 @@ static int link_acquire_ipv6_conf(Link *link) { DHCP6_CLIENT_START_MODE_INFORMATION_REQUEST, DHCP6_CLIENT_START_MODE_SOLICIT)) { assert(link->dhcp6_client); - assert(in_addr_is_link_local(AF_INET6, (const union in_addr_union*)&link->ipv6ll_address) > 0); + assert(in6_addr_is_link_local(&link->ipv6ll_address)); r = dhcp6_request_address(link, link->network->dhcp6_without_ra == DHCP6_CLIENT_START_MODE_INFORMATION_REQUEST); if (r < 0 && r != -EBUSY) @@ -1223,7 +1222,7 @@ static int link_acquire_conf(Link *link) { if (r < 0) return r; - if (!in_addr_is_null(AF_INET6, (const union in_addr_union*) &link->ipv6ll_address)) { + if (in6_addr_is_set(&link->ipv6ll_address)) { r = link_acquire_ipv6_conf(link); if (r < 0) return r; diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c index 4b9485b6b2..4f71396fbb 100644 --- a/src/network/networkd-ndisc.c +++ b/src/network/networkd-ndisc.c @@ -95,7 +95,7 @@ static int ndisc_address_callback(Address *address) { break; } - if (IN6_IS_ADDR_UNSPECIFIED(&router)) { + if (in6_addr_is_null(&router)) { _cleanup_free_ char *buf = NULL; (void) in_addr_to_string(address->family, &address->in_addr, &buf); @@ -649,12 +649,11 @@ static int ndisc_router_generate_addresses(Link *link, struct in6_addr *address, _cleanup_free_ struct in6_addr *new_address = NULL; if (j->address_generation_type == IPV6_TOKEN_ADDRESS_GENERATION_PREFIXSTABLE - && (IN6_IS_ADDR_UNSPECIFIED(&j->prefix) || IN6_ARE_ADDR_EQUAL(&j->prefix, address))) { + && (in6_addr_is_null(&j->prefix) || IN6_ARE_ADDR_EQUAL(&j->prefix, address))) { /* While this loop uses dad_counter and a retry limit as specified in RFC 7217, the loop - does not actually attempt Duplicate Address Detection; the counter will be incremented - only when the address generation algorithm produces an invalid address, and the loop - may exit with an address which ends up being unusable due to duplication on the link. - */ + * does not actually attempt Duplicate Address Detection; the counter will be incremented + * only when the address generation algorithm produces an invalid address, and the loop + * may exit with an address which ends up being unusable due to duplication on the link. */ for (; j->dad_counter < DAD_CONFLICTS_IDGEN_RETRIES_RFC7217; j->dad_counter++) { r = make_stableprivate_address(link, address, prefixlen, j->dad_counter, &new_address); if (r < 0) diff --git a/src/network/networkd-nexthop.c b/src/network/networkd-nexthop.c index 7a5a648148..76f6ce6d70 100644 --- a/src/network/networkd-nexthop.c +++ b/src/network/networkd-nexthop.c @@ -279,7 +279,7 @@ static int nexthop_configure(NextHop *nexthop, Link *link) { if (r < 0) return log_link_error_errno(link, r, "Could not append NHA_OIF attribute: %m"); - if (in_addr_is_null(nexthop->family, &nexthop->gw) == 0) { + if (in_addr_is_set(nexthop->family, &nexthop->gw)) { r = netlink_message_append_in_addr_union(req, NHA_GATEWAY, nexthop->family, &nexthop->gw); if (r < 0) return log_link_error_errno(link, r, "Could not append NHA_GATEWAY attribute: %m"); @@ -591,7 +591,7 @@ int config_parse_nexthop_family( return log_oom(); if (isempty(rvalue) && - in_addr_is_null(n->family, &n->gw) != 0) { + !in_addr_is_set(n->family, &n->gw)) { /* Accept an empty string only when Gateway= is null or not specified. */ n->family = AF_UNSPEC; TAKE_PTR(n); @@ -605,7 +605,7 @@ int config_parse_nexthop_family( return 0; } - if (in_addr_is_null(n->family, &n->gw) == 0 && + if (in_addr_is_set(n->family, &n->gw) && ((a == ADDRESS_FAMILY_IPV4 && n->family == AF_INET6) || (a == ADDRESS_FAMILY_IPV6 && n->family == AF_INET))) { log_syntax(unit, LOG_WARNING, filename, line, 0, diff --git a/src/network/networkd-radv.c b/src/network/networkd-radv.c index 39246498e4..8d8c21c0d8 100644 --- a/src/network/networkd-radv.c +++ b/src/network/networkd-radv.c @@ -525,8 +525,8 @@ static int radv_set_dns(Link *link, Link *uplink) { p = dns; for (size_t i = 0; i < link->network->n_router_dns; i++) - if (IN6_IS_ADDR_UNSPECIFIED(&link->network->router_dns[i])) { - if (!IN6_IS_ADDR_UNSPECIFIED(&link->ipv6ll_address)) + if (in6_addr_is_null(&link->network->router_dns[i])) { + if (in6_addr_is_set(&link->ipv6ll_address)) *(p++) = link->ipv6ll_address; } else *(p++) = link->network->router_dns[i]; diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c index fca6c032db..79ea9f2cdf 100644 --- a/src/network/networkd-route.c +++ b/src/network/networkd-route.c @@ -617,15 +617,15 @@ static void log_route_debug(const Route *route, const char *str, const Link *lin _cleanup_free_ char *dst = NULL, *dst_prefixlen = NULL, *src = NULL, *gw = NULL, *prefsrc = NULL, *table = NULL, *scope = NULL, *proto = NULL; - if (!in_addr_is_null(route->family, &route->dst)) { + if (in_addr_is_set(route->family, &route->dst)) { (void) in_addr_to_string(route->family, &route->dst, &dst); (void) asprintf(&dst_prefixlen, "/%u", route->dst_prefixlen); } - if (!in_addr_is_null(route->family, &route->src)) + if (in_addr_is_set(route->family, &route->src)) (void) in_addr_to_string(route->family, &route->src, &src); - if (in_addr_is_null(route->gw_family, &route->gw) == 0) + if (in_addr_is_set(route->gw_family, &route->gw)) (void) in_addr_to_string(route->gw_family, &route->gw, &gw); - if (!in_addr_is_null(route->family, &route->prefsrc)) + if (in_addr_is_set(route->family, &route->prefsrc)) (void) in_addr_to_string(route->family, &route->prefsrc, &prefsrc); (void) route_scope_to_string_alloc(route->scope, &scope); (void) manager_get_route_table_to_string(m, route->table, &table); @@ -648,7 +648,7 @@ static int route_set_netlink_message(const Route *route, sd_netlink_message *req /* link may be NULL */ - if (in_addr_is_null(route->gw_family, &route->gw) == 0) { + if (in_addr_is_set(route->gw_family, &route->gw)) { if (route->gw_family == route->family) { r = netlink_message_append_in_addr_union(req, RTA_GATEWAY, route->gw_family, &route->gw); if (r < 0) @@ -685,7 +685,7 @@ static int route_set_netlink_message(const Route *route, sd_netlink_message *req return log_link_error_errno(link, r, "Could not set source prefix length: %m"); } - if (in_addr_is_null(route->family, &route->prefsrc) == 0) { + if (in_addr_is_set(route->family, &route->prefsrc)) { r = netlink_message_append_in_addr_union(req, RTA_PREFSRC, route->family, &route->prefsrc); if (r < 0) return log_link_error_errno(link, r, "Could not append RTA_PREFSRC attribute: %m"); @@ -1260,7 +1260,7 @@ int link_set_routes(Link *link) { if (rt->gateway_from_dhcp_or_ra) continue; - if ((in_addr_is_null(rt->gw_family, &rt->gw) != 0 && ordered_set_isempty(rt->multipath_routes)) != (phase == PHASE_NON_GATEWAY)) + if ((!in_addr_is_set(rt->gw_family, &rt->gw) && ordered_set_isempty(rt->multipath_routes)) != (phase == PHASE_NON_GATEWAY)) continue; r = route_configure(rt, link, route_handler, NULL); @@ -2565,7 +2565,7 @@ static int route_section_verify(Route *route, Network *network) { route->priority = IP6_RT_PRIO_USER; if (ordered_hashmap_isempty(network->addresses_by_section) && - in_addr_is_null(route->gw_family, &route->gw) == 0 && + in_addr_is_set(route->gw_family, &route->gw) && route->gateway_onlink < 0) { log_warning("%s: Gateway= without static address configured. " "Enabling GatewayOnLink= option.", diff --git a/src/network/networkd-routing-policy-rule.c b/src/network/networkd-routing-policy-rule.c index ed966f3c17..3260fa89c7 100644 --- a/src/network/networkd-routing-policy-rule.c +++ b/src/network/networkd-routing-policy-rule.c @@ -420,7 +420,7 @@ static int routing_policy_rule_set_netlink_message(const RoutingPolicyRule *rule /* link may be NULL. */ - if (in_addr_is_null(rule->family, &rule->from) == 0) { + if (in_addr_is_set(rule->family, &rule->from)) { r = netlink_message_append_in_addr_union(m, FRA_SRC, rule->family, &rule->from); if (r < 0) return log_link_error_errno(link, r, "Could not append FRA_SRC attribute: %m"); @@ -430,7 +430,7 @@ static int routing_policy_rule_set_netlink_message(const RoutingPolicyRule *rule return log_link_error_errno(link, r, "Could not set source prefix length: %m"); } - if (in_addr_is_null(rule->family, &rule->to) == 0) { + if (in_addr_is_set(rule->family, &rule->to)) { r = netlink_message_append_in_addr_union(m, FRA_DST, rule->family, &rule->to); if (r < 0) return log_link_error_errno(link, r, "Could not append FRA_DST attribute: %m"); diff --git a/src/network/test-network.c b/src/network/test-network.c index 760e33151b..25ff3a33a8 100644 --- a/src/network/test-network.c +++ b/src/network/test-network.c @@ -34,15 +34,15 @@ static void test_deserialize_in_addr(void) { assert_se((size = deserialize_in_addrs(&addresses, addresses_string)) >= 0); assert_se(size == 3); - assert_se(in_addr_equal(AF_INET, &a, (union in_addr_union *) &addresses[0])); - assert_se(in_addr_equal(AF_INET, &b, (union in_addr_union *) &addresses[1])); - assert_se(in_addr_equal(AF_INET, &c, (union in_addr_union *) &addresses[2])); + assert_se(in4_addr_equal(&a.in, &addresses[0])); + assert_se(in4_addr_equal(&b.in, &addresses[1])); + assert_se(in4_addr_equal(&c.in, &addresses[2])); assert_se((size = deserialize_in6_addrs(&addresses6, addresses_string)) >= 0); assert_se(size == 3); - assert_se(in_addr_equal(AF_INET6, &d, (union in_addr_union *) &addresses6[0])); - assert_se(in_addr_equal(AF_INET6, &e, (union in_addr_union *) &addresses6[1])); - assert_se(in_addr_equal(AF_INET6, &f, (union in_addr_union *) &addresses6[2])); + assert_se(in6_addr_equal(&d.in6, &addresses6[0])); + assert_se(in6_addr_equal(&e.in6, &addresses6[1])); + assert_se(in6_addr_equal(&f.in6, &addresses6[2])); } static void test_deserialize_dhcp_routes(void) { diff --git a/src/nspawn/nspawn-expose-ports.c b/src/nspawn/nspawn-expose-ports.c index 3bce324102..9d5051d46d 100644 --- a/src/nspawn/nspawn-expose-ports.c +++ b/src/nspawn/nspawn-expose-ports.c @@ -92,7 +92,7 @@ int expose_port_flush(FirewallContext **fw_ctx, ExposePort* l, int af, union in_ if (!l) return 0; - if (in_addr_is_null(af, exposed)) + if (!in_addr_is_set(af, exposed)) return 0; log_debug("Lost IP address."); @@ -159,7 +159,7 @@ int expose_port_execute(sd_netlink *rtnl, FirewallContext **fw_ctx, ExposePort * p->host_port, &new_exposed, p->container_port, - in_addr_is_null(af, exposed) ? NULL : exposed); + in_addr_is_set(af, exposed) ? exposed : NULL); if (r < 0) log_warning_errno(r, "Failed to modify %s firewall: %m", af_to_name(af)); } diff --git a/src/nss-myhostname/nss-myhostname.c b/src/nss-myhostname/nss-myhostname.c index ffabc60c70..6e37966da0 100644 --- a/src/nss-myhostname/nss-myhostname.c +++ b/src/nss-myhostname/nss-myhostname.c @@ -134,7 +134,7 @@ enum nss_status _nss_myhostname_gethostbyname4_r( r_tuple->next = r_tuple_prev; r_tuple->name = r_name; r_tuple->family = a->family; - r_tuple->scopeid = a->family == AF_INET6 && IN6_IS_ADDR_LINKLOCAL(&a->address.in6) ? a->ifindex : 0; + r_tuple->scopeid = a->family == AF_INET6 && in6_addr_is_link_local(&a->address.in6) ? a->ifindex : 0; memcpy(r_tuple->addr, &a->address, 16); idx += ALIGN(sizeof(struct gaih_addrtuple)); diff --git a/src/nss-resolve/nss-resolve.c b/src/nss-resolve/nss-resolve.c index 5fcd39ee0a..dfc0977c84 100644 --- a/src/nss-resolve/nss-resolve.c +++ b/src/nss-resolve/nss-resolve.c @@ -77,7 +77,7 @@ static uint32_t ifindex_to_scopeid(int family, const void *a, int ifindex) { assert(sizeof(in6) == FAMILY_ADDRESS_SIZE(AF_INET6)); memcpy(&in6, a, sizeof(struct in6_addr)); - return IN6_IS_ADDR_LINKLOCAL(&in6) ? ifindex : 0; + return in6_addr_is_link_local(&in6) ? ifindex : 0; } static int json_dispatch_ifindex(const char *name, JsonVariant *variant, JsonDispatchFlags flags, void *userdata) { diff --git a/src/resolve/resolved-dns-rr.c b/src/resolve/resolved-dns-rr.c index 9e64c6dd31..d844f7c9aa 100644 --- a/src/resolve/resolved-dns-rr.c +++ b/src/resolve/resolved-dns-rr.c @@ -1730,7 +1730,7 @@ bool dns_resource_record_is_link_local_address(DnsResourceRecord *rr) { return in4_addr_is_link_local(&rr->a.in_addr); if (rr->key->type == DNS_TYPE_AAAA) - return IN6_IS_ADDR_LINKLOCAL(&rr->aaaa.in6_addr); + return in6_addr_is_link_local(&rr->aaaa.in6_addr); return false; } diff --git a/src/resolve/resolved-dns-scope.c b/src/resolve/resolved-dns-scope.c index 4495a93add..f1dff95a86 100644 --- a/src/resolve/resolved-dns-scope.c +++ b/src/resolve/resolved-dns-scope.c @@ -920,10 +920,10 @@ void dns_scope_process_query(DnsScope *s, DnsStream *stream, DnsPacket *p) { * the LLMNR multicast addresses. See RFC 4795, * section 2.5. */ - if (p->family == AF_INET && !in_addr_equal(AF_INET, &p->destination, (union in_addr_union*) &LLMNR_MULTICAST_IPV4_ADDRESS)) + if (p->family == AF_INET && !in4_addr_equal(&p->destination.in, &LLMNR_MULTICAST_IPV4_ADDRESS)) return; - if (p->family == AF_INET6 && !in_addr_equal(AF_INET6, &p->destination, (union in_addr_union*) &LLMNR_MULTICAST_IPV6_ADDRESS)) + if (p->family == AF_INET6 && !in6_addr_equal(&p->destination.in6, &LLMNR_MULTICAST_IPV6_ADDRESS)) return; } diff --git a/src/resolve/resolved-etc-hosts.c b/src/resolve/resolved-etc-hosts.c index 0c35d91a83..65b815c43c 100644 --- a/src/resolve/resolved-etc-hosts.c +++ b/src/resolve/resolved-etc-hosts.c @@ -61,7 +61,7 @@ static int parse_line(EtcHosts *hosts, unsigned nr, const char *line) { return 0; } - r = in_addr_is_null(address.family, &address.address); + r = in_addr_data_is_null(&address); if (r < 0) { log_warning_errno(r, "/etc/hosts:%u: address '%s' is invalid, ignoring: %m", nr, address_str); return 0; diff --git a/src/shared/resolve-util.c b/src/shared/resolve-util.c index 1023b62499..6541d231ed 100644 --- a/src/shared/resolve-util.c +++ b/src/shared/resolve-util.c @@ -33,7 +33,7 @@ bool dns_server_address_valid(int family, const union in_addr_union *sa) { /* Refuses the 0 IP addresses as well as 127.0.0.53 (which is our own DNS stub) */ - if (in_addr_is_null(family, sa)) + if (!in_addr_is_set(family, sa)) return false; if (family == AF_INET && sa->in.s_addr == htobe32(INADDR_DNS_STUB)) |