DHCP DUID, IAID configuration options

12 files changed, 303 insertions, 1 deletions

diff --git a/src/network/networkd-conf.c b/src/network/networkd-conf.c
new file mode 100644
index 0000000000..8b149124b3
--- /dev/null
+++ b/src/network/networkd-conf.c
@@ -0,0 +1,155 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+/***
+  This file is part of systemd.
+
+  Copyright 2014 Vinay Kulkarni <kulkarniv@vmware.com>
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ ***/
+
+#include <ctype.h>
+
+#include "conf-parser.h"
+#include "def.h"
+#include "dhcp-identifier.h"
+#include "networkd-conf.h"
+#include "string-table.h"
+
+int manager_parse_config_file(Manager *m) {
+        assert(m);
+
+        return config_parse_many(PKGSYSCONFDIR "/networkd.conf",
+                                 CONF_PATHS_NULSTR("systemd/networkd.conf.d"),
+                                 "DUID\0",
+                                 config_item_perf_lookup, networkd_gperf_lookup,
+                                 false, m);
+}
+
+static const char* const duid_type_table[_DUID_TYPE_MAX] = {
+        [DUID_TYPE_RAW]  = "raw",
+        [DUID_TYPE_LLT]  = "link-layer-time",
+        [DUID_TYPE_EN]   = "vendor",
+        [DUID_TYPE_LL]   = "link-layer",
+        [DUID_TYPE_UUID] = "uuid"
+};
+DEFINE_PRIVATE_STRING_TABLE_LOOKUP_FROM_STRING(duid_type, DUIDType);
+DEFINE_CONFIG_PARSE_ENUM(config_parse_duid_type, duid_type, DUIDType, "Failed to parse DUID type");
+
+int config_parse_duid_rawdata(
+                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 r;
+        long byte;
+        char *cbyte, *pnext;
+        const char *pduid = rvalue;
+        size_t count = 0, duid_index = 0;
+        Manager *m;
+        Network *n;
+        DUIDType *duid_type;
+        uint16_t *dhcp_duid_type;
+        size_t *dhcp_duid_len;
+        uint8_t *dhcp_duid;
+
+        assert(filename);
+        assert(lvalue);
+        assert(rvalue);
+        assert(userdata);
+
+        if (ltype == DUID_CONFIG_SOURCE_GLOBAL) {
+                m = userdata;
+                duid_type = &m->duid_type;
+                dhcp_duid_type = &m->dhcp_duid_type;
+                dhcp_duid_len = &m->dhcp_duid_len;
+                dhcp_duid = m->dhcp_duid;
+        } else {
+                /* DUID_CONFIG_SOURCE_NETWORK */
+                n = userdata;
+                duid_type = &n->duid_type;
+                dhcp_duid_type = &n->dhcp_duid_type;
+                dhcp_duid_len = &n->dhcp_duid_len;
+                dhcp_duid = n->dhcp_duid;
+        }
+
+        if (*duid_type == _DUID_TYPE_INVALID)
+                *duid_type = DUID_TYPE_RAW;
+
+        switch (*duid_type) {
+        case DUID_TYPE_LLT:
+                /* RawData contains DUID-LLT link-layer address (offset 6) */
+                duid_index = 6;
+                break;
+        case DUID_TYPE_EN:
+                /* RawData contains DUID-EN identifier (offset 4) */
+                duid_index = 4;
+                break;
+        case DUID_TYPE_LL:
+                /* RawData contains DUID-LL link-layer address (offset 2) */
+                duid_index = 2;
+                break;
+        case DUID_TYPE_UUID:
+                /* RawData specifies UUID (offset 0) - fall thru */
+        case DUID_TYPE_RAW:
+                /* First two bytes of RawData is DUID Type - fall thru */
+        default:
+                break;
+        }
+
+        if (*duid_type != DUID_TYPE_RAW)
+                *dhcp_duid_type = (uint16_t)(*duid_type);
+
+        /* RawData contains DUID in format " NN:NN:NN... " */
+        while (true) {
+                r = extract_first_word(&pduid, &cbyte, ":", 0);
+                if (r < 0) {
+                        log_error("Failed to read DUID.");
+                        return -EINVAL;
+                }
+                if (r == 0)
+                        break;
+                if (duid_index >= MAX_DUID_LEN) {
+                        log_error("DUID length exceeds maximum length.");
+                        return -EINVAL;
+                }
+
+                errno = 0;
+                byte = strtol(cbyte, &pnext, 16);
+                if ((errno == ERANGE && (byte == LONG_MAX || byte == LONG_MIN))
+                    || (errno != 0 && byte == 0) || (cbyte == pnext)) {
+                        log_error("Invalid DUID byte: %s.", cbyte);
+                        return -EINVAL; 
+                }
+
+                /* If DUID_TYPE_RAW, first two bytes hold DHCP DUID type code */
+                if ((*duid_type == DUID_TYPE_RAW) && (count < 2)) {
+                        *dhcp_duid_type |= (byte << (8 * (1 - count)));
+                        count++;
+                        continue;
+                }
+
+                dhcp_duid[duid_index++] = byte;
+        }
+
+        *dhcp_duid_len = duid_index;
+
+        return 0;
+}
diff --git a/src/network/networkd-conf.h b/src/network/networkd-conf.h
new file mode 100644
index 0000000000..efc370f839
--- /dev/null
+++ b/src/network/networkd-conf.h
@@ -0,0 +1,36 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+#pragma once
+
+/***
+  This file is part of systemd.
+
+  Copyright 2014 Vinay Kulkarni <kulkarniv@vmware.com>
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include "networkd.h"
+
+typedef enum DuidConfigSource {
+        DUID_CONFIG_SOURCE_GLOBAL = 0,
+        DUID_CONFIG_SOURCE_NETWORK,
+} DuidConfigSource;
+
+int manager_parse_config_file(Manager *m);
+
+const struct ConfigPerfItem* networkd_gperf_lookup(const char *key, unsigned length);
+
+int config_parse_duid_type(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_duid_rawdata(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);
diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c
index 68998eabf2..0589ebf227 100644
--- a/src/network/networkd-dhcp4.c
+++ b/src/network/networkd-dhcp4.c
@@ -625,7 +625,21 @@ int dhcp4_configure(Link *link) {
 
         switch (link->network->dhcp_client_identifier) {
         case DHCP_CLIENT_ID_DUID:
-                /* Library defaults to this. */
+                /* If configured, apply user specified DUID and/or IAID */
+                if (link->network->duid_type != _DUID_TYPE_INVALID)
+                        r = sd_dhcp_client_set_iaid_duid(link->dhcp_client,
+                                                         link->network->iaid,
+                                                         link->network->dhcp_duid_type,
+                                                         link->network->dhcp_duid,
+                                                         link->network->dhcp_duid_len);
+                else
+                        r = sd_dhcp_client_set_iaid_duid(link->dhcp_client,
+                                                         link->network->iaid,
+                                                         link->manager->dhcp_duid_type,
+                                                         link->manager->dhcp_duid,
+                                                         link->manager->dhcp_duid_len);
+                if (r < 0)
+                        return r;
                 break;
         case DHCP_CLIENT_ID_MAC:
                 r = sd_dhcp_client_set_client_id(link->dhcp_client,
diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c
index 5f7a005c36..d4b2fbfc57 100644
--- a/src/network/networkd-dhcp6.c
+++ b/src/network/networkd-dhcp6.c
@@ -230,6 +230,23 @@ int dhcp6_configure(Link *link) {
         if (r < 0)
                 goto error;
 
+        r = sd_dhcp6_client_set_iaid(client, link->network->iaid);
+        if (r < 0)
+                goto error;
+
+        if (link->network->duid_type != _DUID_TYPE_INVALID)
+                r = sd_dhcp6_client_set_duid(client,
+                                             link->network->dhcp_duid_type,
+                                             link->network->dhcp_duid,
+                                             link->network->dhcp_duid_len);
+        else
+                r = sd_dhcp6_client_set_duid(client,
+                                             link->manager->dhcp_duid_type,
+                                             link->manager->dhcp_duid,
+                                             link->manager->dhcp_duid_len);
+        if (r < 0)
+                goto error;
+
         r = sd_dhcp6_client_set_index(client, link->ifindex);
         if (r < 0)
                 goto error;
diff --git a/src/network/networkd-gperf.gperf b/src/network/networkd-gperf.gperf
new file mode 100644
index 0000000000..0625fb335b
--- /dev/null
+++ b/src/network/networkd-gperf.gperf
@@ -0,0 +1,18 @@
+%{
+#include <stddef.h>
+#include "conf-parser.h"
+#include "networkd-conf.h"
+%}
+struct ConfigPerfItem;
+%null_strings
+%language=ANSI-C
+%define slot-name section_and_lvalue
+%define hash-function-name networkd_gperf_hash
+%define lookup-function-name networkd_gperf_lookup
+%readonly-tables
+%omit-struct-type
+%struct-type
+%includes
+%%
+DUID.Type,              config_parse_duid_type,                 0,                                  offsetof(Manager, duid_type)
+DUID.RawData,           config_parse_duid_rawdata,              DUID_CONFIG_SOURCE_GLOBAL,          offsetof(Manager, dhcp_duid)
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index ff4bd76554..eac8123311 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -2781,6 +2781,21 @@ int link_update(Link *link, sd_netlink_message *m) {
                                                            ARPHRD_ETHER);
                                 if (r < 0)
                                         return log_link_warning_errno(link, r, "Could not update MAC address in DHCP client: %m");
+
+                                if (link->network->duid_type != _DUID_TYPE_INVALID)
+                                        r = sd_dhcp_client_set_iaid_duid(link->dhcp_client,
+                                                                         link->network->iaid,
+                                                                         link->network->dhcp_duid_type,
+                                                                         link->network->dhcp_duid,
+                                                                         link->network->dhcp_duid_len);
+                                else
+                                        r = sd_dhcp_client_set_iaid_duid(link->dhcp_client,
+                                                                         link->network->iaid,
+                                                                         link->manager->dhcp_duid_type,
+                                                                         link->manager->dhcp_duid,
+                                                                         link->manager->dhcp_duid_len);
+                                if (r < 0)
+                                        return log_link_warning_errno(link, r, "Could not update DUID/IAID in DHCP client: %m");
                         }
 
                         if (link->dhcp6_client) {
@@ -2790,6 +2805,24 @@ int link_update(Link *link, sd_netlink_message *m) {
                                                             ARPHRD_ETHER);
                                 if (r < 0)
                                         return log_link_warning_errno(link, r, "Could not update MAC address in DHCPv6 client: %m");
+
+                                r = sd_dhcp6_client_set_iaid(link->dhcp6_client,
+                                                             link->network->iaid);
+                                if (r < 0)
+                                        return log_link_warning_errno(link, r, "Could not update DHCPv6 IAID: %m");
+
+                                if (link->network->duid_type != _DUID_TYPE_INVALID)
+                                        r = sd_dhcp6_client_set_duid(link->dhcp6_client,
+                                                                     link->network->dhcp_duid_type,
+                                                                     link->network->dhcp_duid,
+                                                                     link->network->dhcp_duid_len);
+                                else
+                                        r = sd_dhcp6_client_set_duid(link->dhcp6_client,
+                                                                     link->manager->dhcp_duid_type,
+                                                                     link->manager->dhcp_duid,
+                                                                     link->manager->dhcp_duid_len);
+                                if (r < 0)
+                                        return log_link_warning_errno(link, r, "Could not update DHCPv6 DUID: %m");
                         }
                 }
         }
diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index b8cb7f875d..d355aaa19c 100644
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -1037,6 +1037,8 @@ int manager_new(Manager **ret) {
         if (r < 0)
                 return r;
 
+        m->duid_type = _DUID_TYPE_INVALID;
+
         *ret = m;
         m = NULL;
 
diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf
index a5d1714293..9793938080 100644
--- a/src/network/networkd-network-gperf.gperf
+++ b/src/network/networkd-network-gperf.gperf
@@ -2,6 +2,7 @@
 #include <stddef.h>
 #include "conf-parser.h"
 #include "networkd.h"
+#include "networkd-conf.h"
 #include "network-internal.h"
 %}
 struct ConfigPerfItem;
@@ -26,6 +27,9 @@ Match.KernelCommandLine,                config_parse_net_condition,
 Match.Architecture,                     config_parse_net_condition,                     CONDITION_ARCHITECTURE,        offsetof(Network, match_arch)
 Link.MACAddress,                        config_parse_hwaddr,                            0,                             offsetof(Network, mac)
 Link.MTUBytes,                          config_parse_iec_size,                          0,                             offsetof(Network, mtu)
+Link.IAID,                              config_parse_iaid,                              0,                             offsetof(Network, iaid)
+DUID.Type,                              config_parse_duid_type,                         0,                             offsetof(Network, duid_type)
+DUID.RawData,                           config_parse_duid_rawdata,                      DUID_CONFIG_SOURCE_NETWORK,    offsetof(Network, dhcp_duid)
 Network.Description,                    config_parse_string,                            0,                             offsetof(Network, description)
 Network.Bridge,                         config_parse_netdev,                            0,                             offsetof(Network, bridge)
 Network.Bond,                           config_parse_netdev,                            0,                             offsetof(Network, bond)
diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index 491b9a3efa..5946ba18dc 100644
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -131,10 +131,12 @@ static int network_load_one(Manager *manager, const char *filename) {
         network->ipv6_accept_ra = -1;
         network->ipv6_dad_transmits = -1;
         network->ipv6_hop_limit = -1;
+        network->duid_type = _DUID_TYPE_INVALID;
 
         r = config_parse(NULL, filename, file,
                          "Match\0"
                          "Link\0"
+                         "DUID\0"
                          "Network\0"
                          "Address\0"
                          "Route\0"
diff --git a/src/network/networkd-network.h b/src/network/networkd-network.h
index 4a13e2b574..5400a8bc9d 100644
--- a/src/network/networkd-network.h
+++ b/src/network/networkd-network.h
@@ -24,6 +24,7 @@
 
 typedef struct Network Network;
 
+#include "dhcp-identifier.h"
 #include "networkd-address.h"
 #include "networkd-fdb.h"
 #include "networkd-netdev.h"
@@ -144,6 +145,13 @@ struct Network {
 
         struct ether_addr *mac;
         unsigned mtu;
+        uint32_t iaid;
+        /* Value of Type in [DUID] section */
+        DUIDType duid_type;
+        /* DUID type code - RFC 3315 */
+        uint16_t dhcp_duid_type;
+        size_t dhcp_duid_len;
+        uint8_t dhcp_duid[MAX_DUID_LEN];
 
         LLDPMode lldp_mode; /* LLDP reception */
         bool lldp_emit;     /* LLDP transmission */
diff --git a/src/network/networkd.c b/src/network/networkd.c
index 3a2615e6fd..c8f81a2ca6 100644
--- a/src/network/networkd.c
+++ b/src/network/networkd.c
@@ -21,6 +21,7 @@
 
 #include "capability-util.h"
 #include "networkd.h"
+#include "networkd-conf.h"
 #include "signal-util.h"
 #include "user-util.h"
 
@@ -89,6 +90,10 @@ int main(int argc, char *argv[]) {
                 goto out;
         }
 
+        r = manager_parse_config_file(m);
+        if (r < 0)
+                log_warning_errno(r, "Failed to parse configuration file: %m");
+
         r = manager_load_config(m);
         if (r < 0) {
                 log_error_errno(r, "Could not load configuration files: %m");
diff --git a/src/network/networkd.h b/src/network/networkd.h
index 6bdd8302a0..72a2438ac8 100644
--- a/src/network/networkd.h
+++ b/src/network/networkd.h
@@ -31,6 +31,7 @@
 
 typedef struct Manager Manager;
 
+#include "dhcp-identifier.h"
 #include "networkd-address-pool.h"
 #include "networkd-link.h"
 #include "networkd-network.h"
@@ -61,6 +62,13 @@ struct Manager {
         LIST_HEAD(AddressPool, address_pools);
 
         usec_t network_dirs_ts_usec;
+
+        /* Value of Type in [DUID] section */
+        DUIDType duid_type;
+        /* DUID type code - RFC 3315 */
+        uint16_t dhcp_duid_type;
+        size_t dhcp_duid_len;
+        uint8_t dhcp_duid[MAX_DUID_LEN];
 };
 
 extern const char* const network_dirs[];