merge: branch 'bg/create-sw-devices-bgo749369-tun'

System Internals / NetworkManager - Beniamino Galvani [redhat.com] - 25 November 2015 04:53 UTC

123d0ba merge: branch 'bg/create-sw-devices-bgo749369-tun'

clients/cli/connections.c | 221 ++++++++++++++++++-
clients/cli/nmcli-completion | 2 +-
clients/cli/settings.c | 147 ++++++++++++-
introspection/nm-device-tun.xml | 6 +
libnm-core/Makefile.libnm-core | 2 +
libnm-core/nm-connection.c | 21 +-
libnm-core/nm-connection.h | 1 +
libnm-core/nm-core-internal.h | 1 +
libnm-core/nm-core-types.h | 1 +
libnm-core/nm-dbus-interface.h | 2 +
libnm-core/nm-setting-tun.c | 409 +++++++++++++++++++++++++++++++++++
libnm-core/nm-setting-tun.h | 94 ++++++++
libnm-glib/libnm-glib-test.c | 9 +
libnm-glib/nm-device-generic.c | 30 ++-
libnm-glib/nm-device-private.h | 1 +
libnm-glib/nm-device.c | 37 ++--
libnm-util/NetworkManager.h | 2 +
libnm/Makefile.am | 2 +
libnm/NetworkManager.h | 1 +
libnm/libnm.ver | 17 ++
libnm/nm-device-tun.c | 439 ++++++++++++++++++++++++++++++++++++++
libnm/nm-device-tun.h | 78 +++++++
libnm/nm-device.c | 3 +
libnm/nm-types.h | 1 +
po/POTFILES.in | 3 +
src/devices/nm-device-tun.c | 192 +++++++++++++++--
src/devices/nm-device-tun.h | 4 +-
src/devices/nm-device.c | 2 +
src/platform/nm-linux-platform.c | 63 ++++++
src/platform/nm-platform.c | 43 +++-
src/platform/nm-platform.h | 8 +
31 files changed, 1796 insertions(+), 46 deletions(-)

Upstream: cgit.freedesktop.org

  • Share