route-manager: merge branch 'lr/route-manager-rh740064'

System Internals / NetworkManager - Lubomir Rintel [v3.sk] - 27 February 2015 09:54 UTC

8d29b3a route-manager: merge branch 'lr/route-manager-rh740064'

.gitignore | 2 +
include/nm-test-utils.h | 4 +-
src/Makefile.am | 5 +
src/devices/nm-device.c | 43 +-
src/devices/wwan/nm-modem-broadband.c | 11 +-
src/devices/wwan/nm-modem.c | 3 +-
src/dhcp-manager/nm-dhcp-client.c | 6 +-
src/dhcp-manager/nm-dhcp-client.h | 1 +
src/dhcp-manager/nm-dhcp-dhclient-utils.c | 4 +-
src/dhcp-manager/nm-dhcp-dhclient-utils.h | 1 +
src/dhcp-manager/nm-dhcp-dhclient.c | 3 +-
src/dhcp-manager/nm-dhcp-manager.c | 4 +-
src/dhcp-manager/nm-dhcp-manager.h | 1 +
src/dhcp-manager/nm-dhcp-systemd.c | 13 +-
src/dhcp-manager/nm-dhcp-utils.c | 10 +-
src/dhcp-manager/nm-dhcp-utils.h | 6 +-
src/dhcp-manager/tests/test-dhcp-dhclient.c | 6 +-
src/dhcp-manager/tests/test-dhcp-utils.c | 34 +-
src/nm-iface-helper.c | 6 +-
src/nm-ip4-config.c | 58 ++-
src/nm-ip4-config.h | 5 +-
src/nm-ip6-config.c | 56 ++-
src/nm-ip6-config.h | 5 +-
src/nm-route-manager.c | 380 +++++++++++++++
src/nm-route-manager.h | 51 ++
src/nm-types.h | 1 +
src/platform/nm-fake-platform.c | 132 ++++--
src/platform/nm-platform.c | 191 --------
src/platform/nm-platform.h | 3 -
src/ppp-manager/nm-ppp-manager.c | 5 +-
src/tests/Makefile.am | 32 ++
src/tests/test-ip4-config.c | 10 +-
src/tests/test-ip6-config.c | 10 +-
src/tests/test-route-manager.c | 681 +++++++++++++++++++++++++++
src/vpn-manager/nm-vpn-connection.c | 11 +-
35 files changed, 1481 insertions(+), 313 deletions(-)

Upstream: cgit.freedesktop.org


  • Share