shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-12 13:18:14 +03:00
Code

networkd: ipv4ll - default to setting up ipv4ll routes

Browse Source 
This is necessary for non-ipv4ll hosts to communicate with ipv4ll-only hosts on the same link. Defaults
to being enabled, but can be opted out.

See: <http://avahi.org/wiki/AvahiAutoipd#Routes>
This commit is contained in:
Tom Gundersen 2014-07-25 02:09:29 +02:00
parent 3c072310d5
commit bfa695b5cc
4 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
man/systemd.network.xml
View File

@ -218,6 +218,15 @@
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>IPv4LLRoute=</varname></term>
<listitem>
<para>A boolean. When true, sets up the route needed for
non-IPv4LL hosts to communicate with IPv4LL-only hosts. Defaults
to true.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>Address=</varname></term>
<listitem>

1
src/network/networkd-network-gperf.gperf
View File

@ -33,6 +33,7 @@ Network.VXLAN, config_parse_netdev, 0,
Network.DHCP, config_parse_dhcp, 0, offsetof(Network, dhcp)
Network.DHCPServer, config_parse_bool, 0, offsetof(Network, dhcp_server)
Network.IPv4LL, config_parse_bool, 0, offsetof(Network, ipv4ll)
Network.IPv4LLRoute, config_parse_bool, 0, offsetof(Network, ipv4ll_route)
Network.Address, config_parse_address, 0, 0
Network.Gateway, config_parse_gateway, 0, 0
Network.DNS, config_parse_strv, 0, offsetof(Network, dns)

22
src/network/networkd-network.c
View File

@ -86,6 +86,8 @@ static int network_load_one(Manager *manager, const char *filename) {
if (!network->filename)
return log_oom();
network->ipv4ll_route = true;
network->dhcp_ntp = true;
network->dhcp_dns = true;
network->dhcp_hostname = true;
@ -247,6 +249,26 @@ int network_apply(Manager *manager, Network *network, Link *link) {
link->network = network;
if (network->ipv4ll_route) {
Route *route;
r = route_new_static(network, 0, &route);
if (r < 0)
return r;
r = inet_pton(AF_INET, "169.254.0.0", &route->dst_addr.in);
if (r == 0)
return -EINVAL;
if (r < 0)
return -errno;
route->family = AF_INET;
route->dst_prefixlen = 16;
route->scope = RT_SCOPE_LINK;
route->metrics = IPV4LL_ROUTE_METRIC;
route->protocol = RTPROT_STATIC;
}
if (network->dns || network->ntp) {
r = link_save(link);
if (r < 0)

1
src/network/networkd.h
View File

@ -96,6 +96,7 @@ struct Network {
bool dhcp_critical;
bool dhcp_routes;
bool ipv4ll;
bool ipv4ll_route;
bool dhcp_server;