summaryrefslogtreecommitdiff
path: root/libnm
diff options
context:
space:
mode:
authorAtul Anand <atulhjp@gmail.com>2016-08-16 05:55:55 +0530
committerThomas Haller <thaller@redhat.com>2016-10-04 11:44:13 +0200
commit2a40112ebe9e153f7431e817a0c5f6229e642215 (patch)
tree587062cf5b3485feb10e54f9a968b3616a44b930 /libnm
parenta5a36d6dfe0b3b4c69d25fae8c70ee07093d3f7b (diff)
downloadNetworkManager-2a40112ebe9e153f7431e817a0c5f6229e642215.tar.gz
libnm: API for Proxy Feature
libnm-core has been expanded to include proxy settings which clients like nmcli, nm-connection-editor use to configure proxy in PacRunner. It offers three modes i.e 'auto', 'manual'and 'none' and accordingly take data to configure PacRunner. The modes matches on the PacRunner side too.
Diffstat (limited to 'libnm')
-rw-r--r--libnm/NetworkManager.h1
-rw-r--r--libnm/libnm.ver19
2 files changed, 20 insertions, 0 deletions
diff --git a/libnm/NetworkManager.h b/libnm/NetworkManager.h
index b5dab8fd84..cca05cffdd 100644
--- a/libnm/NetworkManager.h
+++ b/libnm/NetworkManager.h
@@ -62,6 +62,7 @@
#include <nm-setting-infiniband.h>
#include <nm-setting-ip-config.h>
#include <nm-setting-ip-tunnel.h>
+#include <nm-setting-proxy.h>
#include <nm-setting-ip4-config.h>
#include <nm-setting-ip6-config.h>
#include <nm-setting-macvlan.h>
diff --git a/libnm/libnm.ver b/libnm/libnm.ver
index bfd15b0b9e..8c0e34f0d1 100644
--- a/libnm/libnm.ver
+++ b/libnm/libnm.ver
@@ -1087,5 +1087,24 @@ global:
libnm_1_6_0 {
global:
nm_capability_get_type;
+ nm_connection_get_setting_proxy;
+ nm_setting_proxy_get_type;
+ nm_setting_proxy_new;
+ nm_setting_proxy_get_method;
+ nm_setting_proxy_method_get_type;
+ nm_setting_proxy_get_http_proxy;
+ nm_setting_proxy_get_http_port;
+ nm_setting_proxy_get_http_default;
+ nm_setting_proxy_get_ssl_proxy;
+ nm_setting_proxy_get_ssl_port;
+ nm_setting_proxy_get_ftp_proxy;
+ nm_setting_proxy_get_ftp_port;
+ nm_setting_proxy_get_socks_proxy;
+ nm_setting_proxy_get_socks_port;
+ nm_setting_proxy_get_socks_version_5;
+ nm_setting_proxy_get_pac_script;
+ nm_setting_proxy_get_no_proxy_for;
+ nm_setting_proxy_get_browser_only;
+ nm_setting_proxy_get_pac_url;
nm_utils_is_json_object;
} libnm_1_4_0;