[systemd-commits] 3 commits - man/systemd.network.xml src/network

[Tom Gundersen]

 man/systemd.network.xml                  |   10 +++++++++-
 src/network/networkd-network-gperf.gperf |    4 ++--
 src/network/networkd-network.c           |    2 +-
 src/network/networkd.h                   |    6 +++---
 4 files changed, 15 insertions(+), 7 deletions(-)

New commits:
commit 60c35566600f45350c37f152c1093018972bd9a5
Author: Tom Gundersen <teg at jklm.no>
Date:   Sat Feb 14 00:32:56 2015 +0100

    networkd: network - rename ipv6token parser
    
    Too generic name.

diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf
index 2aa30a2..fc277df 100644
--- a/src/network/networkd-network-gperf.gperf
+++ b/src/network/networkd-network-gperf.gperf
@@ -38,7 +38,7 @@ Network.DHCP,                config_parse_dhcp,                  0,
 Network.DHCPServer,          config_parse_bool,                  0,                             offsetof(Network, dhcp_server)
 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_token,                 0,                             offsetof(Network, ipv6_token)
+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
diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index c90f730..35ac064 100644
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -651,7 +651,7 @@ int config_parse_llmnr(
         return 0;
 }
 
-int config_parse_token(
+int config_parse_ipv6token(
                 const char* unit,
                 const char *filename,
                 unsigned line,
diff --git a/src/network/networkd.h b/src/network/networkd.h
index 7f1f06c..bdb2f20 100644
--- a/src/network/networkd.h
+++ b/src/network/networkd.h
@@ -411,9 +411,9 @@ int config_parse_ipv4ll(const char *unit, const char *filename, unsigned line,
                         int ltype, const char *rvalue, void *data, void *userdata);
 
 /* IPv6 support */
-int config_parse_token(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_ipv6token(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);
 
 /* LLMNR support */
 

commit 56fd6bf795926409b087bce406ea851ad89f9fe8
Author: Tom Gundersen <teg at jklm.no>
Date:   Sat Feb 14 00:32:26 2015 +0100

    networkd: .network - rename LinkLocal to LinkLocalAddressing
    
    Makes it a bit less ambiguous.

diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index 8e05388..485876b 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -238,7 +238,7 @@
           </listitem>
         </varlistentry>
         <varlistentry>
-          <term><varname>LinkLocal=</varname></term>
+          <term><varname>LinkLocalAddressing=</varname></term>
           <listitem>
             <para>Enables link-local address autoconfiguration. Accepts
             <literal>yes</literal>, <literal>no</literal>,
diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf
index 9f6e65f..2aa30a2 100644
--- a/src/network/networkd-network-gperf.gperf
+++ b/src/network/networkd-network-gperf.gperf
@@ -36,7 +36,7 @@ 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_token,                 0,                             offsetof(Network, ipv6_token)
 Network.LLDP,                config_parse_bool,                  0,                             offsetof(Network, lldp)

commit 113bfde15f9393fa8bc22cbd839c0bc64e733ee2
Author: Tom Gundersen <teg at jklm.no>
Date:   Sat Feb 14 00:30:51 2015 +0100

    man: systemd.network - document IPv6Token

diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index 069b605..8e05388 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -256,6 +256,14 @@
           </listitem>
         </varlistentry>
         <varlistentry>
+          <term><varname>IPv6Token=</varname></term>
+          <listitem>
+            <para>An IPv6 address with the top 64 bits unset. When set, indicates the
+            64 bits interface part of SLAAC IPv6 addresses for this link. By default
+            it is autogenerated.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
           <term><varname>LLMNR=</varname></term>
           <listitem>
             <para>A boolean or <literal>resolve</literal>. When true, enables