Merge pull request #18007 from fw-strlen/ipv6_masq_and_dnat

Support ipv6 for masquerade and dnat in nspawn and networkd

diff --cc man/systemd.network.xml
Simple merge

diff --cc src/network/networkd-address.c
Simple merge

diff --cc src/network/networkd-address.h
Simple merge

diff --cc src/network/networkd-network-gperf.gperf
Simple merge

diff --cc src/network/networkd-network.c
Simple merge

diff --cc src/network/networkd-network.h
Simple merge

diff --cc src/network/networkd-util.c
index a5c6fa8d006129e091ee2d2ffa1d64268020f00d,02a6800a414d0fb2087321032b576f77f2433d90..494b23f9f4ab719edd14f1ad32d2ed26de21284e
--- 1/src/network/networkd-util.c
--- 2/src/network/networkd-util.c
+++ b/src/network/networkd-util.c
@@@ -58,9 -51,18 +58,19 @@@ DEFINE_STRING_TABLE_LOOKUP(routing_poli
  DEFINE_STRING_TABLE_LOOKUP(duplicate_address_detection_address_family, AddressFamily);
  DEFINE_CONFIG_PARSE_ENUM(config_parse_link_local_address_family, link_local_address_family,
                           AddressFamily, "Failed to parse option");
 +DEFINE_STRING_TABLE_LOOKUP_FROM_STRING(dhcp_deprecated_address_family, AddressFamily);
  DEFINE_STRING_TABLE_LOOKUP(dhcp_lease_server_type, sd_dhcp_lease_server_type);
  
+ static AddressFamily address_family_compat_from_string(const char *s) {
+         if (streq_ptr(s, "yes"))         /* compat name */
+                 return ADDRESS_FAMILY_IPV4;
+         if (streq_ptr(s, "both"))
+                 return ADDRESS_FAMILY_YES;
+         return address_family_from_string(s);
+ }
+ DEFINE_CONFIG_PARSE_ENUM(config_parse_address_family_compat, address_family_compat,
+                          AddressFamily, "Failed to parse option");
+ 
  int config_parse_address_family_with_kernel(
                  const char* unit,
                  const char *filename,

diff --cc src/network/networkd-util.h
Simple merge

diff --cc src/nspawn/nspawn.c
Simple merge

diff --cc src/shared/firewall-util-nft.c
Simple merge