Merge ~schopin/ubuntu/+source/systemd/+git/systemd-1:hirsute/hipersocket-dhcp into ~ubuntu-core-dev/ubuntu/+source/systemd:ubuntu-hirsute

[Simon Chopin]

diff --git a/debian/patches/lp1914740-network-enable-DHCP-broadcast-flag-if-required-by-in.patch b/debian/patches/lp1914740-network-enable-DHCP-broadcast-flag-if-required-by-in.patch
new file mode 100644
index 0000000..6e101ba
--- /dev/null
+++ b/debian/patches/lp1914740-network-enable-DHCP-broadcast-flag-if-required-by-in.patch
@@ -0,0 +1,146 @@
+From 0fd173d4e50f9deddb76a66ab50deccc2dc8329d Mon Sep 17 00:00:00 2001
+From: Viktor Mihajlovski <[e-mail]>
+Date: Wed, 14 Apr 2021 13:01:35 +0200
+Subject: [PATCH] network: enable DHCP broadcast flag if required by interface
+
+Some interfaces require that the DHCPOFFER message is sent via broadcast
+if they can't receive unicast messages before they've been configured
+with an IP address.
+
+E.g., s390 ccwgroup network interfaces operating in layer3 mode face
+this limitation. This can prevent the interfaces from receiving an
+IP address via DHCP, if the have been configured for layer3.
+
+To allow DHCP over such interfaces, we're introducing a new device
+property ID_NET_DHCP_BROADCAST which can be set for those.
+The networkd DHCP client will check whether this property is set
+for an interface, and if so will set the broadcast flag, unless
+the network configuration for the interface has an explicit
+RequestBroadcast setting.
+
+Besides that, we're adding a udev rule to set this device property
+for ccwgroup devices operating in layer3 mode, which is the case
+if the ID_NET_DRIVER property is qeth_l3.
+
+Supercedes #18829
+---
+ rules.d/81-net-dhcp.rules                | 14 ++++++++++++
+ rules.d/meson.build                      |  1 +
+ src/network/networkd-dhcp4.c             | 27 ++++++++++++++++++++++--
+ src/network/networkd-network-gperf.gperf |  4 ++--
+ src/network/networkd-network.c           |  1 +
+ src/network/networkd-network.h           |  2 +-
+ 6 files changed, 44 insertions(+), 5 deletions(-)
+ create mode 100644 rules.d/81-net-dhcp.rules
+
+--- /dev/null
++++ b/rules.d/81-net-dhcp.rules
+@@ -0,0 +1,14 @@
++# do not edit this file, it will be overwritten on update
++
++ACTION=="remove", GOTO="net_dhcp_end"
++SUBSYSTEM!="net", GOTO="net_dhcp_end"
++
++# Network interfaces requiring DHCPOFFER messages to be broadcast
++# must set ID_NET_DHCP_BROADCAST to "1". This property will be
++# checked by the networkd DHCP4 client to set the DHCP option
++
++# s390 ccwgroup interfaces in layer3 mode need broadcast DHCPOFFER
++# using the link driver to detect this condition
++ENV{ID_NET_DRIVER}=="qeth_l3", ENV{ID_NET_DHCP_BROADCAST}="1"
++
++LABEL="net_dhcp_end"
+--- a/rules.d/meson.build
++++ b/rules.d/meson.build
+@@ -22,6 +22,7 @@
+         75-probe_mtd.rules
+         78-sound-card.rules
+         80-net-setup-link.rules
++        81-net-dhcp.rules
+ '''.split())
+ 
+ if conf.get('HAVE_KMOD') == 1
+--- a/src/network/networkd-dhcp4.c
++++ b/src/network/networkd-dhcp4.c
+@@ -1316,6 +1316,30 @@
+         return 0;
+ }
+ 
++static bool link_needs_dhcp_broadcast(Link *link) {
++        const char *val;
++        int r;
++
++        assert(link);
++        assert(link->network);
++
++        /* Return the setting in DHCP[4].RequestBroadcast if specified. Otherwise return the device property
++         * ID_NET_DHCP_BROADCAST setting, which may be set for interfaces requiring that the DHCPOFFER message
++         * is being broadcast because they can't  handle unicast messages while not fully configured.
++         * If neither is set or a failure occurs, return false, which is the default for this flag.
++         */
++        r = link->network->dhcp_broadcast;
++        if (r < 0 && link->sd_device && sd_device_get_property_value(link->sd_device, "ID_NET_DHCP_BROADCAST", &val) >= 0) {
++                r = parse_boolean(val);
++                if (r < 0)
++                        log_link_warning_errno(link, r, "DHCP4 CLIENT: Failed to parse ID_NET_DHCP_BROADCAST, ignoring: %m");
++                else
++                        log_link_debug(link, "DHCP4 CLIENT: Detected ID_NET_DHCP_BROADCAST='%d'.", r);
++
++        }
++        return r == true;
++}
++
+ int dhcp4_configure(Link *link) {
+         sd_dhcp_option *send_option;
+         void *request_options;
+@@ -1350,8 +1374,7 @@
+         if (r < 0)
+                 return log_link_error_errno(link, r, "DHCP4 CLIENT: Failed to set callback: %m");
+ 
+-        r = sd_dhcp_client_set_request_broadcast(link->dhcp_client,
+-                                                 link->network->dhcp_broadcast);
++        r = sd_dhcp_client_set_request_broadcast(link->dhcp_client, link_needs_dhcp_broadcast(link));
+         if (r < 0)
+                 return log_link_error_errno(link, r, "DHCP4 CLIENT: Failed to set request flag for broadcast: %m");
+ 
+--- a/src/network/networkd-network-gperf.gperf
++++ b/src/network/networkd-network-gperf.gperf
+@@ -196,7 +196,7 @@
+ DHCPv4.Anonymize,                            config_parse_bool,                                        0,                             offsetof(Network, dhcp_anonymize)
+ DHCPv4.SendHostname,                         config_parse_bool,                                        0,                             offsetof(Network, dhcp_send_hostname)
+ DHCPv4.Hostname,                             config_parse_hostname,                                    0,                             offsetof(Network, dhcp_hostname)
+-DHCPv4.RequestBroadcast,                     config_parse_bool,                                        0,                             offsetof(Network, dhcp_broadcast)
++DHCPv4.RequestBroadcast,                     config_parse_tristate,                                    0,                             offsetof(Network, dhcp_broadcast)
+ DHCPv4.VendorClassIdentifier,                config_parse_string,                                      0,                             offsetof(Network, dhcp_vendor_class_identifier)
+ DHCPv4.MUDURL,                               config_parse_dhcp_mud_url,                                0,                             0
+ DHCPv4.MaxAttempts,                          config_parse_dhcp_max_attempts,                           0,                             0
+@@ -454,7 +454,7 @@
+ DHCP.Anonymize,                              config_parse_bool,                                        0,                             offsetof(Network, dhcp_anonymize)
+ DHCP.SendHostname,                           config_parse_bool,                                        0,                             offsetof(Network, dhcp_send_hostname)
+ DHCP.Hostname,                               config_parse_hostname,                                    0,                             offsetof(Network, dhcp_hostname)
+-DHCP.RequestBroadcast,                       config_parse_bool,                                        0,                             offsetof(Network, dhcp_broadcast)
++DHCP.RequestBroadcast,                       config_parse_tristate,                                    0,                             offsetof(Network, dhcp_broadcast)
+ DHCP.CriticalConnection,                     config_parse_tristate,                                    0,                             offsetof(Network, dhcp_critical)
+ DHCP.VendorClassIdentifier,                  config_parse_string,                                      0,                             offsetof(Network, dhcp_vendor_class_identifier)
+ DHCP.UserClass,                              config_parse_dhcp_user_class,                             AF_INET,                       offsetof(Network, dhcp_user_class)
+--- a/src/network/networkd-network.c
++++ b/src/network/networkd-network.c
+@@ -398,6 +398,7 @@
+                 .dhcp_use_mtu = false,
+                 /* NOTE: from man: UseTimezone=... Defaults to "no".*/
+                 .dhcp_use_timezone = false,
++                .dhcp_broadcast = -1,
+                 .dhcp_ip_service_type = -1,
+ 
+                 .dhcp6_rapid_commit = true,
+--- a/src/network/networkd-network.h
++++ b/src/network/networkd-network.h
+@@ -140,7 +140,7 @@
+         int dhcp_ip_service_type;
+         bool dhcp_anonymize;
+         bool dhcp_send_hostname;
+-        bool dhcp_broadcast;
++        int dhcp_broadcast;
+         bool dhcp_use_dns;
+         bool dhcp_use_dns_set;
+         bool dhcp_routes_to_dns;
diff --git a/debian/patches/series b/debian/patches/series
index 5f5cf90..3ab6e88 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -94,3 +94,4 @@ lp1891215/0001-fs-util-add-conservative_rename-that-suppresses-unne.patch
 lp1891215/0002-resolved-don-t-update-resolv.conf-snippets-unnecessa.patch
 lp1891215/0003-fs-util-rename-conservative_rename-conservative_rena.patch
 lp1891215/0004-fs-util-make-sure-conservative_renameat-properly-det.patch
+lp1914740-network-enable-DHCP-broadcast-flag-if-required-by-in.patch