NEWS

@@ -62,9 +62,6 @@ CHANGES WITH 250 in spe:
 
         * The GPT image dissection logic in systemd-nspawn/systemd-dissect/…
           now is able to decode images for non-native architectures as well.
-          This enables systemd-nspawn to boot images of non-native
-          architectures if the corresponding user mode emulator is installed
-          and systemd-binfmtd is running.
 
         * systemd-logind gained a new settings HandlePowerKeyLongPress=,
           HandleRebootKeyLongPress=, HandleSuspendKeyLongPress= and
@@ -258,12 +255,6 @@ CHANGES WITH 250 in spe:
           doesn't accidentally jump too far ahead due to faulty hardware or
           batteries.
 
-        * A new setting SaveIntervalSec= has been added to systemd-timesyncd,
-          which may be used to automatically save the current system time to
-          disk in regular intervals. This is useful to maintain a roughly
-          monotonic clock even without RTC hardware and with some robustness
-          against abnormal system shutdown.
-
         * .network files gained a new UplinkInterface in the [IPv6SendRA]
           section, for automatically propagating DNS settings from other
           interfaces.
@@ -271,27 +262,26 @@ CHANGES WITH 250 in spe:
         * The static lease DHCP server logic in systemd-networkd may now serve
           IP addresses outside of the configured IP pool range for the server.
 
+        * A new setting SaveIntervalSec= has been added to systemd-timesyncd,
+          which may be used to automatically save the current system time to
+          disk in regular intervals. This is useful to maintain a roughly
+          monotonic clock even without RTC hardware and with some robustness
+          against abnormal system shutdown.
+
         * CAN support in systemd-networkd gained four new settings Loopback=,
           OneShot=, PresumeAck=, ClassicDataLengthCode= for tweaking CAN
           control modes. It gained a number of further settings for tweaking
           CAN timing quanta.
 
-        * The [CAN] section in .network file gained new TimeQuantaNSec=,
-          PropagationSegment=, PhaseBufferSegment1=, PhaseBufferSegment2=,
-          SyncJumpWidth=, DataTimeQuantaNSec=, DataPropagationSegment=,
-          DataPhaseBufferSegment1=, DataPhaseBufferSegment2=, and
-          DataSyncJumpWidth= settings to control bit-timing processed by the
-          CAN interface.
-
         * DHCPv4 client support in systemd-networkd learnt a new Label= option
           for configuring the address label to apply to configure IPv4
           addresses.
 
-        * The various systemd-udevd "ethtool" buffer settings now understand
+        * The various systemd-networkd "ethtool" buffer settings now understand
           the special value "max" to configure the buffers to the maximum the
           hardware supports.
 
-        * systemd-udevd's .link files may now configure a large variety of
+        * systemd-networkd's .link files may now configure a large variety of
           NIC coalescing settings, plus more hardware offload settings.
 
         * systemd-analyze verify gained support for a pair of new --image= +
@@ -306,21 +296,18 @@ CHANGES WITH 250 in spe:
           UseMTU= setting that may be used to control whether to apply the
           announced MTU settings to the local interface.
 
-        * systemd-networkd now ships with another default .network files:
+        * systemd-networkd now ships with another default .network file:
-          80-container-vb.network which matches host-side network bridge device
+          80-container-vb.network. It matches host-side network bridge device
           created by systemd-nspawn's --network-bridge or --network-zone
-          switch, and 80-6rd-tunnel.network which matches automatically created
+          switch.
-          sit tunnel with 6rd prefix when the DHCP 6RD option is received.
 
-        * systemd-networkd and systemd-udevd now support IP over InfiniBand
+        * systemd-networkd now supports IP over InfiniBand interfaces.
-          interfaces.
 
         * systemd-networkd's handling of Endpoint= resolution for WireGuard
           interfaces has been improved.
 
         * systemd-networkd will now automatically configure routes to addresses
-          specified in AllowedIPs=. This feature can be controlled via RouteTable=
+          specified in AllowedIPs=.
-          and RouteMetric= settings in [WireGuard] or [WireGuardPeer] sections.
 
         * systemd-networkd will now once again automatically generate persistent
           MAC addresses for batadv and bridge interfaces. Users can disable this
@@ -330,56 +317,29 @@ CHANGES WITH 250 in spe:
           section that allows to specify a WoL "SecureOn" password on hardware
           that supports this.
 
-        * The [DHCPv4] section in .network file gained a new Use6RD= boolean
+        * DHCPv6 Prefix Delegation gained new settings UplinkInterface= and
-          setting to control whether the DHCPv4 client request and process the
+          UseDelegatedPrefix= for configuring how to propagate delegated
-          DHCP 6RD option.
+          prefixes between uplink and downlink interfaces.
-
-        * The [DHCPv6PrefixDelegation] section in .network file is renamed to
-          [DHCPPrefixDelegation], as now the prefix delegation is also supported
-          with DHCPv4 protocol by enabling the Use6RD= setting.
-
-        * The [DHCPPrefixDelegation] section in .network file gained a new
-          setting UplinkInterface= to specify the upstream interface.
-
-        * The [DHCPv6] section in .network file gained a new setting
-          UseDelegatedPrefix= to control whether the delegated prefixes will be
-          propagated to the downstream interfaces.
 
         * The [IPv6AcceptRA] section of .network files now understands two new
           settings UseGateway=/UseRoutePrefix= for explicitly configuring
           whether to use the relevant fields from the IPv6 Router Advertisement
           records.
 
-        * The ForceDHCPv6PDOtherInformation= setting in the [DHCPv6] section is
+        * The [CAKE] section of .network files gained a new setting
-          now deprecated. Please use the WithoutRA= and UseDelegatedPrefix=
+          AutoRateIngress= for controlling automatic capacity estimation for
-          settings in the [DHCPv6] section and the DHCPv6Client= setting in the
+          CAKE.
-          [IPv6AcceptRA] section to control when the DHCPv6 client is started
-          and how the delegated prefixes are handled by the DHCPv6 client.
 
-        * The [CAKE] section of .network files gained various new settings
+        * IPv6 tokens configured in .network files may now optionally take a
-          AutoRateIngress=, CompensationMode=, FlowIsolationMode=, NAT=,
+          secret key (i.e. Token=prefixstable:…)
-          MPUBytes=, PriorityQueueingPreset=, FirewallMark=, Wash=, SplitGSO=,
-          and UseRawPacketSize= for configuring CAKE.
 
-        * The IPv6Token= section in the [Network] section is deprecated, and
+        * A new SuppressInterfaceGroup= setting has been added to the
-          the [IPv6AcceptRA] section gained the Token= setting for its
+          [RoutingPolicyRule] section of .network files.
-          replacement. The [IPv6Prefix] section also gained the Token= setting.
-          The Token= setting gained 'eui64' mode to explicitly configure an
-          address with the EUI64 algorithm based on the interface MAC address.
-          The 'prefixstable' mode can now optionally take a secret key. The
-          Token= setting in the [DHCPPrefixDelegation] section now supports all
-          algorithms supported by the same settings in the other sections.
-
-        * The [RoutingPolicyRule] section of .network file gained a new
-          SuppressInterfaceGroup= setting.
 
         * The IgnoreCarrierLoss= setting in the [Network] section of .network
           files now accepts a duration to be specified, controlling how time to
           wait before no longer ignoring carrier losses.
 
-        * The [DHCPServer] section of .network file gained a new Router= setting
-          to specify the router address.
-
         * systemd-analyze verify gained a new switch --recursive-errors= which
           controls whether to only fail on errors found in the specified units
           or recursively any dependent units.
@@ -717,23 +677,6 @@ CHANGES WITH 250 in spe:
           file that explains the licenses used by source files in this repository.
           It also contains the text of all applicable licenses as they appear on spdx.org.
 
-        * systemd-journald now re-enables COW for archived journal files on filesystems
-          that support COW. One benefit of this change is that archived journal files will
-          now get compressed on btrfs filesystems that have compression enabled.
-
-        * systemd-journald now truncates archived journal files and punches holes in unused
-          parts of archived journal files, leading to some minor reductions in disk usage.
-
-        * systemd-journald now deduplicates fields in a single log message before adding
-          it to the journal.
-
-        * journalctl --verify was extended with more informative error messages.
-
-        * More of sd-journal's functions are now resistant against journal file corruption.
-
-        * systemd-journald's own logging messages are now also logged to the journal itself
-          when systemd-journald logs to /dev/kmsg.
-
 CHANGES WITH 249:
 
         * When operating on disk images via the --image= switch of various

docs/RELEASE.md

@@ -10,7 +10,7 @@ SPDX-License-Identifier: LGPL-2.1-or-later
 1. Add all items to NEWS
 2. Update the contributors list in NEWS (`meson compile -C build git-contrib`)
 3. Update the time and place in NEWS
-4. Update hwdb (`meson compile -C build update-hwdb update-hwdb-autosuspend`)
+4. Update hwb (`meson compile -C build update-hwdb update-hwdb-autosuspend`)
 5. [RC1] Update version and library numbers in `meson.build`
 6. Check dbus docs with `meson compile -C build update-dbus-docs`
 7. Tag the release: `version=vXXX-rcY && git tag -s "${version}" -m "systemd ${version}"`

src/libsystemd-network/sd-dhcp-client.c

@@ -1930,13 +1930,13 @@ static int client_receive_message_udp(
         assert(client);
 
         buflen = next_datagram_size_fd(fd);
-        if (buflen < 0) {
+        if (buflen == -ENETDOWN)
-                if (ERRNO_IS_TRANSIENT(buflen) || ERRNO_IS_DISCONNECT(buflen))
+                /* the link is down. Don't return an error or the I/O event
-                        return 0;
+                   source will be disconnected and we won't be able to receive
-
+                   packets again when the link comes back. */
-                log_dhcp_client_errno(client, buflen, "Failed to determine datagram size to read, ignoring: %m");
                 return 0;
-        }
+        if (buflen < 0)
+                return buflen;
 
         message = malloc0(buflen);
         if (!message)
@@ -1944,11 +1944,12 @@ static int client_receive_message_udp(
 
         len = recv(fd, message, buflen, 0);
         if (len < 0) {
-                if (ERRNO_IS_TRANSIENT(errno) || ERRNO_IS_DISCONNECT(errno))
+                /* see comment above for why we shouldn't error out on ENETDOWN. */
+                if (ERRNO_IS_TRANSIENT(errno) || errno == ENETDOWN)
                         return 0;
 
-                log_dhcp_client_errno(client, errno, "Could not receive message from UDP socket, ignoring: %m");
+                return log_dhcp_client_errno(client, errno,
-                return 0;
+                                             "Could not receive message from UDP socket: %m");
         }
         if ((size_t) len < sizeof(DHCPMessage)) {
                 log_dhcp_client(client, "Too small to be a DHCP message: ignoring");
@@ -1994,8 +1995,7 @@ static int client_receive_message_udp(
                 return 0;
         }
 
-        (void) client_handle_message(client, message, len);
+        return client_handle_message(client, message, len);
-        return 0;
 }
 
 static int client_receive_message_raw(
@@ -2023,13 +2023,10 @@ static int client_receive_message_raw(
         assert(client);
 
         buflen = next_datagram_size_fd(fd);
-        if (buflen < 0) {
+        if (buflen == -ENETDOWN)
-                if (ERRNO_IS_TRANSIENT(buflen) || ERRNO_IS_DISCONNECT(buflen))
-                        return 0;
-
-                log_dhcp_client_errno(client, buflen, "Failed to determine datagram size to read, ignoring: %m");
                 return 0;
-        }
+        if (buflen < 0)
+                return buflen;
 
         packet = malloc0(buflen);
         if (!packet)
@@ -2039,11 +2036,10 @@ static int client_receive_message_raw(
 
         len = recvmsg_safe(fd, &msg, 0);
         if (len < 0) {
-                if (ERRNO_IS_TRANSIENT(len) || ERRNO_IS_DISCONNECT(len))
+                if (ERRNO_IS_TRANSIENT(len) || len == -ENETDOWN)
                         return 0;
-
+                return log_dhcp_client_errno(client, len,
-                log_dhcp_client_errno(client, len, "Could not receive message from raw socket, ignoring: %m");
+                                             "Could not receive message from raw socket: %m");
-                return 0;
         }
         if ((size_t) len < sizeof(DHCPPacket))
                 return 0;
@@ -2060,8 +2056,7 @@ static int client_receive_message_raw(
 
         len -= DHCP_IP_UDP_SIZE;
 
-        (void) client_handle_message(client, &packet->dhcp, len);
+        return client_handle_message(client, &packet->dhcp, len);
-        return 0;
 }
 
 int sd_dhcp_client_send_renew(sd_dhcp_client *client) {

src/libsystemd-network/sd-dhcp-server.c

@@ -1191,13 +1191,8 @@ static int server_receive_message(sd_event_source *s, int fd,
         assert(server);
 
         datagram_size = next_datagram_size_fd(fd);
-        if (datagram_size < 0) {
+        if (datagram_size < 0)
-                if (ERRNO_IS_TRANSIENT(datagram_size) || ERRNO_IS_DISCONNECT(datagram_size))
+                return datagram_size;
-                        return 0;
-
-                log_dhcp_server_errno(server, datagram_size, "Failed to determine datagram size to read, ignoring: %m");
-                return 0;
-        }
 
         size_t buflen = datagram_size;
         if (sd_dhcp_server_is_in_relay_mode(server))
@@ -1212,11 +1207,9 @@ static int server_receive_message(sd_event_source *s, int fd,
 
         len = recvmsg_safe(fd, &msg, 0);
         if (len < 0) {
-                if (ERRNO_IS_TRANSIENT(len) || ERRNO_IS_DISCONNECT(len))
+                if (ERRNO_IS_TRANSIENT(len))
                         return 0;
-
+                return len;
-                log_dhcp_server_errno(server, len, "Could not receive message, ignoring: %m");
-                return 0;
         }
 
         if ((size_t) len < sizeof(DHCPMessage))
@@ -1240,11 +1233,11 @@ static int server_receive_message(sd_event_source *s, int fd,
         if (sd_dhcp_server_is_in_relay_mode(server)) {
                 r = dhcp_server_relay_message(server, message, len - sizeof(DHCPMessage), buflen);
                 if (r < 0)
-                        log_dhcp_server_errno(server, r, "Couldn't relay message, ignoring: %m");
+                        log_dhcp_server_errno(server, r, "Couldn't relay message: %m");
         } else {
                 r = dhcp_server_handle_message(server, message, (size_t) len);
                 if (r < 0)
-                        log_dhcp_server_errno(server, r, "Couldn't process incoming message, ignoring: %m");
+                        log_dhcp_server_errno(server, r, "Couldn't process incoming message: %m");
         }
         return 0;
 }

src/libsystemd-network/sd-dhcp6-client.c

@@ -1463,13 +1463,12 @@ static int client_receive_message(
         assert(client->event);
 
         buflen = next_datagram_size_fd(fd);
-        if (buflen < 0) {
+        if (buflen == -ENETDOWN)
-                if (ERRNO_IS_TRANSIENT(buflen) || ERRNO_IS_DISCONNECT(buflen))
+                /* the link is down. Don't return an error or the I/O event source will be disconnected
-                        return 0;
+                 * and we won't be able to receive packets again when the link comes back. */
-
-                log_dhcp6_client_errno(client, buflen, "Failed to determine datagram size to read, ignoring: %m");
                 return 0;
-        }
+        if (buflen < 0)
+                return buflen;
 
         message = malloc(buflen);
         if (!message)
@@ -1479,11 +1478,12 @@ static int client_receive_message(
 
         len = recvmsg_safe(fd, &msg, MSG_DONTWAIT);
         if (len < 0) {
-                if (ERRNO_IS_TRANSIENT(len) || ERRNO_IS_DISCONNECT(len))
+                /* see comment above for why we shouldn't error out on ENETDOWN. */
+                if (ERRNO_IS_TRANSIENT(len) || len == -ENETDOWN)
                         return 0;
 
-                log_dhcp6_client_errno(client, len, "Could not receive message from UDP socket, ignoring: %m");
+                return log_dhcp6_client_errno(client, len, "Could not receive message from UDP socket: %m");
-                return 0;
+
         }
         if ((size_t) len < sizeof(DHCP6Message)) {
                 log_dhcp6_client(client, "Too small to be DHCP6 message: ignoring");

src/libsystemd-network/sd-ipv4acd.c

@@ -362,7 +362,7 @@ static int ipv4acd_on_packet(
 
         n = recv(fd, &packet, sizeof(struct ether_arp), 0);
         if (n < 0) {
-                if (ERRNO_IS_TRANSIENT(errno) || ERRNO_IS_DISCONNECT(errno))
+                if (ERRNO_IS_TRANSIENT(errno))
                         return 0;
 
                 log_ipv4acd_errno(acd, errno, "Failed to read ARP packet: %m");

src/libsystemd-network/sd-lldp-rx.c

@@ -200,9 +200,6 @@ static int lldp_rx_receive_datagram(sd_event_source *s, int fd, uint32_t revents
 
         space = next_datagram_size_fd(fd);
         if (space < 0) {
-                if (ERRNO_IS_TRANSIENT(space) || ERRNO_IS_DISCONNECT(space))
-                        return 0;
-
                 log_lldp_rx_errno(lldp_rx, space, "Failed to determine datagram size to read, ignoring: %m");
                 return 0;
         }
@@ -215,7 +212,7 @@ static int lldp_rx_receive_datagram(sd_event_source *s, int fd, uint32_t revents
 
         length = recv(fd, LLDP_NEIGHBOR_RAW(n), n->raw_size, MSG_DONTWAIT);
         if (length < 0) {
-                if (ERRNO_IS_TRANSIENT(errno) || ERRNO_IS_DISCONNECT(errno))
+                if (ERRNO_IS_TRANSIENT(errno))
                         return 0;
 
                 log_lldp_rx_errno(lldp_rx, errno, "Failed to read LLDP datagram, ignoring: %m");

src/libsystemd-network/sd-ndisc.c

@@ -186,8 +186,10 @@ static int ndisc_handle_datagram(sd_ndisc *nd, sd_ndisc_router *rt) {
         assert(rt);
 
         r = ndisc_router_parse(nd, rt);
+        if (r == -EBADMSG) /* Bad packet */
+                return 0;
         if (r < 0)
-                return r;
+                return 0;
 
         log_ndisc(nd, "Received Router Advertisement: flags %s preference %s lifetime %" PRIu16 " sec",
                   rt->flags & ND_RA_FLAG_MANAGED ? "MANAGED" : rt->flags & ND_RA_FLAG_OTHER ? "OTHER" : "none",
@@ -211,9 +213,6 @@ static int ndisc_recv(sd_event_source *s, int fd, uint32_t revents, void *userda
 
         buflen = next_datagram_size_fd(fd);
         if (buflen < 0) {
-                if (ERRNO_IS_TRANSIENT(buflen) || ERRNO_IS_DISCONNECT(buflen))
-                        return 0;
-
                 log_ndisc_errno(nd, buflen, "Failed to determine datagram size to read, ignoring: %m");
                 return 0;
         }
@@ -224,9 +223,6 @@ static int ndisc_recv(sd_event_source *s, int fd, uint32_t revents, void *userda
 
         r = icmp6_receive(fd, NDISC_ROUTER_RAW(rt), rt->raw_size, &rt->address, &rt->timestamp);
         if (r < 0) {
-                if (ERRNO_IS_TRANSIENT(r) || ERRNO_IS_DISCONNECT(r))
-                        return 0;
-
                 switch (r) {
                 case -EADDRNOTAVAIL:
                         (void) in_addr_to_string(AF_INET6, (const union in_addr_union*) &rt->address, &addr);
@@ -241,6 +237,9 @@ static int ndisc_recv(sd_event_source *s, int fd, uint32_t revents, void *userda
                         log_ndisc(nd, "Received invalid source address from ICMPv6 socket. Ignoring.");
                         break;
 
+                case -EAGAIN: /* ignore spurious wakeups */
+                        break;
+
                 default:
                         log_ndisc_errno(nd, r, "Unexpected error while reading from ICMPv6, ignoring: %m");
                         break;
@@ -250,8 +249,8 @@ static int ndisc_recv(sd_event_source *s, int fd, uint32_t revents, void *userda
         }
 
         (void) event_source_disable(nd->timeout_event_source);
-        (void) ndisc_handle_datagram(nd, rt);
+
-        return 0;
+        return ndisc_handle_datagram(nd, rt);
 }
 
 static usec_t ndisc_timeout_compute_random(usec_t val) {

src/libsystemd-network/sd-radv.c

@@ -258,13 +258,8 @@ static int radv_recv(sd_event_source *s, int fd, uint32_t revents, void *userdat
         assert(ra->event);
 
         buflen = next_datagram_size_fd(fd);
-        if (buflen < 0) {
+        if (buflen < 0)
-                if (ERRNO_IS_TRANSIENT(buflen) || ERRNO_IS_DISCONNECT(buflen))
+                return (int) buflen;
-                        return 0;
-
-                log_radv_errno(ra, buflen, "Failed to determine datagram size to read, ignoring: %m");
-                return 0;
-        }
 
         buf = new0(char, buflen);
         if (!buf)
@@ -272,9 +267,6 @@ static int radv_recv(sd_event_source *s, int fd, uint32_t revents, void *userdat
 
         r = icmp6_receive(fd, buf, buflen, &src, &timestamp);
         if (r < 0) {
-                if (ERRNO_IS_TRANSIENT(r) || ERRNO_IS_DISCONNECT(r))
-                        return 0;
-
                 switch (r) {
                 case -EADDRNOTAVAIL:
                         (void) in_addr_to_string(AF_INET6, (const union in_addr_union*) &src, &addr);
@@ -289,8 +281,11 @@ static int radv_recv(sd_event_source *s, int fd, uint32_t revents, void *userdat
                         log_radv(ra, "Received invalid source address from ICMPv6 socket. Ignoring.");
                         break;
 
+                case -EAGAIN: /* ignore spurious wakeups */
+                        break;
+
                 default:
-                        log_radv_errno(ra, r, "Unexpected error receiving from ICMPv6 socket, ignoring: %m");
+                        log_radv_errno(ra, r, "Unexpected error receiving from ICMPv6 socket, Ignoring: %m");
                         break;
                 }
 

src/network/networkd-address.c

@@ -600,7 +600,7 @@ const char* format_lifetime(char *buf, size_t l, usec_t lifetime_usec) {
 }
 
 static void log_address_debug(const Address *address, const char *str, const Link *link) {
-        _cleanup_free_ char *state = NULL, *addr = NULL, *peer = NULL, *flags_str = NULL, *scope_str = NULL;
+        _cleanup_free_ char *state = NULL, *addr = NULL, *peer = NULL, *flags_str = NULL;
 
         assert(address);
         assert(str);
@@ -615,14 +615,13 @@ static void log_address_debug(const Address *address, const char *str, const Lin
                 (void) in_addr_to_string(address->family, &address->in_addr_peer, &peer);
 
         (void) address_flags_to_string_alloc(address->flags, address->family, &flags_str);
-        (void) route_scope_to_string_alloc(address->scope, &scope_str);
 
-        log_link_debug(link, "%s %s address (%s): %s%s%s/%u (valid %s, preferred %s), flags: %s, scope: %s",
+        log_link_debug(link, "%s %s address (%s): %s%s%s/%u (valid %s, preferred %s), flags: %s",
                        str, strna(network_config_source_to_string(address->source)), strna(state),
                        strnull(addr), peer ? " peer " : "", strempty(peer), address->prefixlen,
                        FORMAT_LIFETIME(address->lifetime_valid_usec),
                        FORMAT_LIFETIME(address->lifetime_preferred_usec),
-                       strna(flags_str), strna(scope_str));
+                       strna(flags_str));
 }
 
 static int address_set_netlink_message(const Address *address, sd_netlink_message *req, Link *link) {
@@ -752,7 +751,7 @@ int link_drop_ipv6ll_addresses(Link *link) {
         /* IPv6LL address may be in the tentative state, and in that case networkd has not received it.
          * So, we need to dump all IPv6 addresses. */
 
-        if (link_may_have_ipv6ll(link))
+        if (link_ipv6ll_enabled(link))
                 return 0;
 
         r = sd_rtnl_message_new_addr(link->manager->rtnl, &req, RTM_GETADDR, link->ifindex, AF_INET6);
@@ -1917,11 +1916,18 @@ static int address_section_verify(Address *address) {
                 address->label = mfree(address->label);
         }
 
-        if (!address->scope_set) {
+        if (in_addr_is_localhost(address->family, &address->in_addr) > 0 &&
-                if (in_addr_is_localhost(address->family, &address->in_addr) > 0)
+            (address->family == AF_INET || !address->scope_set)) {
-                        address->scope = RT_SCOPE_HOST;
+                /* For IPv4, scope must be always RT_SCOPE_HOST.
-                else if (in_addr_is_link_local(address->family, &address->in_addr) > 0)
+                 * For IPv6, use RT_SCOPE_HOST only when it is not explicitly specified. */
-                        address->scope = RT_SCOPE_LINK;
+
+                if (address->scope_set && address->scope != RT_SCOPE_HOST)
+                        log_warning_errno(SYNTHETIC_ERRNO(EINVAL),
+                                          "%s: non-host scope is set for localhost address. "
+                                          "Ignoring Scope= setting in the [Address] section from line %u. ",
+                                          address->section->filename, address->section->line);
+
+                address->scope = RT_SCOPE_HOST;
         }
 
         if (address->family == AF_INET6 &&

src/network/networkd-json.c

@@ -299,9 +299,9 @@ static int route_build_json(Route *route, JsonVariant **ret) {
                                 JSON_BUILD_PAIR_IN_ADDR("Destination", &route->dst, route->family),
                                 JSON_BUILD_PAIR_UNSIGNED("DestinationPrefixLength", route->dst_prefixlen),
                                 JSON_BUILD_PAIR_IN_ADDR_NON_NULL("Gateway", &route->gw, route->gw_family),
-                                JSON_BUILD_PAIR_CONDITION(route->src_prefixlen > 0,
+                                JSON_BUILD_PAIR_IN_ADDR_NON_NULL("Source", &route->src, route->family),
-                                                          "Source", JSON_BUILD_IN_ADDR(&route->src, route->family)),
+                                JSON_BUILD_PAIR_CONDITION(in_addr_is_set(route->family, &route->src),
-                                JSON_BUILD_PAIR_UNSIGNED_NON_ZERO("SourcePrefixLength", route->src_prefixlen),
+                                                          "SourcePrefixLength", JSON_BUILD_UNSIGNED(route->src_prefixlen)),
                                 JSON_BUILD_PAIR_IN_ADDR_NON_NULL("PreferredSource", &route->prefsrc, route->family),
                                 JSON_BUILD_PAIR_UNSIGNED("Scope", route->scope),
                                 JSON_BUILD_PAIR_STRING("ScopeString", scope),

src/network/networkd-link.c

@@ -126,43 +126,6 @@ bool link_ipv6ll_enabled(Link *link) {
         return link->network->link_local & ADDRESS_FAMILY_IPV6;
 }
 
-bool link_may_have_ipv6ll(Link *link) {
-        assert(link);
-
-        /*
-         * This is equivalent to link_ipv6ll_enabled() for non-WireGuard interfaces.
-         *
-         * For WireGuard interface, the kernel does not assign any IPv6LL addresses, but we can assign
-         * it manually. It is necessary to set an IPv6LL address manually to run NDisc or RADV on
-         * WireGuard interface. Note, also Multicast=yes must be set. See #17380.
-         *
-         * TODO: May be better to introduce GenerateIPv6LinkLocalAddress= setting, and use algorithms
-         *       used in networkd-address-generation.c
-         */
-
-        if (link_ipv6ll_enabled(link))
-                return true;
-
-        /* IPv6LL address can be manually assigned on WireGuard interface. */
-        if (streq_ptr(link->kind, "wireguard")) {
-                Address *a;
-
-                if (!link->network)
-                        return false;
-
-                ORDERED_HASHMAP_FOREACH(a, link->network->addresses_by_section) {
-                        if (a->family != AF_INET6)
-                                continue;
-                        if (in6_addr_is_set(&a->in_addr_peer.in6))
-                                continue;
-                        if (in6_addr_is_link_local(&a->in_addr.in6))
-                                return true;
-                }
-        }
-
-        return false;
-}
-
 bool link_ipv6_enabled(Link *link) {
         assert(link);
 

src/network/networkd-link.h

@@ -215,7 +215,6 @@ bool link_has_carrier(Link *link);
 
 bool link_ipv6_enabled(Link *link);
 bool link_ipv6ll_enabled(Link *link);
-bool link_may_have_ipv6ll(Link *link);
 int link_ipv6ll_gained(Link *link);
 
 bool link_ipv4ll_enabled(Link *link);

src/network/networkd-ndisc.c

@@ -37,7 +37,7 @@ bool link_ipv6_accept_ra_enabled(Link *link) {
         if (!link->network)
                 return false;
 
-        if (!link_may_have_ipv6ll(link))
+        if (!link_ipv6ll_enabled(link))
                 return false;
 
         assert(link->network->ipv6_accept_ra >= 0);

src/network/networkd-radv.c

@@ -54,7 +54,7 @@ void network_adjust_radv(Network *network) {
 bool link_radv_enabled(Link *link) {
         assert(link);
 
-        if (!link_may_have_ipv6ll(link))
+        if (!link_ipv6ll_enabled(link))
                 return false;
 
         return link->network->router_prefix_delegation;

src/network/networkd-route-util.c

@@ -360,19 +360,9 @@ int config_parse_route_table_names(
 
                 *num++ = '\0';
 
-                if (isempty(name)) {
-                        log_syntax(unit, LOG_WARNING, filename, line, 0,
-                                   "Route table name cannot be empty. Ignoring assignment: %s:%s", name, num);
-                        continue;
-                }
-                if (in_charset(name, DIGITS)) {
-                        log_syntax(unit, LOG_WARNING, filename, line, 0,
-                                   "Route table name cannot be numeric. Ignoring assignment: %s:%s", name, num);
-                        continue;
-                }
                 if (STR_IN_SET(name, "default", "main", "local")) {
                         log_syntax(unit, LOG_WARNING, filename, line, 0,
-                                   "Route table name %s is already predefined. Ignoring assignment: %s:%s", name, name, num);
+                                   "Route table name %s already predefined. Ignoring assignment: %s:%s", name, name, num);
                         continue;
                 }
 

src/network/networkd-route.c

@@ -560,8 +560,8 @@ static void log_route_debug(const Route *route, const char *str, const Link *lin
         (void) network_config_state_to_string_alloc(route->state, &state);
         if (in_addr_is_set(route->family, &route->dst) || route->dst_prefixlen > 0)
                 (void) in_addr_prefix_to_string(route->family, &route->dst, route->dst_prefixlen, &dst);
-        if (in_addr_is_set(route->family, &route->src) || route->src_prefixlen > 0)
+        if (in_addr_is_set(route->family, &route->src))
-                (void) in_addr_prefix_to_string(route->family, &route->src, route->src_prefixlen, &src);
+                (void) in_addr_to_string(route->family, &route->src, &src);
         if (in_addr_is_set(route->gw_family, &route->gw)) {
                 (void) in_addr_to_string(route->gw_family, &route->gw, &gw_alloc);
                 gw = gw_alloc;
@@ -2124,8 +2124,6 @@ int config_parse_destination(
                 return 0;
         }
 
-        (void) in_addr_mask(n->family, buffer, *prefixlen);
-
         TAKE_PTR(n);
         return 0;
 }

src/network/test-network.c

@@ -146,12 +146,6 @@ static void test_route_tables(Manager *manager) {
         assert_se(!manager->route_table_names_by_number);
         assert_se(!manager->route_table_numbers_by_name);
 
-        /* Invalid pairs */
-        assert_se(config_parse_route_table_names("manager", "filename", 1, "section", 1, "RouteTable", 0, "main:123 default:333 local:999", manager, manager) >= 0);
-        assert_se(config_parse_route_table_names("manager", "filename", 1, "section", 1, "RouteTable", 0, "1234:321 :567 hoge:foo aaa:-888", manager, manager) >= 0);
-        assert_se(!manager->route_table_names_by_number);
-        assert_se(!manager->route_table_numbers_by_name);
-
         test_route_tables_one(manager, "default", 253);
         test_route_tables_one(manager, "main", 254);
         test_route_tables_one(manager, "local", 255);