dhcp: merge branch 'th/systemd-dhcp-integration' (bgo #742719)

System Internals / NetworkManager - Thomas Haller [redhat.com] - 3 March 2015 05:37 UTC

4e07f61 dhcp: merge branch 'th/systemd-dhcp-integration' (bgo #742719)

src/Makefile.am | 6 +
src/dhcp-manager/nm-dhcp-systemd.c | 6 -
src/dhcp-manager/systemd-dhcp/nm-sd-adapt.h | 50 +-
.../src/libsystemd-network/dhcp-identifier.c | 111 ++
.../src/libsystemd-network/dhcp-identifier.h | 65 +
.../src/libsystemd-network/dhcp-internal.h | 2 +-
.../src/libsystemd-network/dhcp-network.c | 4 +-
.../src/libsystemd-network/dhcp-packet.c | 8 -
.../src/libsystemd-network/dhcp6-internal.h | 2 +-
.../src/libsystemd-network/dhcp6-protocol.h | 3 +
.../src/libsystemd-network/network-internal.c | 99 +-
.../src/libsystemd-network/network-internal.h | 14 +-
.../src/libsystemd-network/sd-dhcp-client.c | 108 +-
.../src/libsystemd-network/sd-dhcp-lease.c | 34 +-
.../src/libsystemd-network/sd-dhcp6-client.c | 244 +--
.../src/libsystemd-network/sd-dhcp6-lease.c | 32 +-
.../src/libsystemd/sd-id128/sd-id128.c | 235 +++
src/dhcp-manager/systemd-dhcp/src/shared/fileio.c | 6 +-
.../systemd-dhcp/src/shared/in-addr-util.c | 54 +-
.../systemd-dhcp/src/shared/in-addr-util.h | 6 +-
src/dhcp-manager/systemd-dhcp/src/shared/list.h | 20 +
src/dhcp-manager/systemd-dhcp/src/shared/log.h | 214 +++
src/dhcp-manager/systemd-dhcp/src/shared/macro.h | 68 +-
.../systemd-dhcp/src/shared/path-util.c | 694 +++++++++
.../systemd-dhcp/src/shared/path-util.h | 75 +
.../systemd-dhcp/src/shared/socket-util.h | 1 -
src/dhcp-manager/systemd-dhcp/src/shared/strv.c | 99 +-
src/dhcp-manager/systemd-dhcp/src/shared/strv.h | 18 +
.../systemd-dhcp/src/shared/time-util.c | 11 +-
.../systemd-dhcp/src/shared/time-util.h | 4 +-
src/dhcp-manager/systemd-dhcp/src/shared/utf8.c | 141 +-
src/dhcp-manager/systemd-dhcp/src/shared/utf8.h | 21 +-
src/dhcp-manager/systemd-dhcp/src/shared/util.c | 1627 +++++++++++++++-----
src/dhcp-manager/systemd-dhcp/src/shared/util.h | 216 ++-
.../systemd-dhcp/src/systemd/sd-dhcp6-client.h | 6 +-
.../systemd-dhcp/src/systemd/sd-dhcp6-lease.h | 13 +-
.../systemd-dhcp/src/systemd/sd-id128.h | 6 +-
37 files changed, 3497 insertions(+), 826 deletions(-)

Upstream: cgit.freedesktop.org

  • Share