From: Lennart Poettering Date: Mon, 18 Feb 2019 11:58:32 +0000 (+0100) Subject: Merge pull request #11698 from yuwata/fix-network-route-table X-Git-Tag: v242~348 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=702451b038ca76376a327baea30a88d7383b93ca;p=platform%2Fupstream%2Fsystemd.git Merge pull request #11698 from yuwata/fix-network-route-table network: honor specified route table --- 702451b038ca76376a327baea30a88d7383b93ca diff --cc src/network/networkd-network-gperf.gperf index bd79c54,45343f4..36b09f8 --- a/src/network/networkd-network-gperf.gperf +++ b/src/network/networkd-network-gperf.gperf @@@ -147,11 -146,9 +147,11 @@@ DHCP.IAID DHCP.ListenPort, config_parse_uint16, 0, offsetof(Network, dhcp_client_port) DHCP.RapidCommit, config_parse_bool, 0, offsetof(Network, rapid_commit) DHCP.ForceDHCPv6PDOtherInformation, config_parse_bool, 0, offsetof(Network, dhcp6_force_pd_other_information) +IPv6AcceptRA.UseAutonomousPrefix, config_parse_bool, 0, offsetof(Network, ipv6_accept_ra_use_autonomous_prefix) +IPv6AcceptRA.UseOnLinkPrefix, config_parse_bool, 0, offsetof(Network, ipv6_accept_ra_use_onlink_prefix) IPv6AcceptRA.UseDNS, config_parse_bool, 0, offsetof(Network, ipv6_accept_ra_use_dns) IPv6AcceptRA.UseDomains, config_parse_dhcp_use_domains, 0, offsetof(Network, ipv6_accept_ra_use_domains) - IPv6AcceptRA.RouteTable, config_parse_uint32, 0, offsetof(Network, ipv6_accept_ra_route_table) + IPv6AcceptRA.RouteTable, config_parse_section_route_table, 0, 0 DHCPServer.MaxLeaseTimeSec, config_parse_sec, 0, offsetof(Network, dhcp_server_max_lease_time_usec) DHCPServer.DefaultLeaseTimeSec, config_parse_sec, 0, offsetof(Network, dhcp_server_default_lease_time_usec) DHCPServer.EmitDNS, config_parse_bool, 0, offsetof(Network, dhcp_server_emit_dns) diff --cc src/network/networkd-network.c index 2d23322,097eb0a..45bf44c --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@@ -206,9 -206,8 +206,10 @@@ int network_load_one(Manager *manager, .multicast = -1, .allmulticast = -1, .ipv6_accept_ra_use_dns = true, + .ipv6_accept_ra_use_autonomous_prefix = true, + .ipv6_accept_ra_use_onlink_prefix = true, .ipv6_accept_ra_route_table = RT_TABLE_MAIN, + .ipv6_accept_ra_route_table_set = false, }; r = config_parse_many(filename, network_dirs, dropin_dirname,