[systemd-commits] 3 commits - man/systemd-networkd.service.xml src/network
Tom Gundersen
tomegun at kemper.freedesktop.org
Tue Dec 17 01:01:23 PST 2013
man/systemd-networkd.service.xml | 22 ++++++++++++++++--
src/network/networkd-gperf.gperf | 2 +
src/network/networkd-link.c | 2 -
src/network/networkd-route.c | 47 ++++++++++++++++++++++++---------------
4 files changed, 53 insertions(+), 20 deletions(-)
New commits:
commit a53692f7b4fb0af771bd510436cc592ef2919f86
Author: Tom Gundersen <teg at jklm.no>
Date: Sat Dec 7 23:23:18 2013 +0100
man: networkd - clarify Address/Gateway keys in [Network] section
diff --git a/man/systemd-networkd.service.xml b/man/systemd-networkd.service.xml
index 4cd0872..6c65fba 100644
--- a/man/systemd-networkd.service.xml
+++ b/man/systemd-networkd.service.xml
@@ -175,7 +175,7 @@
separated by a '/' character. The format of the address must
be as described in
<citerefentry><refentrytitle>inet_pton</refentrytitle><manvolnum>3</manvolnum></citerefentry>
- .</para>
+ . This is a short-hand for an [Address] section only containing an Address key (see below).</para>
</listitem>
</varlistentry>
<varlistentry>
@@ -183,7 +183,7 @@
<listitem>
<para>The gateway address, which must be in the format described in
<citerefentry><refentrytitle>inet_pton</refentrytitle><manvolnum>3</manvolnum></citerefentry>
- .</para>
+ . This is a short-hand for a [Route] section only containing a Gateway key.</para>
</listitem>
</varlistentry>
<varlistentry>
commit ae4c67a7c6bb4efb858822838efe81008c965a98
Author: Tom Gundersen <teg at jklm.no>
Date: Sat Dec 7 23:03:19 2013 +0100
networkd: add support for Route sections
diff --git a/man/systemd-networkd.service.xml b/man/systemd-networkd.service.xml
index 1344325..4cd0872 100644
--- a/man/systemd-networkd.service.xml
+++ b/man/systemd-networkd.service.xml
@@ -209,6 +209,24 @@
<para>An address label.</para>
</listitem>
</varlistentry>
+ </variablelist>
+
+ <para>The <literal>[Route]</literal> section accepts the following keys:</para>
+
+ <variablelist class='network-directives'>
+ <varlistentry>
+ <term><varname>Gateway</varname></term>
+ <listitem>
+ <para>As in the <literal>[Network]</literal> section.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><varname>Destination</varname></term>
+ <listitem>
+ <para>The destination prefix of the route. Possibly followed by a slash and the
+ prefixlength, if ommitted a full-length host route is assumed.</para>
+ </listitem>
+ </varlistentry>
</variablelist>
</refsect2>
</refsect1>
diff --git a/src/network/networkd-gperf.gperf b/src/network/networkd-gperf.gperf
index 385f1bb..f710df6 100644
--- a/src/network/networkd-gperf.gperf
+++ b/src/network/networkd-gperf.gperf
@@ -26,5 +26,7 @@ Network.Address, config_parse_address, 0, 0
Network.Gateway, config_parse_gateway, 0, 0
Address.Address, config_parse_address, 0, 0
Address.Label, config_parse_label, 0, 0
+Route.Gateway, config_parse_gateway, 0, 0
+Route.Destination, config_parse_destination, 0, 0
Bridge.Description, config_parse_string, 0, offsetof(Bridge, description)
Bridge.Name, config_parse_ifname, 0, offsetof(Bridge, name)
diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c
index 22604b3..3eaefa2 100644
--- a/src/network/networkd-route.c
+++ b/src/network/networkd-route.c
@@ -110,12 +110,12 @@ int route_configure(Route *route, Link *link,
log_error("Could not append RTA_DST attribute: %s", strerror(-r));
return r;
}
- }
- r = sd_rtnl_message_route_set_dst_prefixlen(req, route->dst_prefixlen);
- if (r < 0) {
- log_error("Could not set destination prefix length: %s", strerror(-r));
- return r;
+ r = sd_rtnl_message_route_set_dst_prefixlen(req, route->dst_prefixlen);
+ if (r < 0) {
+ log_error("Could not set destination prefix length: %s", strerror(-r));
+ return r;
+ }
}
r = sd_rtnl_message_append_u32(req, RTA_OIF, link->ifindex);
@@ -204,20 +204,9 @@ int config_parse_destination(const char *unit,
/* Destination=address/prefixlen */
- /* prefixlen */
+ /* address */
e = strchr(rvalue, '/');
if (e) {
- unsigned i;
- r = safe_atou(e + 1, &i);
- if (r < 0) {
- log_syntax(unit, LOG_ERR, filename, line, EINVAL,
- "Route destination prefix length is invalid, "
- "ignoring assignment: %s", e + 1);
- return 0;
- }
-
- n->dst_prefixlen = (unsigned char) i;
-
address = strndup(rvalue, e - rvalue);
if (!address)
return log_oom();
@@ -234,6 +223,30 @@ int config_parse_destination(const char *unit,
return 0;
}
+ /* prefixlen */
+ if (e) {
+ unsigned i;
+
+ r = safe_atou(e + 1, &i);
+ if (r < 0) {
+ log_syntax(unit, LOG_ERR, filename, line, EINVAL,
+ "Route destination prefix length is invalid, "
+ "ignoring assignment: %s", e + 1);
+ return 0;
+ }
+
+ n->dst_prefixlen = (unsigned char) i;
+ } else {
+ switch (n->family) {
+ case AF_INET:
+ n->dst_prefixlen = 32;
+ break;
+ case AF_INET6:
+ n->dst_prefixlen = 128;
+ break;
+ }
+ }
+
n = NULL;
return 0;
commit b0d27a25089e3aa7d9222497005a1d9fff71e59d
Author: Tom Gundersen <teg at jklm.no>
Date: Wed Dec 4 16:21:36 2013 +0100
networkd: correct logging message
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 7684d65..4cf34a6 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -248,7 +248,7 @@ static int link_get_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
r = sd_rtnl_message_get_errno(m);
if (r < 0) {
- log_warning("Could not bring up interface '%s': %s",
+ log_warning("Could not get state of interface '%s': %s",
link->ifname, strerror(-r));
link_enter_failed(link);
}
More information about the systemd-commits
mailing list