diff options
| author | Tom Gundersen <teg@jklm.no> | 2015-02-09 16:22:34 +0100 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2015-02-09 16:53:54 +0100 |
| commit | 769b56a308c3f3d3952eda87fd4fb004207f4f49 (patch) | |
| tree | 92b070e47c90f30dcc6131d21cf09606eedf73bb | |
| parent | e2acdb6b0f68d9b4152708a9f21bf9e11f8b9e7e (diff) | |
networkd: support route scopes
For now we only support the hardcoded values RT_SCOPE_{UNIVERSE,LOCAL,HOST},
and not numerical values or values from /etc/iproute2/rt_scopes.
This addresses https://bugs.freedesktop.org/show_bug.cgi?id=88508.
| -rw-r--r-- | man/systemd.network.xml | 8 | ||||
| -rw-r--r-- | src/network/networkd-network-gperf.gperf | 1 | ||||
| -rw-r--r-- | src/network/networkd-route.c | 41 | ||||
| -rw-r--r-- | src/network/networkd.h | 4 |
4 files changed, 54 insertions, 0 deletions
diff --git a/man/systemd.network.xml b/man/systemd.network.xml index 6c137e16e..9b3a92d26 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -469,6 +469,14 @@ <para>The metric of the route. An unsigned integer</para> </listitem> </varlistentry> + <varlistentry> + <term><varname>Scope=</varname></term> + <listitem> + <para>The scope of the route. One of the values <literal>global</literal>, + <literal>link</literal> or <literal>host</literal>. Defaults to + <literal>global</literal>.</para> + </listitem> + </varlistentry> </variablelist> </refsect1> diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf index 6f295488b..1731e0422 100644 --- a/src/network/networkd-network-gperf.gperf +++ b/src/network/networkd-network-gperf.gperf @@ -56,6 +56,7 @@ 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.UseDNS, config_parse_bool, 0, offsetof(Network, dhcp_dns) DHCP.UseMTU, config_parse_bool, 0, offsetof(Network, dhcp_mtu) DHCP.UseHostname, config_parse_bool, 0, offsetof(Network, dhcp_hostname) diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c index 590dd49df..c2d1ffca2 100644 --- a/src/network/networkd-route.c +++ b/src/network/networkd-route.c @@ -427,3 +427,44 @@ int config_parse_route_priority(const char *unit, return 0; } + +int config_parse_route_scope(const char *unit, + const char *filename, + unsigned line, + const char *section, + unsigned section_line, + const char *lvalue, + int ltype, + const char *rvalue, + void *data, + void *userdata) { + Network *network = userdata; + _cleanup_route_free_ Route *n = NULL; + int r; + + assert(filename); + assert(section); + assert(lvalue); + assert(rvalue); + assert(data); + + r = route_new_static(network, section_line, &n); + if (r < 0) + return r; + + if (streq(rvalue, "host")) + n->scope = RT_SCOPE_HOST; + else if (streq(rvalue, "link")) + n->scope = RT_SCOPE_LINK; + else if (streq(rvalue, "global")) + n->scope = RT_SCOPE_UNIVERSE; + else { + log_syntax(unit, LOG_ERR, filename, line, EINVAL, + "Unknown route scope: %s", rvalue); + return 0; + } + + n = NULL; + + return 0; +} diff --git a/src/network/networkd.h b/src/network/networkd.h index 6fb920b15..22cc51d93 100644 --- a/src/network/networkd.h +++ b/src/network/networkd.h @@ -352,6 +352,10 @@ int config_parse_destination(const char *unit, const char *filename, unsigned li int config_parse_route_priority(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); + +int config_parse_route_scope(const char *unit, const char *filename, unsigned line, + const char *section, unsigned section_line, const char *lvalue, + int ltype, const char *rvalue, void *data, void *userdata); /* Address */ int address_new_static(Network *network, unsigned section, Address **ret); int address_new_dynamic(Address **ret); |