merge: branch 'lr/ipv6-sharing'

System Internals / NetworkManager - Lubomir Rintel [v3.sk] - 9 November 2016 10:26 UTC

ecc6040 merge: branch 'lr/ipv6-sharing'

.gitignore | 5 +-
Makefile.am | 38 +-
clients/cli/nmcli.c | 2 +-
libnm-core/nm-setting-ip6-config.c | 56 +-
libnm-util/nm-setting-ip6-config.c | 19 +-
src/devices/nm-device.c | 428 +++++--
src/devices/nm-device.h | 12 +
src/dhcp-manager/nm-dhcp-client.c | 52 +-
src/dhcp-manager/nm-dhcp-client.h | 7 +-
src/dhcp-manager/nm-dhcp-dhclient.c | 14 +-
src/dhcp-manager/nm-dhcp-dhcpcd.c | 3 +-
src/dhcp-manager/nm-dhcp-manager.c | 12 +-
src/dhcp-manager/nm-dhcp-manager.h | 3 +-
src/dhcp-manager/nm-dhcp-systemd.c | 10 +-
src/dhcp-manager/nm-dhcp-utils.c | 56 +-
src/dhcp-manager/nm-dhcp-utils.h | 2 +
src/ndisc/nm-fake-ndisc.c | 410 +++++++
src/ndisc/nm-fake-ndisc.h | 81 ++
src/ndisc/nm-lndp-ndisc.c | 628 ++++++++++
src/ndisc/nm-lndp-ndisc.h | 48 +
src/ndisc/nm-ndisc-private.h | 78 ++
src/ndisc/nm-ndisc.c | 1234 ++++++++++++++++++++
src/ndisc/nm-ndisc.h | 189 +++
src/ndisc/tests/.gitignore | 1 +
src/ndisc/tests/test-ndisc-fake.c | 483 ++++++++
src/ndisc/tests/test-ndisc-linux.c | 86 ++
src/nm-core-utils.c | 13 +-
src/nm-iface-helper.c | 92 +-
src/nm-manager.c | 12 -
src/nm-policy.c | 282 ++++-
src/nm-types.h | 2 +-
src/platform/nm-linux-platform.c | 6 +-
src/platform/nm-platform-utils.c | 6 +-
src/rdisc/nm-fake-rdisc.c | 409 -------
src/rdisc/nm-fake-rdisc.h | 81 --
src/rdisc/nm-lndp-rdisc.c | 434 -------
src/rdisc/nm-lndp-rdisc.h | 47 -
src/rdisc/nm-rdisc-private.h | 77 --
src/rdisc/nm-rdisc.c | 1073 -----------------
src/rdisc/nm-rdisc.h | 170 ---
src/rdisc/tests/.gitignore | 1 -
src/rdisc/tests/test-rdisc-fake.c | 483 --------
src/rdisc/tests/test-rdisc-linux.c | 85 --
.../plugins/ifcfg-rh/nms-ifcfg-rh-reader.c | 39 +-
.../plugins/ifcfg-rh/nms-ifcfg-rh-writer.c | 2 +-
src/tests/test-general.c | 2 +-
src/tests/test-ip6-config.c | 4 +-
47 files changed, 4142 insertions(+), 3135 deletions(-)

Upstream: cgit.freedesktop.org


  • Share