systemd: merge branch 'systemd-integration' into master
authorThomas Haller <thaller@redhat.com>
Wed, 16 Sep 2015 14:53:25 +0000 (16:53 +0200)
committerThomas Haller <thaller@redhat.com>
Wed, 16 Sep 2015 14:54:03 +0000 (16:54 +0200)
34 files changed:
1  2 
src/Makefile.am
src/dhcp-manager/nm-dhcp-systemd.c
src/systemd/src/basic/hostname-util.c
src/systemd/src/basic/hostname-util.h
src/systemd/src/basic/macro.h
src/systemd/src/basic/refcnt.h
src/systemd/src/basic/strv.c
src/systemd/src/basic/strv.h
src/systemd/src/basic/time-util.c
src/systemd/src/basic/time-util.h
src/systemd/src/basic/util.c
src/systemd/src/basic/util.h
src/systemd/src/libsystemd-network/dhcp-identifier.c
src/systemd/src/libsystemd-network/dhcp-internal.h
src/systemd/src/libsystemd-network/dhcp-lease-internal.h
src/systemd/src/libsystemd-network/dhcp-option.c
src/systemd/src/libsystemd-network/dhcp-protocol.h
src/systemd/src/libsystemd-network/dhcp6-internal.h
src/systemd/src/libsystemd-network/dhcp6-lease-internal.h
src/systemd/src/libsystemd-network/dhcp6-network.c
src/systemd/src/libsystemd-network/dhcp6-option.c
src/systemd/src/libsystemd-network/dhcp6-protocol.h
src/systemd/src/libsystemd-network/network-internal.c
src/systemd/src/libsystemd-network/network-internal.h
src/systemd/src/libsystemd-network/sd-dhcp-client.c
src/systemd/src/libsystemd-network/sd-dhcp-lease.c
src/systemd/src/libsystemd-network/sd-dhcp6-client.c
src/systemd/src/libsystemd-network/sd-dhcp6-lease.c
src/systemd/src/libsystemd-network/sd-ipv4ll.c
src/systemd/src/shared/dns-domain.c
src/systemd/src/shared/dns-domain.h
src/systemd/src/systemd/sd-dhcp-lease.h
src/systemd/src/systemd/sd-dhcp6-lease.h
src/systemd/src/systemd/sd-icmp6-nd.h

diff --cc src/Makefile.am
@@@ -46,99 -48,6 +46,100 @@@ AM_CPPFLAGS =                              
  # primarily for its side effect of removing duplicates.
  AM_CPPFLAGS += $(foreach d,$(sort $(dir $(libNetworkManager_la_SOURCES))),-I$(top_srcdir)/src/$d)
  
-       systemd/src/libsystemd/sd-id128/sd-id128.c \
-       systemd/src/libsystemd-network/dhcp-identifier.c \
-       systemd/src/libsystemd-network/dhcp-identifier.h \
-       systemd/src/libsystemd-network/dhcp-network.c \
-       systemd/src/libsystemd-network/dhcp-packet.c \
-       systemd/src/libsystemd-network/dhcp-internal.h \
-       systemd/src/libsystemd-network/dhcp6-network.c \
-       systemd/src/libsystemd-network/dhcp6-lease-internal.h \
-       systemd/src/libsystemd-network/dhcp6-option.c \
-       systemd/src/libsystemd-network/network-internal.c \
-       systemd/src/libsystemd-network/sd-dhcp-lease.c \
-       systemd/src/libsystemd-network/sd-dhcp-client.c \
-       systemd/src/libsystemd-network/dhcp-option.c \
-       systemd/src/libsystemd-network/network-internal.h \
-       systemd/src/libsystemd-network/sd-dhcp6-lease.c \
-       systemd/src/libsystemd-network/dhcp-protocol.h \
-       systemd/src/libsystemd-network/dhcp6-internal.h \
-       systemd/src/libsystemd-network/dhcp6-protocol.h \
-       systemd/src/libsystemd-network/dhcp-lease-internal.h \
-       systemd/src/libsystemd-network/sd-dhcp6-client.c \
-       systemd/src/libsystemd-network/ipv4ll-internal.h \
-       systemd/src/libsystemd-network/sd-ipv4ll.c \
-       systemd/src/libsystemd-network/ipv4ll-packet.c \
-       systemd/src/libsystemd-network/ipv4ll-network.c \
 +noinst_LTLIBRARIES = \
 +      libNetworkManager.la \
 +      libnm-iface-helper.la \
 +      libsystemd-nm.la
 +
 +######################
 +# libsystemd-nm
 +######################
 +
 +SYSTEMD_NM_CFLAGS = \
 +      -I$(top_srcdir)/src/systemd/src/systemd \
 +      -I$(top_srcdir)/src/systemd/src/libsystemd-network \
 +      -I$(top_srcdir)/src/systemd/src/basic \
 +      -I$(top_srcdir)/src/systemd/src/shared \
 +      -I$(top_srcdir)/src/systemd \
 +      -I$(top_srcdir)/libnm-core \
 +      -I$(top_builddir)/libnm-core \
 +      -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON
 +
 +libsystemd_nm_la_SOURCES = \
-       systemd/src/basic/time-util.h \
-       systemd/src/basic/siphash24.h \
-       systemd/src/basic/time-util.c \
-       systemd/src/basic/socket-util.h \
-       systemd/src/basic/sparse-endian.h \
-       systemd/src/basic/macro.h \
-       systemd/src/basic/refcnt.h \
-       systemd/src/basic/util.c \
++      systemd/nm-sd-adapt.c \
++      systemd/nm-sd-adapt.h \
 +      systemd/src/basic/async.h \
-       systemd/src/basic/siphash24.c \
-       systemd/src/basic/util.h \
++      systemd/src/basic/fileio.c \
++      systemd/src/basic/fileio.h \
++      systemd/src/basic/hostname-util.c \
++      systemd/src/basic/hostname-util.h \
 +      systemd/src/basic/in-addr-util.c \
-       systemd/src/basic/fileio.h \
-       systemd/src/basic/fileio.c \
 +      systemd/src/basic/in-addr-util.h \
 +      systemd/src/basic/list.h \
 +      systemd/src/basic/log.h \
-       systemd/src/basic/strv.h \
++      systemd/src/basic/macro.h \
 +      systemd/src/basic/path-util.c \
 +      systemd/src/basic/path-util.h \
-       systemd/src/basic/utf8.h \
++      systemd/src/basic/random-util.c \
++      systemd/src/basic/random-util.h \
++      systemd/src/basic/refcnt.h \
++      systemd/src/basic/siphash24.c \
++      systemd/src/basic/siphash24.h \
++      systemd/src/basic/socket-util.h \
++      systemd/src/basic/sparse-endian.h \
 +      systemd/src/basic/strv.c \
++      systemd/src/basic/strv.h \
++      systemd/src/basic/time-util.c \
++      systemd/src/basic/time-util.h \
 +      systemd/src/basic/unaligned.h \
-       systemd/src/basic/hostname-util.h \
-       systemd/src/basic/hostname-util.c \
-       systemd/src/basic/random-util.h \
-       systemd/src/basic/random-util.c \
 +      systemd/src/basic/utf8.c \
-       systemd/src/systemd/sd-dhcp-lease.h \
++      systemd/src/basic/utf8.h \
++      systemd/src/basic/util.c \
++      systemd/src/basic/util.h \
++      systemd/src/libsystemd-network/dhcp-identifier.c \
++      systemd/src/libsystemd-network/dhcp-identifier.h \
++      systemd/src/libsystemd-network/dhcp-internal.h \
++      systemd/src/libsystemd-network/dhcp-lease-internal.h \
++      systemd/src/libsystemd-network/dhcp-network.c \
++      systemd/src/libsystemd-network/dhcp-option.c \
++      systemd/src/libsystemd-network/dhcp-packet.c \
++      systemd/src/libsystemd-network/dhcp-protocol.h \
++      systemd/src/libsystemd-network/dhcp6-internal.h \
++      systemd/src/libsystemd-network/dhcp6-lease-internal.h \
++      systemd/src/libsystemd-network/dhcp6-network.c \
++      systemd/src/libsystemd-network/dhcp6-option.c \
++      systemd/src/libsystemd-network/dhcp6-protocol.h \
++      systemd/src/libsystemd-network/ipv4ll-internal.h \
++      systemd/src/libsystemd-network/ipv4ll-network.c \
++      systemd/src/libsystemd-network/ipv4ll-packet.c \
++      systemd/src/libsystemd-network/network-internal.c \
++      systemd/src/libsystemd-network/network-internal.h \
++      systemd/src/libsystemd-network/sd-dhcp-client.c \
++      systemd/src/libsystemd-network/sd-dhcp-lease.c \
++      systemd/src/libsystemd-network/sd-dhcp6-client.c \
++      systemd/src/libsystemd-network/sd-dhcp6-lease.c \
++      systemd/src/libsystemd-network/sd-ipv4ll.c \
++      systemd/src/libsystemd/sd-id128/sd-id128.c \
 +      systemd/src/shared/dns-domain.c \
 +      systemd/src/shared/dns-domain.h \
-       systemd/src/systemd/sd-id128.h \
-       systemd/src/systemd/sd-dhcp6-lease.h \
++      systemd/src/systemd/_sd-common.h \
 +      systemd/src/systemd/sd-dhcp-client.h \
-       systemd/src/systemd/_sd-common.h \
-       systemd/src/systemd/sd-ipv4ll.h \
-       systemd/nm-sd-adapt.h \
-       systemd/nm-sd-adapt.c
++      systemd/src/systemd/sd-dhcp-lease.h \
 +      systemd/src/systemd/sd-dhcp6-client.h \
++      systemd/src/systemd/sd-dhcp6-lease.h \
 +      systemd/src/systemd/sd-event.h \
++      systemd/src/systemd/sd-icmp6-nd.h \
++      systemd/src/systemd/sd-id128.h \
++      systemd/src/systemd/sd-ipv4ll.h
 +
 +libsystemd_nm_la_CPPFLAGS = \
 +      -I$(top_srcdir)/include \
 +      $(SYSTEMD_NM_CFLAGS) \
 +      $(GLIB_CFLAGS)
 +
 +libsystemd_nm_la_LIBADD = \
 +      $(GLIB_LIBS)
 +
  ###########################################
  # NetworkManager
  ###########################################
index 7f16946,0000000..3786f3b
mode 100644,000000..100644
--- /dev/null
@@@ -1,852 -1,0 +1,852 @@@
-       const uint8_t *data;
 +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 +/* This program is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
 + * the Free Software Foundation; either version 2, or (at your option)
 + * any later version.
 + *
 + * This program 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 General Public License for more details.
 + *
 + * You should have received a copy of the GNU General Public License along
 + * with this program; if not, write to the Free Software Foundation, Inc.,
 + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 + *
 + * Copyright (C) 2014 Red Hat, Inc.
 + */
 +
 +#include "config.h"
 +
 +#include <string.h>
 +#include <stdlib.h>
 +#include <errno.h>
 +#include <unistd.h>
 +#include <stdio.h>
 +#include <netinet/in.h>
 +#include <arpa/inet.h>
 +#include <ctype.h>
 +#include <net/if_arp.h>
 +
 +#include "nm-default.h"
 +#include "nm-dhcp-systemd.h"
 +#include "nm-utils.h"
 +#include "nm-dhcp-utils.h"
 +#include "NetworkManagerUtils.h"
 +#include "nm-platform.h"
 +
 +#include "nm-sd-adapt.h"
 +
 +#include "sd-dhcp-client.h"
 +#include "sd-dhcp6-client.h"
 +#include "dhcp-protocol.h"
 +#include "dhcp-lease-internal.h"
 +#include "dhcp6-protocol.h"
 +#include "dhcp6-lease-internal.h"
 +
 +G_DEFINE_TYPE (NMDhcpSystemd, nm_dhcp_systemd, NM_TYPE_DHCP_CLIENT)
 +
 +#define NM_DHCP_SYSTEMD_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DHCP_SYSTEMD, NMDhcpSystemdPrivate))
 +
 +typedef struct {
 +      struct sd_dhcp_client *client4;
 +      struct sd_dhcp6_client *client6;
 +      char *lease_file;
 +
 +      guint timeout_id;
 +      guint request_count;
 +
 +      gboolean privacy;
 +} NMDhcpSystemdPrivate;
 +
 +/************************************************************/
 +
 +#define DHCP_OPTION_NIS_DOMAIN         40
 +#define DHCP_OPTION_NIS_SERVERS        41
 +#define DHCP_OPTION_DOMAIN_SEARCH     119
 +#define DHCP_OPTION_RFC3442_ROUTES    121
 +#define DHCP_OPTION_MS_ROUTES         249
 +#define DHCP_OPTION_WPAD              252
 +
 +/* Internal values */
 +#define DHCP_OPTION_IP_ADDRESS       1024
 +#define DHCP_OPTION_EXPIRY           1025
 +#define DHCP6_OPTION_IP_ADDRESS      1026
 +#define DHCP6_OPTION_PREFIXLEN       1027
 +#define DHCP6_OPTION_PREFERRED_LIFE  1028
 +#define DHCP6_OPTION_MAX_LIFE        1029
 +#define DHCP6_OPTION_STARTS          1030
 +#define DHCP6_OPTION_LIFE_STARTS     1031
 +#define DHCP6_OPTION_RENEW           1032
 +#define DHCP6_OPTION_REBIND          1033
 +#define DHCP6_OPTION_IAID            1034
 +
 +typedef struct {
 +      guint num;
 +      const char *name;
 +      gboolean include;
 +} ReqOption;
 +
 +#define REQPREFIX "requested_"
 +
 +static const ReqOption dhcp4_requests[] = {
 +      { DHCP_OPTION_SUBNET_MASK,            REQPREFIX "subnet_mask",                     TRUE },
 +      { DHCP_OPTION_TIME_OFFSET,            REQPREFIX "time_offset",                     TRUE },
 +      { DHCP_OPTION_ROUTER,                 REQPREFIX "routers",                         TRUE },
 +      { DHCP_OPTION_DOMAIN_NAME_SERVER,     REQPREFIX "domain_name_servers",             TRUE },
 +      { DHCP_OPTION_HOST_NAME,              REQPREFIX "host_name",                       TRUE },
 +      { DHCP_OPTION_DOMAIN_NAME,            REQPREFIX "domain_name",                     TRUE },
 +      { DHCP_OPTION_INTERFACE_MTU,          REQPREFIX "interface_mtu",                   TRUE },
 +      { DHCP_OPTION_BROADCAST,              REQPREFIX "broadcast_address",               TRUE },
 +      { DHCP_OPTION_STATIC_ROUTE,           REQPREFIX "static_routes",                   TRUE },
 +      { DHCP_OPTION_NIS_DOMAIN,             REQPREFIX "nis_domain",                      TRUE },
 +      { DHCP_OPTION_NIS_SERVERS,            REQPREFIX "nis_servers",                     TRUE },
 +      { DHCP_OPTION_NTP_SERVER,             REQPREFIX "ntp_servers",                     TRUE },
 +      { DHCP_OPTION_SERVER_IDENTIFIER,      REQPREFIX "dhcp_server_identifier",          TRUE },
 +      { DHCP_OPTION_DOMAIN_SEARCH,          REQPREFIX "domain_search",                   TRUE },
 +      { DHCP_OPTION_CLASSLESS_STATIC_ROUTE, REQPREFIX "rfc3442_classless_static_routes", TRUE },
 +      { DHCP_OPTION_MS_ROUTES,              REQPREFIX "ms_classless_static_routes",      TRUE },
 +      { DHCP_OPTION_WPAD,                   REQPREFIX "wpad",                            TRUE },
 +
 +      /* Internal values */
 +      { DHCP_OPTION_IP_ADDRESS_LEASE_TIME, REQPREFIX "expiry",                          FALSE },
 +      { DHCP_OPTION_CLIENT_IDENTIFIER,     REQPREFIX "dhcp_client_identifier",          FALSE },
 +      { DHCP_OPTION_IP_ADDRESS,            REQPREFIX "ip_address",                      FALSE },
 +      { 0, NULL, FALSE }
 +};
 +
 +static const ReqOption dhcp6_requests[] = {
 +      { DHCP6_OPTION_CLIENTID,       REQPREFIX "dhcp6_client_id",     TRUE },
 +
 +      /* Don't request server ID by default; some servers don't reply to
 +       * Information Requests that request the Server ID.
 +       */
 +      { DHCP6_OPTION_SERVERID,       REQPREFIX "dhcp6_server_id",     FALSE },
 +
 +      { DHCP6_OPTION_DNS_SERVERS,    REQPREFIX "dhcp6_name_servers",  TRUE },
 +      { DHCP6_OPTION_DOMAIN_LIST,    REQPREFIX "dhcp6_domain_search", TRUE },
 +      { DHCP6_OPTION_SNTP_SERVERS,   REQPREFIX "dhcp6_sntp_servers",  TRUE },
 +
 +      /* Internal values */
 +      { DHCP6_OPTION_IP_ADDRESS,     REQPREFIX "ip6_address",         FALSE },
 +      { DHCP6_OPTION_PREFIXLEN,      REQPREFIX "ip6_prefixlen",       FALSE },
 +      { DHCP6_OPTION_PREFERRED_LIFE, REQPREFIX "preferred_life",      FALSE },
 +      { DHCP6_OPTION_MAX_LIFE,       REQPREFIX "max_life",            FALSE },
 +      { DHCP6_OPTION_STARTS,         REQPREFIX "starts",              FALSE },
 +      { DHCP6_OPTION_LIFE_STARTS,    REQPREFIX "life_starts",         FALSE },
 +      { DHCP6_OPTION_RENEW,          REQPREFIX "renew",               FALSE },
 +      { DHCP6_OPTION_REBIND,         REQPREFIX "rebind",              FALSE },
 +      { DHCP6_OPTION_IAID,           REQPREFIX "iaid",                FALSE },
 +      { 0, NULL, FALSE }
 +};
 +
 +static void
 +take_option (GHashTable *options,
 +             const ReqOption *requests,
 +             guint option,
 +             char *value)
 +{
 +      guint i;
 +
 +      g_return_if_fail (value != NULL);
 +
 +      for (i = 0; requests[i].name; i++) {
 +              if (requests[i].num == option) {
 +                      g_hash_table_insert (options,
 +                                           (gpointer) (requests[i].name + STRLEN (REQPREFIX)),
 +                                           value);
 +                      break;
 +              }
 +      }
 +      /* Option should always be found */
 +      g_assert (requests[i].name);
 +}
 +
 +static void
 +add_option (GHashTable *options, const ReqOption *requests, guint option, const char *value)
 +{
 +      if (options)
 +              take_option (options, requests, option, g_strdup (value));
 +}
 +
 +static void
 +add_option_u32 (GHashTable *options, const ReqOption *requests, guint option, guint32 value)
 +{
 +      if (options)
 +              take_option (options, requests, option, g_strdup_printf ("%u", value));
 +}
 +
 +static void
 +add_option_u64 (GHashTable *options, const ReqOption *requests, guint option, guint64 value)
 +{
 +      if (options)
 +              take_option (options, requests, option, g_strdup_printf ("%" G_GUINT64_FORMAT, value));
 +}
 +
 +static void
 +add_requests_to_options (GHashTable *options, const ReqOption *requests)
 +{
 +      guint i;
 +
 +      for (i = 0; options && requests[i].name; i++) {
 +              if (requests[i].include)
 +                      g_hash_table_insert (options, (gpointer) requests[i].name, g_strdup ("1"));
 +      }
 +}
 +
 +#define LOG_LEASE(domain, ...) \
 +G_STMT_START { \
 +      if (log_lease) { \
 +              nm_log (LOGL_INFO, (domain), __VA_ARGS__); \
 +      } \
 +} G_STMT_END
 +
 +static NMIP4Config *
 +lease_to_ip4_config (const char *iface,
 +                     int ifindex,
 +                     sd_dhcp_lease *lease,
 +                     GHashTable *options,
 +                     guint32 default_priority,
 +                     gboolean log_lease,
 +                     GError **error)
 +{
 +      NMIP4Config *ip4_config = NULL;
 +      struct in_addr tmp_addr;
 +      const struct in_addr *addr_list;
 +      char buf[INET_ADDRSTRLEN];
 +      const char *str;
 +      guint32 lifetime = 0, i;
 +      NMPlatformIP4Address address;
 +      GString *l;
 +      struct sd_dhcp_route *routes;
 +      guint16 mtu;
 +      int r, num;
 +      guint64 end_time;
-               r = sd_dhcp_lease_get_client_id (lease, &client_id, &client_id_len);
++      const void *data;
 +      gsize data_len;
 +      gboolean metered = FALSE;
 +
 +      g_return_val_if_fail (lease != NULL, NULL);
 +
 +      ip4_config = nm_ip4_config_new (ifindex);
 +
 +      /* Address */
 +      sd_dhcp_lease_get_address (lease, &tmp_addr);
 +      memset (&address, 0, sizeof (address));
 +      address.address = tmp_addr.s_addr;
 +      str = nm_utils_inet4_ntop (tmp_addr.s_addr, NULL);
 +      LOG_LEASE (LOGD_DHCP4, "  address %s", str);
 +      add_option (options, dhcp4_requests, DHCP_OPTION_IP_ADDRESS, str);
 +
 +      /* Prefix/netmask */
 +      sd_dhcp_lease_get_netmask (lease, &tmp_addr);
 +      address.plen = nm_utils_ip4_netmask_to_prefix (tmp_addr.s_addr);
 +      LOG_LEASE (LOGD_DHCP4, "  plen %d", address.plen);
 +      add_option (options,
 +                  dhcp4_requests,
 +                  DHCP_OPTION_SUBNET_MASK,
 +                  nm_utils_inet4_ntop (tmp_addr.s_addr, NULL));
 +
 +      /* Lease time */
 +      sd_dhcp_lease_get_lifetime (lease, &lifetime);
 +      address.timestamp = nm_utils_get_monotonic_timestamp_s ();
 +      address.lifetime = address.preferred = lifetime;
 +      end_time = (guint64) time (NULL) + lifetime;
 +      LOG_LEASE (LOGD_DHCP4, "  expires in %" G_GUINT32_FORMAT " seconds", lifetime);
 +      add_option_u64 (options,
 +                      dhcp4_requests,
 +                      DHCP_OPTION_IP_ADDRESS_LEASE_TIME,
 +                      end_time);
 +
 +      address.source = NM_IP_CONFIG_SOURCE_DHCP;
 +      nm_ip4_config_add_address (ip4_config, &address);
 +
 +      /* Gateway */
 +      r = sd_dhcp_lease_get_router (lease, &tmp_addr);
 +      if (r == 0) {
 +              nm_ip4_config_set_gateway (ip4_config, tmp_addr.s_addr);
 +              str = nm_utils_inet4_ntop (tmp_addr.s_addr, NULL);
 +              LOG_LEASE (LOGD_DHCP4, "  gateway %s", str);
 +              add_option (options, dhcp4_requests, DHCP_OPTION_ROUTER, str);
 +      }
 +
 +      /* DNS Servers */
 +      num = sd_dhcp_lease_get_dns (lease, &addr_list);
 +      if (num > 0) {
 +              l = g_string_sized_new (30);
 +              for (i = 0; i < num; i++) {
 +                      if (addr_list[i].s_addr) {
 +                              nm_ip4_config_add_nameserver (ip4_config, addr_list[i].s_addr);
 +                              str = nm_utils_inet4_ntop (addr_list[i].s_addr, NULL);
 +                              LOG_LEASE (LOGD_DHCP4, "  nameserver '%s'", str);
 +                              g_string_append_printf (l, "%s%s", l->len ? " " : "", str);
 +                      }
 +              }
 +              if (l->len)
 +                      add_option (options, dhcp4_requests, DHCP_OPTION_DOMAIN_NAME_SERVER, l->str);
 +              g_string_free (l, TRUE);
 +      }
 +
 +      /* Domain Name */
 +      r = sd_dhcp_lease_get_domainname (lease, &str);
 +      if (r == 0) {
 +              /* Multiple domains sometimes stuffed into the option */
 +              char **domains = g_strsplit (str, " ", 0);
 +              char **s;
 +
 +              for (s = domains; *s; s++) {
 +                      LOG_LEASE (LOGD_DHCP4, "  domain name '%s'", *s);
 +                      nm_ip4_config_add_domain (ip4_config, *s);
 +              }
 +              g_strfreev (domains);
 +              add_option (options, dhcp4_requests, DHCP_OPTION_DOMAIN_NAME, str);
 +      }
 +
 +      /* Hostname */
 +      r = sd_dhcp_lease_get_hostname (lease, &str);
 +      if (r == 0) {
 +              LOG_LEASE (LOGD_DHCP4, "  hostname '%s'", str);
 +              add_option (options, dhcp4_requests, DHCP_OPTION_HOST_NAME, str);
 +      }
 +
 +      /* Routes */
 +      num = sd_dhcp_lease_get_routes (lease, &routes);
 +      if (num > 0) {
 +              l = g_string_sized_new (30);
 +              for (i = 0; i < num; i++) {
 +                      NMPlatformIP4Route route;
 +                      const char *gw_str;
 +
 +                      memset (&route, 0, sizeof (route));
 +                      route.network = routes[i].dst_addr.s_addr;
 +                      route.plen = routes[i].dst_prefixlen;
 +                      route.gateway = routes[i].gw_addr.s_addr;
 +                      route.source = NM_IP_CONFIG_SOURCE_DHCP;
 +                      route.metric = default_priority;
 +                      nm_ip4_config_add_route (ip4_config, &route);
 +
 +                      str = nm_utils_inet4_ntop (route.network, buf);
 +                      gw_str = nm_utils_inet4_ntop (route.gateway, NULL);
 +                      LOG_LEASE (LOGD_DHCP4, "  static route %s/%d gw %s", str, route.plen, gw_str);
 +
 +                      g_string_append_printf (l, "%s%s/%d %s", l->len ? " " : "", str, route.plen, gw_str);
 +              }
 +              add_option (options, dhcp4_requests, DHCP_OPTION_RFC3442_ROUTES, l->str);
 +              g_string_free (l, TRUE);
 +      }
 +
 +      /* MTU */
 +      r = sd_dhcp_lease_get_mtu (lease, &mtu);
 +      if (r == 0 && mtu) {
 +              nm_ip4_config_set_mtu (ip4_config, mtu, NM_IP_CONFIG_SOURCE_DHCP);
 +              add_option_u32 (options, dhcp4_requests, DHCP_OPTION_INTERFACE_MTU, mtu);
 +              LOG_LEASE (LOGD_DHCP4, "  mtu %u", mtu);
 +      }
 +
 +      /* NTP servers */
 +      num = sd_dhcp_lease_get_ntp (lease, &addr_list);
 +      if (num > 0) {
 +              l = g_string_sized_new (30);
 +              for (i = 0; i < num; i++) {
 +                      str = nm_utils_inet4_ntop (addr_list[i].s_addr, buf);
 +                      LOG_LEASE (LOGD_DHCP4, "  ntp server '%s'", str);
 +                      g_string_append_printf (l, "%s%s", l->len ? " " : "", str);
 +              }
 +              add_option (options, dhcp4_requests, DHCP_OPTION_NTP_SERVER, l->str);
 +              g_string_free (l, TRUE);
 +      }
 +
 +      r = sd_dhcp_lease_get_vendor_specific (lease, &data, &data_len);
 +      if (r >= 0)
 +              metered = !!memmem (data, data_len, "ANDROID_METERED", STRLEN ("ANDROID_METERED"));
 +      nm_ip4_config_set_metered (ip4_config, metered);
 +
 +      return ip4_config;
 +}
 +
 +/************************************************************/
 +
 +static char *
 +get_leasefile_path (const char *iface, const char *uuid, gboolean ipv6)
 +{
 +      return g_strdup_printf (NMSTATEDIR "/internal%s-%s-%s.lease",
 +                              ipv6 ? "6" : "",
 +                              uuid,
 +                              iface);
 +}
 +
 +static GSList *
 +nm_dhcp_systemd_get_lease_ip_configs (const char *iface,
 +                                      int ifindex,
 +                                      const char *uuid,
 +                                      gboolean ipv6,
 +                                      guint32 default_route_metric)
 +{
 +      GSList *leases = NULL;
 +      gs_free char *path = NULL;
 +      sd_dhcp_lease *lease = NULL;
 +      NMIP4Config *ip4_config;
 +      int r;
 +
 +      if (ipv6)
 +              return NULL;
 +
 +      path = get_leasefile_path (iface, uuid, FALSE);
 +      r = sd_dhcp_lease_load (&lease, path);
 +      if (r == 0 && lease) {
 +              ip4_config = lease_to_ip4_config (iface, ifindex, lease, NULL, default_route_metric, FALSE, NULL);
 +              if (ip4_config)
 +                      leases = g_slist_append (leases, ip4_config);
 +      }
 +
 +      return leases;
 +}
 +
 +/************************************************************/
 +
 +static void
 +_save_client_id (NMDhcpSystemd *self,
 +                 uint8_t type,
 +                 const uint8_t *client_id,
 +                 size_t len)
 +{
 +      gs_unref_bytes GBytes *b = NULL;
 +      gs_free char *buf = NULL;
 +
 +      g_return_if_fail (self != NULL);
 +      g_return_if_fail (client_id != NULL);
 +      g_return_if_fail (len > 0);
 +
 +      if (!nm_dhcp_client_get_client_id (NM_DHCP_CLIENT (self))) {
 +              buf = g_malloc (len + 1);
 +              buf[0] = type;
 +              memcpy (buf + 1, client_id, len);
 +              b = g_bytes_new (buf, len + 1);
 +              nm_dhcp_client_set_client_id (NM_DHCP_CLIENT (self), b);
 +      }
 +}
 +
 +static void
 +bound4_handle (NMDhcpSystemd *self)
 +{
 +      NMDhcpSystemdPrivate *priv = NM_DHCP_SYSTEMD_GET_PRIVATE (self);
 +      const char *iface = nm_dhcp_client_get_iface (NM_DHCP_CLIENT (self));
 +      sd_dhcp_lease *lease;
 +      NMIP4Config *ip4_config;
 +      GHashTable *options;
 +      GError *error = NULL;
 +      int r;
 +
 +      nm_log_dbg (LOGD_DHCP4, "(%s): lease available", iface);
 +
 +      r = sd_dhcp_client_get_lease (priv->client4, &lease);
 +      if (r < 0 || !lease) {
 +              nm_log_warn (LOGD_DHCP4, "(%s): no lease!", iface);
 +              nm_dhcp_client_set_state (NM_DHCP_CLIENT (self), NM_DHCP_STATE_FAIL, NULL, NULL);
 +              return;
 +      }
 +
 +      options = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, g_free);
 +      ip4_config = lease_to_ip4_config (iface,
 +                                        nm_dhcp_client_get_ifindex (NM_DHCP_CLIENT (self)),
 +                                        lease,
 +                                        options,
 +                                        nm_dhcp_client_get_priority (NM_DHCP_CLIENT (self)),
 +                                        TRUE,
 +                                        &error);
 +      if (ip4_config) {
 +              const uint8_t *client_id = NULL;
 +              size_t client_id_len = 0;
 +              uint8_t type = 0;
 +
 +              add_requests_to_options (options, dhcp4_requests);
 +              sd_dhcp_lease_save (lease, priv->lease_file);
 +
 +              sd_dhcp_client_get_client_id(priv->client4, &type, &client_id, &client_id_len);
 +              if (client_id)
 +                      _save_client_id (self, type, client_id, client_id_len);
 +
 +              nm_dhcp_client_set_state (NM_DHCP_CLIENT (self),
 +                                        NM_DHCP_STATE_BOUND,
 +                                        G_OBJECT (ip4_config),
 +                                        options);
 +      } else {
 +              nm_log_warn (LOGD_DHCP4, "(%s): %s", iface, error->message);
 +              nm_dhcp_client_set_state (NM_DHCP_CLIENT (self), NM_DHCP_STATE_FAIL, NULL, NULL);
 +              g_clear_error (&error);
 +      }
 +
 +      sd_dhcp_lease_unref (lease);
 +      g_hash_table_destroy (options);
 +      g_clear_object (&ip4_config);
 +}
 +
 +static void
 +dhcp_event_cb (sd_dhcp_client *client, int event, gpointer user_data)
 +{
 +      NMDhcpSystemd *self = NM_DHCP_SYSTEMD (user_data);
 +      NMDhcpSystemdPrivate *priv = NM_DHCP_SYSTEMD_GET_PRIVATE (self);
 +      const char *iface = nm_dhcp_client_get_iface (NM_DHCP_CLIENT (self));
 +
 +      g_assert (priv->client4 == client);
 +
 +      nm_log_dbg (LOGD_DHCP4, "(%s): DHCPv4 client event %d", iface, event);
 +
 +      switch (event) {
 +      case DHCP_EVENT_EXPIRED:
 +              nm_dhcp_client_set_state (NM_DHCP_CLIENT (user_data), NM_DHCP_STATE_EXPIRE, NULL, NULL);
 +              break;
 +      case DHCP_EVENT_STOP:
 +              nm_dhcp_client_set_state (NM_DHCP_CLIENT (user_data), NM_DHCP_STATE_FAIL, NULL, NULL);
 +              break;
 +      case DHCP_EVENT_RENEW:
 +      case DHCP_EVENT_IP_CHANGE:
 +      case DHCP_EVENT_IP_ACQUIRE:
 +              bound4_handle (self);
 +              break;
 +      default:
 +              nm_log_warn (LOGD_DHCP4, "(%s): unhandled DHCP event %d", iface, event);
 +              break;
 +      }
 +}
 +
 +static guint16
 +get_arp_type (const GByteArray *hwaddr)
 +{
 +      if (hwaddr->len == ETH_ALEN)
 +              return ARPHRD_ETHER;
 +      else if (hwaddr->len == INFINIBAND_ALEN)
 +              return ARPHRD_INFINIBAND;
 +      else
 +              g_assert_not_reached ();
 +}
 +
 +static gboolean
 +ip4_start (NMDhcpClient *client, const char *dhcp_anycast_addr, const char *last_ip4_address)
 +{
 +      NMDhcpSystemdPrivate *priv = NM_DHCP_SYSTEMD_GET_PRIVATE (client);
 +      const char *iface = nm_dhcp_client_get_iface (client);
 +      const GByteArray *hwaddr;
 +      sd_dhcp_lease *lease = NULL;
 +      GBytes *override_client_id;
 +      const uint8_t *client_id = NULL;
 +      size_t client_id_len = 0;
 +      struct in_addr last_addr = { 0 };
 +      const char *hostname;
 +      int r, i;
 +
 +      g_assert (priv->client4 == NULL);
 +      g_assert (priv->client6 == NULL);
 +
 +      g_free (priv->lease_file);
 +      priv->lease_file = get_leasefile_path (iface, nm_dhcp_client_get_uuid (client), FALSE);
 +
 +      r = sd_dhcp_client_new (&priv->client4);
 +      if (r < 0) {
 +              nm_log_warn (LOGD_DHCP4, "(%s): failed to create DHCPv4 client (%d)", iface, r);
 +              return FALSE;
 +      }
 +
 +      r = sd_dhcp_client_attach_event (priv->client4, NULL, 0);
 +      if (r < 0) {
 +              nm_log_warn (LOGD_DHCP4, "(%s): failed to attach DHCP event (%d)", iface, r);
 +              goto error;
 +      }
 +
 +      hwaddr = nm_dhcp_client_get_hw_addr (client);
 +      if (hwaddr) {
 +              r = sd_dhcp_client_set_mac (priv->client4,
 +                                          hwaddr->data,
 +                                          hwaddr->len,
 +                                          get_arp_type (hwaddr));
 +              if (r < 0) {
 +                      nm_log_warn (LOGD_DHCP4, "(%s): failed to set DHCP MAC address (%d)", iface, r);
 +                      goto error;
 +              }
 +      }
 +
 +      r = sd_dhcp_client_set_index (priv->client4, nm_dhcp_client_get_ifindex (client));
 +      if (r < 0) {
 +              nm_log_warn (LOGD_DHCP4, "(%s): failed to set DHCP ifindex (%d)", iface, r);
 +              goto error;
 +      }
 +
 +      r = sd_dhcp_client_set_callback (priv->client4, dhcp_event_cb, client);
 +      if (r < 0) {
 +              nm_log_warn (LOGD_DHCP4, "(%s): failed to set DHCP callback (%d)", iface, r);
 +              goto error;
 +      }
 +
 +      r = sd_dhcp_client_set_request_broadcast (priv->client4, true);
 +      if (r < 0) {
 +              nm_log_warn (LOGD_DHCP4, "(%s): failed to set DHCP broadcast (%d)", iface, r);
 +              goto error;
 +      }
 +
 +      sd_dhcp_lease_load (&lease, priv->lease_file);
 +
 +      if (last_ip4_address)
 +              inet_pton (AF_INET, last_ip4_address, &last_addr);
 +      else if (lease)
 +              sd_dhcp_lease_get_address (lease, &last_addr);
 +
 +      if (last_addr.s_addr) {
 +              r = sd_dhcp_client_set_request_address (priv->client4, &last_addr);
 +              if (r < 0) {
 +                      nm_log_warn (LOGD_DHCP4, "(%s): failed to set last IPv4 address (%d)", iface, r);
 +                      goto error;
 +              }
 +      }
 +
 +      override_client_id = nm_dhcp_client_get_client_id (client);
 +      if (override_client_id) {
 +              client_id = g_bytes_get_data (override_client_id, &client_id_len);
 +              g_assert (client_id && client_id_len);
 +              sd_dhcp_client_set_client_id (priv->client4,
 +                                            client_id[0],
 +                                            client_id + 1,
 +                                            client_id_len - 1);
 +      } else if (lease) {
++              r = sd_dhcp_lease_get_client_id (lease, (const void **) &client_id, &client_id_len);
 +              if (r == 0 && client_id_len) {
 +                      sd_dhcp_client_set_client_id (priv->client4,
 +                                                    client_id[0],
 +                                                    client_id + 1,
 +                                                    client_id_len - 1);
 +                      _save_client_id (NM_DHCP_SYSTEMD (client),
 +                                       client_id[0],
 +                                       client_id + 1,
 +                                       client_id_len - 1);
 +              }
 +      }
 +
 +      if (lease)
 +              sd_dhcp_lease_unref (lease);
 +
 +      /* Add requested options */
 +      for (i = 0; dhcp4_requests[i].name; i++) {
 +              if (dhcp4_requests[i].include)
 +                      sd_dhcp_client_set_request_option (priv->client4, dhcp4_requests[i].num);
 +      }
 +
 +      hostname = nm_dhcp_client_get_hostname (client);
 +      if (hostname) {
 +              r = sd_dhcp_client_set_hostname (priv->client4, hostname);
 +              if (r < 0) {
 +                      nm_log_warn (LOGD_DHCP4, "(%s): failed to set DHCP hostname (%d)", iface, r);
 +                      goto error;
 +              }
 +      }
 +
 +      r = sd_dhcp_client_start (priv->client4);
 +      if (r < 0) {
 +              nm_log_warn (LOGD_DHCP4, "(%s): failed to start DHCP (%d)", iface, r);
 +              goto error;
 +      }
 +
 +      return TRUE;
 +
 +error:
 +      sd_dhcp_client_unref (priv->client4);
 +      priv->client4 = NULL;
 +      return FALSE;
 +}
 +
 +static void
 +bound6_handle (NMDhcpSystemd *self)
 +{
 +      /* not yet supported... */
 +      nm_log_warn (LOGD_DHCP6, "(%s): internal DHCP does not yet support DHCPv6",
 +                   nm_dhcp_client_get_iface (NM_DHCP_CLIENT (self)));
 +      nm_dhcp_client_set_state (NM_DHCP_CLIENT (self), NM_DHCP_STATE_FAIL, NULL, NULL);
 +}
 +
 +static void
 +dhcp6_event_cb (sd_dhcp6_client *client, int event, gpointer user_data)
 +{
 +      NMDhcpSystemd *self = NM_DHCP_SYSTEMD (user_data);
 +      NMDhcpSystemdPrivate *priv = NM_DHCP_SYSTEMD_GET_PRIVATE (self);
 +      const char *iface = nm_dhcp_client_get_iface (NM_DHCP_CLIENT (self));
 +
 +      g_assert (priv->client6 == client);
 +
 +      nm_log_dbg (LOGD_DHCP6, "(%s): DHCPv6 client event %d", iface, event);
 +
 +      switch (event) {
 +      case DHCP6_EVENT_RETRANS_MAX:
 +              nm_dhcp_client_set_state (NM_DHCP_CLIENT (user_data), NM_DHCP_STATE_TIMEOUT, NULL, NULL);
 +              break;
 +      case DHCP6_EVENT_RESEND_EXPIRE:
 +      case DHCP6_EVENT_STOP:
 +              nm_dhcp_client_set_state (NM_DHCP_CLIENT (user_data), NM_DHCP_STATE_FAIL, NULL, NULL);
 +              break;
 +      case DHCP6_EVENT_IP_ACQUIRE:
 +              bound6_handle (self);
 +              break;
 +      default:
 +              nm_log_warn (LOGD_DHCP6, "(%s): unhandled DHCPv6 event %d", iface, event);
 +              break;
 +      }
 +}
 +
 +static gboolean
 +ip6_start (NMDhcpClient *client,
 +           const char *dhcp_anycast_addr,
 +           gboolean info_only,
 +           NMSettingIP6ConfigPrivacy privacy,
 +           const GByteArray *duid)
 +{
 +      NMDhcpSystemdPrivate *priv = NM_DHCP_SYSTEMD_GET_PRIVATE (client);
 +      const char *iface = nm_dhcp_client_get_iface (client);
 +      const GByteArray *hwaddr;
 +      int r, i;
 +
 +      g_assert (priv->client4 == NULL);
 +      g_assert (priv->client6 == NULL);
 +      g_return_val_if_fail (duid != NULL, FALSE);
 +
 +      g_free (priv->lease_file);
 +      priv->lease_file = get_leasefile_path (iface, nm_dhcp_client_get_uuid (client), TRUE);
 +
 +      r = sd_dhcp6_client_new (&priv->client6);
 +      if (r < 0) {
 +              nm_log_warn (LOGD_DHCP6, "(%s): failed to create DHCPv6 client (%d)", iface, r);
 +              return FALSE;
 +      }
 +
 +      /* NM stores the entire DUID which includes the uint16 "type", while systemd
 +       * wants the type passed separately from the following data.
 +       */
 +      r = sd_dhcp6_client_set_duid (priv->client6,
 +                                    ntohs (((const guint16 *) duid->data)[0]),
 +                                    duid->data + 2,
 +                                    duid->len - 2);
 +      if (r < 0) {
 +              nm_log_warn (LOGD_DHCP6, "(%s): failed to create DHCPv6 client (%d)", iface, r);
 +              return FALSE;
 +      }
 +
 +      r = sd_dhcp6_client_attach_event (priv->client6, NULL, 0);
 +      if (r < 0) {
 +              nm_log_warn (LOGD_DHCP6, "(%s): failed to attach DHCP event (%d)", iface, r);
 +              goto error;
 +      }
 +
 +      hwaddr = nm_dhcp_client_get_hw_addr (client);
 +      if (hwaddr) {
 +              r = sd_dhcp6_client_set_mac (priv->client6,
 +                                           hwaddr->data,
 +                                           hwaddr->len,
 +                                           get_arp_type (hwaddr));
 +              if (r < 0) {
 +                      nm_log_warn (LOGD_DHCP6, "(%s): failed to set DHCP MAC address (%d)", iface, r);
 +                      goto error;
 +              }
 +      }
 +
 +      r = sd_dhcp6_client_set_index (priv->client6, nm_dhcp_client_get_ifindex (client));
 +      if (r < 0) {
 +              nm_log_warn (LOGD_DHCP6, "(%s): failed to set DHCP ifindex (%d)", iface, r);
 +              goto error;
 +      }
 +
 +      r = sd_dhcp6_client_set_callback (priv->client6, dhcp6_event_cb, client);
 +      if (r < 0) {
 +              nm_log_warn (LOGD_DHCP6, "(%s): failed to set DHCP callback (%d)", iface, r);
 +              goto error;
 +      }
 +
 +      /* Add requested options */
 +      for (i = 0; dhcp6_requests[i].name; i++) {
 +              if (dhcp6_requests[i].include)
 +                      sd_dhcp6_client_set_request_option (priv->client6, dhcp6_requests[i].num);
 +      }
 +
 +      r = sd_dhcp6_client_start (priv->client6);
 +      if (r < 0) {
 +              nm_log_warn (LOGD_DHCP6, "(%s): failed to start DHCP (%d)", iface, r);
 +              goto error;
 +      }
 +
 +      return TRUE;
 +
 +error:
 +      sd_dhcp6_client_unref (priv->client6);
 +      priv->client6 = NULL;
 +      return FALSE;
 +}
 +
 +static void
 +stop (NMDhcpClient *client, gboolean release, const GByteArray *duid)
 +{
 +      NMDhcpSystemdPrivate *priv = NM_DHCP_SYSTEMD_GET_PRIVATE (client);
 +      int r = 0;
 +
 +      if (priv->client4)
 +              r = sd_dhcp_client_stop (priv->client4);
 +      else if (priv->client6)
 +              r = sd_dhcp6_client_stop (priv->client6);
 +
 +      if (r) {
 +              nm_log_warn (priv->client6 ? LOGD_DHCP6 : LOGD_DHCP4,
 +                               "(%s): failed to stop DHCP client (%d)",
 +                               nm_dhcp_client_get_iface (client),
 +                               r);
 +      }
 +}
 +
 +/***************************************************/
 +
 +static void
 +nm_dhcp_systemd_init (NMDhcpSystemd *self)
 +{
 +}
 +
 +static void
 +dispose (GObject *object)
 +{
 +      NMDhcpSystemdPrivate *priv = NM_DHCP_SYSTEMD_GET_PRIVATE (object);
 +
 +      g_clear_pointer (&priv->lease_file, g_free);
 +
 +      if (priv->client4) {
 +              sd_dhcp_client_stop (priv->client4);
 +              sd_dhcp_client_unref (priv->client4);
 +              priv->client4 = NULL;
 +      }
 +
 +      if (priv->client6) {
 +              sd_dhcp6_client_stop (priv->client6);
 +              sd_dhcp6_client_unref (priv->client6);
 +              priv->client6 = NULL;
 +      }
 +
 +      G_OBJECT_CLASS (nm_dhcp_systemd_parent_class)->dispose (object);
 +}
 +
 +static void
 +nm_dhcp_systemd_class_init (NMDhcpSystemdClass *sdhcp_class)
 +{
 +      NMDhcpClientClass *client_class = NM_DHCP_CLIENT_CLASS (sdhcp_class);
 +      GObjectClass *object_class = G_OBJECT_CLASS (sdhcp_class);
 +
 +      g_type_class_add_private (sdhcp_class, sizeof (NMDhcpSystemdPrivate));
 +
 +      /* virtual methods */
 +      object_class->dispose = dispose;
 +
 +      client_class->ip4_start = ip4_start;
 +      client_class->ip6_start = ip6_start;
 +      client_class->stop = stop;
 +}
 +
 +static void __attribute__((constructor))
 +register_dhcp_dhclient (void)
 +{
 +      nm_g_type_init ();
 +      _nm_dhcp_client_register (NM_TYPE_DHCP_SYSTEMD,
 +                                "internal",
 +                                NULL,
 +                                nm_dhcp_systemd_get_lease_ip_configs);
 +}
 +
@@@ -153,7 -156,17 +158,18 @@@ bool is_localhost(const char *hostname
                 endswith_no_case(hostname, ".localdomain.");
  }
  
 +#if 0 /* NM_IGNORED */
+ bool is_gateway_hostname(const char *hostname) {
+         assert(hostname);
+         /* This tries to identify the valid syntaxes for the our
+          * synthetic "gateway" host. */
+         return
+                 strcaseeq(hostname, "gateway") ||
+                 strcaseeq(hostname, "gateway.");
+ }
  int sethostname_idempotent(const char *s) {
          char buf[HOST_NAME_MAX + 1] = {};
  
Simple merge
Simple merge
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
- /* A type-safe atomic refcounter */
 +#include "nm-sd-adapt.h"
 +
+ /* A type-safe atomic refcounter.
+  *
+  * DO NOT USE THIS UNLESS YOU ACTUALLY CARE ABOUT THREAD SAFETY! */
  
  typedef struct {
          volatile unsigned _value;
@@@ -280,8 -276,7 +278,8 @@@ char **strv_split_newlines(const char *
          return l;
  }
  
- int strv_split_quoted(char ***t, const char *s, UnquoteFlags flags) {
 +#if 0 /* NM_IGNORED */
+ int strv_split_extract(char ***t, const char *s, const char *separators, ExtractFlags flags) {
          size_t n = 0, allocated = 0;
          _cleanup_strv_free_ char **l = NULL;
          int r;
Simple merge
@@@ -946,6 -986,6 +991,7 @@@ int get_timezones(char ***ret) 
  
          return 0;
  }
++#endif /* NM_IGNORED */
  
  bool timezone_is_valid(const char *name) {
          bool slash = false;
@@@ -1003,3 -1045,30 +1051,32 @@@ clockid_t clock_boottime_or_monotonic(v
  
          return clock;
  }
++#if 0 /* NM_IGNORED */
+ int get_timezone(char **tz) {
+         _cleanup_free_ char *t = NULL;
+         const char *e;
+         char *z;
+         int r;
+         r = readlink_malloc("/etc/localtime", &t);
+         if (r < 0)
+                 return r; /* returns EINVAL if not a symlink */
+         e = path_startswith(t, "/usr/share/zoneinfo/");
+         if (!e)
+                 e = path_startswith(t, "../usr/share/zoneinfo/");
+         if (!e)
+                 return -EINVAL;
+         if (!timezone_is_valid(e))
+                 return -EINVAL;
+         z = strdup(e);
+         if (!z)
+                 return -ENOMEM;
+         *tz = z;
+         return 0;
+ }
++#endif /* NM_IGNORED */
Simple merge
@@@ -337,8 -326,34 +337,35 @@@ void close_many(const int fds[], unsign
          for (i = 0; i < n_fd; i++)
                  safe_close(fds[i]);
  }
 +#endif /* NM_IGNORED */
  
+ int fclose_nointr(FILE *f) {
+         assert(f);
+         /* Same as close_nointr(), but for fclose() */
+         if (fclose(f) == 0)
+                 return 0;
+         if (errno == EINTR)
+                 return 0;
+         return -errno;
+ }
+ FILE* safe_fclose(FILE *f) {
+         /* Same as safe_close(), but for fclose() */
+         if (f) {
+                 PROTECT_ERRNO;
+                 assert_se(fclose_nointr(f) != EBADF);
+         }
+         return NULL;
+ }
  int unlink_noerrno(const char *path) {
          PROTECT_ERRNO;
          int r;
@@@ -477,6 -500,6 +515,7 @@@ int safe_atou8(const char *s, uint8_t *
          *ret = (uint8_t) l;
          return 0;
  }
++#endif /* NM_IGNORED */
  
  int safe_atou16(const char *s, uint16_t *ret) {
          char *x = NULL;
          return 0;
  }
  
++#if 0 /* NM_IGNORED */
  int safe_atoi16(const char *s, int16_t *ret) {
          char *x = NULL;
          long l;
@@@ -3032,22 -3043,6 +3071,7 @@@ char* strshorten(char *s, size_t l) 
          return s;
  }
  
- bool machine_name_is_valid(const char *s) {
-         if (!hostname_is_valid(s, false))
-                 return false;
-         /* Machine names should be useful hostnames, but also be
-          * useful in unit names, hence we enforce a stricter length
-          * limitation. */
-         if (strlen(s) > 64)
-                 return false;
-         return true;
- }
 +#if 0 /* NM_IGNORED */
  int pipe_eof(int fd) {
          struct pollfd pollfd = {
                  .fd = fd,
@@@ -4772,6 -4755,6 +4795,7 @@@ void* greedy_realloc0(void **p, size_t 
          return q;
  }
  
++#if 0 /* NM_IGNORED */
  bool id128_is_valid(const char *s) {
          size_t i, l;
  
@@@ -6555,7 -6592,33 +6639,35 @@@ int rename_noreplace(int olddirfd, cons
  
          return 0;
  }
++#endif /* NM_IGNORED */
  
+ static char *strcpy_backslash_escaped(char *t, const char *s, const char *bad) {
+         assert(bad);
+         for (; *s; s++) {
+                 if (*s == '\\' || strchr(bad, *s))
+                         *(t++) = '\\';
+                 *(t++) = *s;
+         }
+         return t;
+ }
+ char *shell_escape(const char *s, const char *bad) {
+         char *r, *t;
+         r = new(char, strlen(s)*2+1);
+         if (!r)
+                 return NULL;
+         t = strcpy_backslash_escaped(r, s, bad);
+         *t = 0;
+         return r;
+ }
++#if 0 /* NM_IGNORED */
  char *shell_maybe_quote(const char *s) {
          const char *p;
          char *r, *t;
@@@ -568,7 -572,8 +578,10 @@@ void *xbsearch_r(const void *key, cons
                   int (*compar) (const void *, const void *, void *),
                   void *arg);
  
++#if 0 /* NM_IGNORED */
  #define _(String) gettext (String)
+ #define N_(String) String
++#endif
  void init_gettext(void);
  bool is_locale_utf8(void);
  
@@@ -809,13 -814,11 +822,13 @@@ int get_proc_cmdline_key(const char *pa
  
  int container_get_leader(const char *machine, pid_t *pid);
  
- int namespace_open(pid_t pid, int *pidns_fd, int *mntns_fd, int *netns_fd, int *root_fd);
- int namespace_enter(int pidns_fd, int mntns_fd, int netns_fd, int root_fd);
+ int namespace_open(pid_t pid, int *pidns_fd, int *mntns_fd, int *netns_fd, int *userns_fd, int *root_fd);
+ int namespace_enter(int pidns_fd, int mntns_fd, int netns_fd, int userns_fd, int root_fd);
  
 +#if 0 /* NM_IGNORED */
  int getpeercred(int fd, struct ucred *ucred);
  int getpeersec(int fd, char **ret);
 +#endif /* NM_IGNORED */
  
  int writev_safe(int fd, const struct iovec *w, int j);
  
@@@ -75,8 -66,7 +75,8 @@@ int dhcp_identifier_set_iaid(int ifinde
          const char *name = NULL;
          uint64_t id;
  
-         if (detect_container(NULL) <= 0) {
 +#if 0 /* NM_IGNORED */
+         if (detect_container() <= 0) {
                  /* not in a container, udev will be around */
                  _cleanup_udev_unref_ struct udev *udev;
                  char ifindex_str[2 + DECIMAL_STR_MAX(int)];
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
 +#include "nm-sd-adapt.h"
 +
  #include <stdint.h>
  
- #include "refcnt.h"
  #include "sd-dhcp6-lease.h"
  #include "dhcp6-internal.h"
  
  #include <linux/if.h>
  #include <arpa/inet.h>
  
 +#if 0 /* NM_IGNORED */
  #include "strv.h"
  #include "siphash24.h"
 +#endif /* NM_IGNORED */
  #include "dhcp-lease-internal.h"
 +#if 0 /* NM_IGNORED */
  #include "log.h"
  #include "utf8.h"
 +#endif /* NM_IGNORED */
  #include "util.h"
 +#if 0 /* NM_IGNORED */
  #include "conf-parser.h"
  #include "condition.h"
 +#endif /* NM_IGNORED */
  #include "network-internal.h"
+ #include "sd-icmp6-nd.h"
  
 +#if 0 /* NM_IGNORED */
  const char *net_get_name(struct udev_device *device) {
          const char *name, *field;
  
@@@ -752,12 -795,16 +797,16 @@@ int sd_dhcp_lease_save(sd_dhcp_lease *l
                  fprintf(f, "ROOT_PATH=%s\n", string);
  
          r = sd_dhcp_lease_get_routes(lease, &routes);
-         if (r >= 0)
+         if (r > 0)
                  serialize_dhcp_routes(f, "ROUTES", routes, r);
  
+         r = sd_dhcp_lease_get_timezone(lease, &string);
+         if (r >= 0)
+                 fprintf(f, "TIMEZONE=%s\n", string);
          r = sd_dhcp_lease_get_client_id(lease, &client_id, &client_id_len);
          if (r >= 0) {
 -                _cleanup_free_ char *client_id_hex;
 +                _cleanup_free_ char *client_id_hex = NULL;
  
                  client_id_hex = hexmem(client_id, client_id_len);
                  if (!client_id_hex) {
  #include <sys/ioctl.h>
  #include <linux/if_infiniband.h>
  
 +#if 0 /* NM_IGNORED */
  #include "udev.h"
  #include "udev-util.h"
 +#endif /* NM_IGNORED */
  #include "util.h"
- #include "refcnt.h"
  #include "random-util.h"
  
  #include "network-internal.h"
@@@ -850,11 -872,10 +876,10 @@@ static int client_receive_advertise(sd_
          return r;
  }
  
- static int client_receive_message(sd_event_source *s, int fd, uint32_t revents,
-                                   void *userdata) {
+ static int client_receive_message(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
          sd_dhcp6_client *client = userdata;
          DHCP6_CLIENT_DONT_DESTROY(client);
 -        _cleanup_free_ DHCP6Message *message;
 +        _cleanup_free_ DHCP6Message *message = NULL;
          int r, buflen, len;
  
          assert(s);
    along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
 +#include "nm-sd-adapt.h"
 +
  #include <errno.h>
  
+ #include "strv.h"
  #include "util.h"
  
  #include "dhcp6-lease-internal.h"
Simple merge
Simple merge
index 0000000,79b4074..5f5a921
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,79 +1,81 @@@
+ /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+ #ifndef foosdicmp6ndfoo
+ #define foosdicmp6ndfoo
+ /***
+   This file is part of systemd.
+   Copyright (C) 2014 Intel Corporation. All rights reserved.
+   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 "nm-sd-adapt.h"
++
+ #include <net/ethernet.h>
+ #include "sd-event.h"
+ enum {
+         ICMP6_EVENT_ROUTER_ADVERTISMENT_NONE           = 0,
+         ICMP6_EVENT_ROUTER_ADVERTISMENT_TIMEOUT        = 1,
+         ICMP6_EVENT_ROUTER_ADVERTISMENT_OTHER          = 2,
+         ICMP6_EVENT_ROUTER_ADVERTISMENT_MANAGED        = 3,
+         ICMP6_EVENT_ROUTER_ADVERTISMENT_PREFIX_EXPIRED = 4,
+ };
+ typedef struct sd_icmp6_nd sd_icmp6_nd;
+ typedef void(*sd_icmp6_nd_callback_t)(sd_icmp6_nd *nd, int event,
+                                       void *userdata);
+ int sd_icmp6_nd_set_callback(sd_icmp6_nd *nd, sd_icmp6_nd_callback_t cb,
+                              void *userdata);
+ int sd_icmp6_nd_set_index(sd_icmp6_nd *nd, int interface_index);
+ int sd_icmp6_nd_set_mac(sd_icmp6_nd *nd, const struct ether_addr *mac_addr);
+ int sd_icmp6_nd_attach_event(sd_icmp6_nd *nd, sd_event *event, int priority);
+ int sd_icmp6_nd_detach_event(sd_icmp6_nd *nd);
+ sd_event *sd_icmp6_nd_get_event(sd_icmp6_nd *nd);
+ sd_icmp6_nd *sd_icmp6_nd_ref(sd_icmp6_nd *nd);
+ sd_icmp6_nd *sd_icmp6_nd_unref(sd_icmp6_nd *nd);
+ int sd_icmp6_nd_new(sd_icmp6_nd **ret);
+ int sd_icmp6_prefix_match(struct in6_addr *prefix, uint8_t prefixlen,
+                         struct in6_addr *addr);
+ int sd_icmp6_ra_get_mtu(sd_icmp6_nd *nd, uint32_t *mtu);
+ int sd_icmp6_ra_get_prefixlen(sd_icmp6_nd *nd, const struct in6_addr *addr,
+                         uint8_t *prefixlen);
+ int sd_icmp6_ra_get_expired_prefix(sd_icmp6_nd *nd, struct in6_addr **addr,
+                                 uint8_t *prefixlen);
+ int sd_icmp6_nd_stop(sd_icmp6_nd *nd);
+ int sd_icmp6_router_solicitation_start(sd_icmp6_nd *nd);
+ #define SD_ICMP6_ADDRESS_FORMAT_STR "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x"
+ #define SD_ICMP6_ADDRESS_FORMAT_VAL(address)   \
+         be16toh((address).s6_addr16[0]),        \
+         be16toh((address).s6_addr16[1]),        \
+         be16toh((address).s6_addr16[2]),        \
+         be16toh((address).s6_addr16[3]),        \
+         be16toh((address).s6_addr16[4]),        \
+         be16toh((address).s6_addr16[5]),        \
+         be16toh((address).s6_addr16[6]),        \
+         be16toh((address).s6_addr16[7])
+ #endif