proxy: merge branch 'th/proxy'

System Internals / NetworkManager - Thomas Haller [redhat.com] - 4 October 2016 05:22 UTC

6e9abe3 proxy: merge branch 'th/proxy'

TODO | 59 ----
callouts/nm-dispatcher-utils.c | 44 +++
callouts/nm-dispatcher-utils.h | 2 +
callouts/nm-dispatcher.c | 6 +
callouts/tests/dispatcher-external | 6 +
callouts/tests/dispatcher-up | 6 +
callouts/tests/dispatcher-vpn-down | 6 +
callouts/tests/dispatcher-vpn-up | 6 +
callouts/tests/test-dispatcher-envp.c | 42 +++
clients/cli/common.c | 76 +++++
clients/cli/common.h | 1 +
clients/cli/connections.c | 22 +-
clients/cli/devices.c | 5 +
clients/cli/settings.c | 163 ++++++++++-
clients/cli/settings.h | 2 +
libnm-core/Makefile.libnm-core | 2 +
libnm-core/nm-connection.c | 18 ++
libnm-core/nm-connection.h | 2 +
libnm-core/nm-core-internal.h | 1 +
libnm-core/nm-core-types.h | 1 +
libnm-core/nm-setting-proxy.c | 330 ++++++++++++++++++++++
libnm-core/nm-setting-proxy.h | 88 ++++++
libnm-core/nm-vpn-dbus-interface.h | 3 +
libnm/NetworkManager.h | 1 +
libnm/libnm.ver | 8 +
man/nmcli.xml | 13 +
po/POTFILES.in | 1 +
src/Makefile.am | 9 +
src/devices/nm-device.c | 73 ++++-
src/devices/nm-device.h | 3 +-
src/nm-dispatcher.c | 70 ++++-
src/nm-dispatcher.h | 2 +
src/nm-logging.c | 3 +-
src/nm-logging.h | 1 +
src/nm-pacrunner-manager.c | 474 ++++++++++++++++++++++++++++++++
src/nm-pacrunner-manager.h | 45 +++
src/nm-proxy-config.c | 187 +++++++++++++
src/nm-proxy-config.h | 57 ++++
src/nm-types.h | 2 +
src/settings/nm-settings.c | 1 +
src/settings/plugins/ifcfg-rh/reader.c | 63 ++++-
src/settings/plugins/ifcfg-rh/writer.c | 48 ++++
src/vpn-manager/nm-vpn-connection.c | 43 +++
src/vpn-manager/nm-vpn-connection.h | 2 +
44 files changed, 1922 insertions(+), 75 deletions(-)

Upstream: cgit.freedesktop.org

  • Share