X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-network-gperf.gperf;h=8abf5bcf2e8097cb3ca58602049ce08c4ba32ed9;hb=914d6c09f1a449c60c8495c179a8bbe012315ba2;hp=525f2ba799ad2ce99ea47a0784322e6ab475e49f;hpb=d0d6a4cd70477970812bff0a37e70f66208d7c14;p=elogind.git

diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf
index 525f2ba79..8abf5bcf2 100644
--- a/src/network/networkd-network-gperf.gperf
+++ b/src/network/networkd-network-gperf.gperf
@@ -16,10 +16,10 @@ struct ConfigPerfItem;
 %includes
 %%
 Match.MACAddress,            config_parse_hwaddr,                0,                             offsetof(Network, match_mac)
-Match.Path,                  config_parse_string,                0,                             offsetof(Network, match_path)
-Match.Driver,                config_parse_string,                0,                             offsetof(Network, match_driver)
-Match.Type,                  config_parse_string,                0,                             offsetof(Network, match_type)
-Match.Name,                  config_parse_ifname,                0,                             offsetof(Network, match_name)
+Match.Path,                  config_parse_strv,                  0,                             offsetof(Network, match_path)
+Match.Driver,                config_parse_strv,                  0,                             offsetof(Network, match_driver)
+Match.Type,                  config_parse_strv,                  0,                             offsetof(Network, match_type)
+Match.Name,                  config_parse_ifnames,               0,                             offsetof(Network, match_name)
 Match.Host,                  config_parse_net_condition,         CONDITION_HOST,                offsetof(Network, match_host)
 Match.Virtualization,        config_parse_net_condition,         CONDITION_VIRTUALIZATION,      offsetof(Network, match_virt)
 Match.KernelCommandLine,     config_parse_net_condition,         CONDITION_KERNEL_COMMAND_LINE, offsetof(Network, match_kernel)
@@ -36,8 +36,9 @@ Network.VXLAN,               config_parse_netdev,                0,
 Network.Tunnel,              config_parse_tunnel,                0,                             0
 Network.DHCP,                config_parse_dhcp,                  0,                             offsetof(Network, dhcp)
 Network.DHCPServer,          config_parse_bool,                  0,                             offsetof(Network, dhcp_server)
-Network.LinkLocal,           config_parse_address_family_boolean,0,                             offsetof(Network, link_local)
+Network.LinkLocalAddressing, config_parse_address_family_boolean,0,                             offsetof(Network, link_local)
 Network.IPv4LLRoute,         config_parse_bool,                  0,                             offsetof(Network, ipv4ll_route)
+Network.IPv6Token,           config_parse_ipv6token,             0,                             offsetof(Network, ipv6_token)
 Network.LLDP,                config_parse_bool,                  0,                             offsetof(Network, lldp)
 Network.Address,             config_parse_address,               0,                             0
 Network.Gateway,             config_parse_gateway,               0,                             0
@@ -47,6 +48,7 @@ Network.LLMNR,               config_parse_llmnr,                 0,
 Network.NTP,                 config_parse_strv,                  0,                             offsetof(Network, ntp)
 Network.IPForward,           config_parse_address_family_boolean,0,                             offsetof(Network, ip_forward)
 Network.IPMasquerade,        config_parse_bool,                  0,                             offsetof(Network, ip_masquerade)
+Network.BindCarrier,         config_parse_strv,                  0,                             offsetof(Network, bind_carrier)
 Address.Address,             config_parse_address,               0,                             0
 Address.Peer,                config_parse_address,               0,                             0
 Address.Broadcast,           config_parse_broadcast,             0,                             0
@@ -55,7 +57,10 @@ Route.Gateway,               config_parse_gateway,               0,
 Route.Destination,           config_parse_destination,           0,                             0
 Route.Source,                config_parse_destination,           0,                             0
 Route.Metric,                config_parse_route_priority,        0,                             0
+Route.Scope,                 config_parse_route_scope,           0,                             0
+DHCP.ClientIdentifier,       config_parse_dhcp_client_identifier,0,                             offsetof(Network, dhcp_client_identifier)
 DHCP.UseDNS,                 config_parse_bool,                  0,                             offsetof(Network, dhcp_dns)
+DHCP.UseNTP,                 config_parse_bool,                  0,                             offsetof(Network, dhcp_ntp)
 DHCP.UseMTU,                 config_parse_bool,                  0,                             offsetof(Network, dhcp_mtu)
 DHCP.UseHostname,            config_parse_bool,                  0,                             offsetof(Network, dhcp_hostname)
 DHCP.UseDomains,             config_parse_bool,                  0,                             offsetof(Network, dhcp_domains)