From 59c3714a494c3b3765657c0551ad82842d98a7d2 Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Sat, 26 Apr 2014 20:55:09 +0200 Subject: Imported Upstream version 0.9.8.10 --- Makefile.in | 2 + NEWS | 35 + callouts/Makefile.in | 2 + callouts/nm-dispatcher-action.c | 8 +- callouts/nm-dispatcher-utils.c | 11 +- callouts/tests/Makefile.am | 5 +- callouts/tests/Makefile.in | 7 +- cli/Makefile.in | 2 + cli/completion/Makefile.in | 2 + cli/src/Makefile.am | 12 +- cli/src/Makefile.in | 14 +- config.h.in | 9 + configure | 236 +- configure.ac | 19 +- data/Makefile.in | 2 + docs/Makefile.in | 2 + docs/api/Makefile.in | 58 +- docs/api/html/home.png | Bin 654 -> 256 bytes docs/api/html/index.html | 8 +- docs/api/html/ix01.html | 18 +- docs/api/html/left-insensitive.png | Bin 0 -> 395 bytes docs/api/html/left.png | Bin 459 -> 262 bytes docs/api/html/license.html | 18 +- docs/api/html/ref-dbus.html | 18 +- docs/api/html/ref-migrating.html | 18 +- docs/api/html/ref-settings.html | 20 +- docs/api/html/right-insensitive.png | Bin 0 -> 373 bytes docs/api/html/right.png | Bin 472 -> 261 bytes docs/api/html/secrets-flags.html | 18 +- docs/api/html/spec.html | 4 +- docs/api/html/style.css | 247 +- docs/api/html/up-insensitive.png | Bin 0 -> 374 bytes docs/api/html/up.png | Bin 406 -> 260 bytes docs/api/settings-spec.xml | 2 +- docs/api/spec.html | 4 +- docs/api/version.xml | 2 +- docs/libnm-glib/Makefile.in | 55 +- docs/libnm-glib/html/NMAccessPoint.html | 1152 +++-- docs/libnm-glib/html/NMActiveConnection.html | 847 +-- docs/libnm-glib/html/NMClient.html | 3089 ++++++----- docs/libnm-glib/html/NMDHCP4Config.html | 309 +- docs/libnm-glib/html/NMDHCP6Config.html | 309 +- docs/libnm-glib/html/NMDevice.html | 2389 +++++---- docs/libnm-glib/html/NMDeviceAdsl.html | 340 +- docs/libnm-glib/html/NMDeviceBond.html | 528 +- docs/libnm-glib/html/NMDeviceBridge.html | 534 +- docs/libnm-glib/html/NMDeviceBt.html | 539 +- docs/libnm-glib/html/NMDeviceEthernet.html | 618 ++- docs/libnm-glib/html/NMDeviceInfiniband.html | 451 +- docs/libnm-glib/html/NMDeviceModem.html | 393 +- docs/libnm-glib/html/NMDeviceOlpcMesh.html | 510 +- docs/libnm-glib/html/NMDeviceVlan.html | 526 +- docs/libnm-glib/html/NMDeviceWifi.html | 1084 ++-- docs/libnm-glib/html/NMDeviceWimax.html | 1075 ++-- docs/libnm-glib/html/NMIP4Config.html | 585 ++- docs/libnm-glib/html/NMIP6Config.html | 511 +- docs/libnm-glib/html/NMObject.html | 444 +- docs/libnm-glib/html/NMRemoteConnection.html | 713 +-- docs/libnm-glib/html/NMRemoteSettings.html | 1016 ++-- docs/libnm-glib/html/NMSecretAgent.html | 1152 +++-- docs/libnm-glib/html/NMVPNConnection.html | 396 +- docs/libnm-glib/html/NMWimaxNsp.html | 587 ++- docs/libnm-glib/html/annotation-glossary.html | 83 +- docs/libnm-glib/html/api-index-full.html | 1011 ++-- docs/libnm-glib/html/ch02.html | 20 +- docs/libnm-glib/html/home.png | Bin 654 -> 256 bytes docs/libnm-glib/html/index.html | 14 +- docs/libnm-glib/html/index.sgml | 759 ++- docs/libnm-glib/html/left-insensitive.png | Bin 0 -> 395 bytes docs/libnm-glib/html/left.png | Bin 459 -> 262 bytes docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html | 454 +- docs/libnm-glib/html/libnm-glib-NMVpnPluginUi.html | 388 -- .../html/libnm-glib-NMVpnPluginUiWidget.html | 446 ++ docs/libnm-glib/html/libnm-glib-nm-types.html | 45 +- .../html/libnm-glib-nm-vpn-plugin-utils.html | 195 +- docs/libnm-glib/html/libnm-glib.devhelp2 | 897 ++-- docs/libnm-glib/html/object-tree.html | 70 +- docs/libnm-glib/html/ref-overview.html | 18 +- docs/libnm-glib/html/right-insensitive.png | Bin 0 -> 373 bytes docs/libnm-glib/html/right.png | Bin 472 -> 261 bytes docs/libnm-glib/html/style.css | 247 +- docs/libnm-glib/html/up-insensitive.png | Bin 0 -> 374 bytes docs/libnm-glib/html/up.png | Bin 406 -> 260 bytes docs/libnm-glib/libnm-glib-docs.xml | 4 +- docs/libnm-glib/libnm-glib-sections.txt | 109 +- docs/libnm-glib/tmpl/nm-access-point.sgml | 69 - docs/libnm-glib/tmpl/nm-active-connection.sgml | 59 - docs/libnm-glib/tmpl/nm-client.sgml | 117 - docs/libnm-glib/tmpl/nm-device-adsl.sgml | 24 - docs/libnm-glib/tmpl/nm-device-bond.sgml | 34 - docs/libnm-glib/tmpl/nm-device-bridge.sgml | 34 - docs/libnm-glib/tmpl/nm-device-bt.sgml | 34 - docs/libnm-glib/tmpl/nm-device-ethernet.sgml | 39 - docs/libnm-glib/tmpl/nm-device-infiniband.sgml | 29 - docs/libnm-glib/tmpl/nm-device-modem.sgml | 29 - docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml | 34 - docs/libnm-glib/tmpl/nm-device-vlan.sgml | 34 - docs/libnm-glib/tmpl/nm-device-wifi.sgml | 67 - docs/libnm-glib/tmpl/nm-device-wimax.sgml | 66 - docs/libnm-glib/tmpl/nm-device.sgml | 136 - docs/libnm-glib/tmpl/nm-dhcp4-config.sgml | 24 - docs/libnm-glib/tmpl/nm-dhcp6-config.sgml | 24 - docs/libnm-glib/tmpl/nm-ip4-config.sgml | 44 - docs/libnm-glib/tmpl/nm-ip6-config.sgml | 39 - docs/libnm-glib/tmpl/nm-object.sgml | 39 - docs/libnm-glib/tmpl/nm-remote-connection.sgml | 58 - docs/libnm-glib/tmpl/nm-remote-settings.sgml | 56 - docs/libnm-glib/tmpl/nm-secret-agent.sgml | 47 - docs/libnm-glib/tmpl/nm-vpn-connection.sgml | 39 - .../tmpl/nm-vpn-plugin-ui-interface.sgml | 32 +- docs/libnm-glib/tmpl/nm-vpn-plugin.sgml | 28 - docs/libnm-glib/tmpl/nm-wimax-nsp.sgml | 34 - docs/libnm-glib/version.xml | 2 +- docs/libnm-util/Makefile.in | 55 +- docs/libnm-util/html/NMConnection.html | 2982 ++++++----- docs/libnm-util/html/NMSetting.html | 1820 ++++--- docs/libnm-util/html/NMSetting8021x.html | 5411 +++++++++++--------- docs/libnm-util/html/NMSettingAdsl.html | 825 +-- docs/libnm-util/html/NMSettingBluetooth.html | 463 +- docs/libnm-util/html/NMSettingBond.html | 916 ++-- docs/libnm-util/html/NMSettingBridge.html | 824 +-- docs/libnm-util/html/NMSettingBridgePort.html | 508 +- docs/libnm-util/html/NMSettingCdma.html | 584 ++- docs/libnm-util/html/NMSettingConnection.html | 1762 ++++--- docs/libnm-util/html/NMSettingGsm.html | 1369 ++--- docs/libnm-util/html/NMSettingIP4Config.html | 3306 +++++++----- docs/libnm-util/html/NMSettingIP6Config.html | 3315 +++++++----- docs/libnm-util/html/NMSettingInfiniband.html | 507 +- docs/libnm-util/html/NMSettingOlpcMesh.html | 384 +- docs/libnm-util/html/NMSettingPPP.html | 1705 +++--- docs/libnm-util/html/NMSettingPPPOE.html | 584 ++- docs/libnm-util/html/NMSettingSerial.html | 659 +-- docs/libnm-util/html/NMSettingVPN.html | 1072 ++-- docs/libnm-util/html/NMSettingVlan.html | 1179 +++-- docs/libnm-util/html/NMSettingWimax.html | 423 +- docs/libnm-util/html/NMSettingWired.html | 1358 ++--- docs/libnm-util/html/NMSettingWireless.html | 1685 +++--- .../libnm-util/html/NMSettingWirelessSecurity.html | 2388 +++++---- docs/libnm-util/html/annotation-glossary.html | 73 +- docs/libnm-util/html/api-index-full.html | 1697 +++--- docs/libnm-util/html/ch01.html | 18 +- docs/libnm-util/html/home.png | Bin 654 -> 256 bytes docs/libnm-util/html/index.html | 10 +- docs/libnm-util/html/index.sgml | 1079 ++-- docs/libnm-util/html/left-insensitive.png | Bin 0 -> 395 bytes docs/libnm-util/html/left.png | Bin 459 -> 262 bytes docs/libnm-util/html/libnm-util-nm-utils.html | 2374 +++++---- docs/libnm-util/html/libnm-util.devhelp2 | 1667 +++--- docs/libnm-util/html/object-tree.html | 148 +- docs/libnm-util/html/right-insensitive.png | Bin 0 -> 373 bytes docs/libnm-util/html/right.png | Bin 472 -> 261 bytes docs/libnm-util/html/style.css | 247 +- docs/libnm-util/html/up-insensitive.png | Bin 0 -> 374 bytes docs/libnm-util/html/up.png | Bin 406 -> 260 bytes docs/libnm-util/libnm-util-docs.sgml | 2 +- docs/libnm-util/libnm-util-sections.txt | 98 +- docs/libnm-util/tmpl/nm-connection.sgml | 8 - docs/libnm-util/tmpl/nm-setting-8021x.sgml | 177 - docs/libnm-util/tmpl/nm-setting-adsl.sgml | 52 - docs/libnm-util/tmpl/nm-setting-bluetooth.sgml | 27 - docs/libnm-util/tmpl/nm-setting-bond.sgml | 27 - docs/libnm-util/tmpl/nm-setting-bridge-port.sgml | 32 - docs/libnm-util/tmpl/nm-setting-bridge.sgml | 52 - docs/libnm-util/tmpl/nm-setting-cdma.sgml | 37 - docs/libnm-util/tmpl/nm-setting-connection.sgml | 11 - docs/libnm-util/tmpl/nm-setting-gsm.sgml | 72 - docs/libnm-util/tmpl/nm-setting-infiniband.sgml | 32 - docs/libnm-util/tmpl/nm-setting-ip4-config.sgml | 89 - docs/libnm-util/tmpl/nm-setting-ip6-config.sgml | 84 - docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml | 32 - docs/libnm-util/tmpl/nm-setting-ppp.sgml | 107 - docs/libnm-util/tmpl/nm-setting-pppoe.sgml | 37 - docs/libnm-util/tmpl/nm-setting-serial.sgml | 42 - docs/libnm-util/tmpl/nm-setting-vlan.sgml | 47 - docs/libnm-util/tmpl/nm-setting-vpn.sgml | 37 - docs/libnm-util/tmpl/nm-setting-wimax.sgml | 23 - docs/libnm-util/tmpl/nm-setting-wired.sgml | 72 - .../tmpl/nm-setting-wireless-security.sgml | 102 - docs/libnm-util/tmpl/nm-setting-wireless.sgml | 87 - docs/libnm-util/tmpl/nm-setting.sgml | 16 - docs/libnm-util/version.xml | 2 +- examples/C/Makefile.in | 2 + examples/C/glib/Makefile.am | 11 +- examples/C/glib/Makefile.in | 13 +- examples/C/qt/Makefile.am | 5 +- examples/C/qt/Makefile.in | 7 +- examples/Makefile.in | 2 + examples/dispatcher/Makefile.in | 2 + examples/python/Makefile.in | 2 + examples/python/add-connection.py | 2 +- examples/ruby/Makefile.in | 2 + examples/ruby/add-connection.rb | 2 +- examples/shell/Makefile.in | 2 + gtk-doc.make | 39 +- include/Makefile.in | 2 + introspection/Makefile.in | 2 + libnm-glib/Makefile.am | 5 +- libnm-glib/Makefile.in | 7 +- libnm-glib/nm-access-point.c | 1 - libnm-glib/nm-client.c | 9 +- libnm-glib/nm-ip4-config.c | 6 +- libnm-glib/nm-object.c | 114 +- libnm-glib/nm-remote-connection.c | 6 +- libnm-glib/nm-remote-settings.c | 4 +- libnm-glib/tests/Makefile.am | 5 +- libnm-glib/tests/Makefile.in | 7 +- libnm-util/Makefile.am | 13 +- libnm-util/Makefile.in | 16 +- libnm-util/nm-connection.c | 3 +- libnm-util/nm-setting-8021x.c | 39 +- libnm-util/nm-setting-bridge.c | 2 +- libnm-util/nm-setting-connection.c | 6 +- libnm-util/nm-setting-ip4-config.c | 3 - libnm-util/nm-setting-ip6-config.c | 12 +- libnm-util/nm-setting-vlan.c | 8 +- libnm-util/nm-setting.c | 8 +- libnm-util/nm-utils.c | 71 +- libnm-util/tests/Makefile.am | 24 +- libnm-util/tests/Makefile.in | 102 +- libnm-util/tests/certs/Makefile.in | 2 + libnm-util/tests/test-general.c | 62 + m4/gtk-doc.m4 | 47 +- m4/libtool.m4 | 12 +- man/Makefile.in | 2 + policy/Makefile.in | 2 + src/Makefile.am | 18 +- src/Makefile.in | 22 +- src/NetworkManagerUtils.c | 54 - src/bluez-manager/Makefile.am | 26 +- src/bluez-manager/Makefile.in | 16 +- src/dhcp-manager/Makefile.am | 7 +- src/dhcp-manager/Makefile.in | 9 +- src/dhcp-manager/nm-dhcp-client.c | 20 +- src/dhcp-manager/nm-dhcp-dhclient-utils.c | 4 + src/dhcp-manager/nm-dhcp-dhclient.c | 2 +- src/dhcp-manager/nm-dhcp-dhcpcd.c | 14 +- src/dhcp-manager/nm-dhcp-manager.c | 7 +- src/dhcp-manager/tests/Makefile.am | 7 +- src/dhcp-manager/tests/Makefile.in | 9 +- src/dns-manager/Makefile.am | 24 +- src/dns-manager/Makefile.in | 24 +- src/dns-manager/nm-dns-dnsmasq.c | 3 +- src/dnsmasq-manager/Makefile.am | 14 +- src/dnsmasq-manager/Makefile.in | 14 +- src/dnsmasq-manager/nm-dnsmasq-manager.c | 4 +- src/firewall-manager/Makefile.am | 18 +- src/firewall-manager/Makefile.in | 18 +- src/firewall-manager/nm-firewall-manager.c | 19 +- src/generated/Makefile.am | 16 +- src/generated/Makefile.in | 25 +- src/generated/nm-enum-types.c | 369 +- src/generated/nm-enum-types.h | 60 +- src/generated/nm-marshal.c | 72 +- src/generated/nm-marshal.h | 18 +- src/ip6-manager/Makefile.am | 16 +- src/ip6-manager/Makefile.in | 16 +- src/logging/Makefile.in | 2 + src/main.c | 6 +- src/modem-manager/Makefile.am | 14 +- src/modem-manager/Makefile.in | 20 +- src/modem-manager/nm-modem-manager.c | 71 +- src/nm-device-wifi.c | 16 +- src/nm-device.c | 48 +- src/nm-manager.c | 158 +- src/nm-policy.c | 54 +- src/nm-system.c | 12 +- src/org.freedesktop.NetworkManager.conf | 1 + src/posix-signals/Makefile.in | 2 + src/ppp-manager/Makefile.am | 12 +- src/ppp-manager/Makefile.in | 26 +- src/settings/Makefile.am | 14 +- src/settings/Makefile.in | 28 +- src/settings/nm-agent-manager.c | 82 +- src/settings/nm-settings-connection.c | 2 +- src/settings/nm-settings-error.h | 1 + src/settings/nm-settings.c | 37 + src/settings/plugins/Makefile.in | 2 + src/settings/plugins/example/Makefile.am | 18 +- src/settings/plugins/example/Makefile.in | 20 +- src/settings/plugins/ifcfg-rh/Makefile.am | 11 +- src/settings/plugins/ifcfg-rh/Makefile.in | 86 +- src/settings/plugins/ifcfg-rh/reader.c | 5 + src/settings/plugins/ifcfg-rh/tests/Makefile.am | 10 +- src/settings/plugins/ifcfg-rh/tests/Makefile.in | 31 +- .../ifcfg-rh/tests/network-scripts/Makefile.in | 2 + src/settings/plugins/ifcfg-suse/Makefile.in | 2 + src/settings/plugins/ifnet/Makefile.am | 26 +- src/settings/plugins/ifnet/Makefile.in | 65 +- src/settings/plugins/ifnet/connection_parser.c | 2 +- src/settings/plugins/ifnet/tests/Makefile.am | 23 +- src/settings/plugins/ifnet/tests/Makefile.in | 40 +- src/settings/plugins/ifupdown/Makefile.am | 16 +- src/settings/plugins/ifupdown/Makefile.in | 39 +- src/settings/plugins/ifupdown/tests/Makefile.am | 16 +- src/settings/plugins/ifupdown/tests/Makefile.in | 33 +- src/settings/plugins/keyfile/Makefile.am | 17 +- src/settings/plugins/keyfile/Makefile.in | 80 +- src/settings/plugins/keyfile/plugin.c | 3 +- src/settings/plugins/keyfile/tests/Makefile.am | 16 +- src/settings/plugins/keyfile/tests/Makefile.in | 33 +- .../plugins/keyfile/tests/keyfiles/Makefile.in | 2 + src/settings/tests/Makefile.am | 10 +- src/settings/tests/Makefile.in | 31 +- src/supplicant-manager/Makefile.am | 18 +- src/supplicant-manager/Makefile.in | 18 +- src/supplicant-manager/tests/Makefile.am | 14 +- src/supplicant-manager/tests/Makefile.in | 12 +- src/tests/Makefile.am | 16 +- src/tests/Makefile.in | 56 +- src/vpn-manager/Makefile.am | 31 +- src/vpn-manager/Makefile.in | 30 +- src/wifi/Makefile.am | 14 +- src/wifi/Makefile.in | 16 +- src/wifi/wifi-utils-nl80211.c | 9 + src/wimax/Makefile.am | 18 +- src/wimax/Makefile.in | 20 +- test/Makefile.am | 13 +- test/Makefile.in | 15 +- tools/Makefile.am | 10 +- tools/Makefile.in | 12 +- vapi/Makefile.in | 2 + 321 files changed, 39801 insertions(+), 35193 deletions(-) create mode 100644 docs/api/html/left-insensitive.png create mode 100644 docs/api/html/right-insensitive.png create mode 100644 docs/api/html/up-insensitive.png create mode 100644 docs/libnm-glib/html/left-insensitive.png delete mode 100644 docs/libnm-glib/html/libnm-glib-NMVpnPluginUi.html create mode 100644 docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html create mode 100644 docs/libnm-glib/html/right-insensitive.png create mode 100644 docs/libnm-glib/html/up-insensitive.png create mode 100644 docs/libnm-util/html/left-insensitive.png create mode 100644 docs/libnm-util/html/right-insensitive.png create mode 100644 docs/libnm-util/html/up-insensitive.png diff --git a/Makefile.in b/Makefile.in index b5970f72..c111de25 100644 --- a/Makefile.in +++ b/Makefile.in @@ -289,6 +289,7 @@ DEPDIR = @DEPDIR@ DHCLIENT_PATH = @DHCLIENT_PATH@ DHCPCD_PATH = @DHCPCD_PATH@ DLLTOOL = @DLLTOOL@ +DNSMASQ_PATH = @DNSMASQ_PATH@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -311,6 +312,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ GNUTLS_LIBS = @GNUTLS_LIBS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ diff --git a/NEWS b/NEWS index 5d6b2ef1..5a6ecf7d 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,38 @@ +================================================ +NetworkManager-0.9.8.10 +Overview of changes since NetworkManager-0.9.8.8 +================================================ + +This is a new stable release of NetworkManager. Notable changes include: + +* Fixed two problems that could result in gnome-shell showing + incorrect icons. (In particular, fixed the problem where the network + icon would disappear when certain VPNs were activated.) +* Fixed a bug that allowed a user to disconnect a connection that + they didn't have permissions on. +* Dispatcher scripts now receive correct IPv6 addresses, and also + correct DHCP information on lease-change events. +* NetworkManager no longer tries to start ModemManager itself on + systemd-using systems +* Activating a second ethernet connection while another is already + active will now not move the default route. +* Fixed some edge cases where one user could deactivate a connection + owned by another. +* Fix handling of dhcp-send-hostname property with ifcfg-rh +* DHCP now works even if you have a global dhclient.conf that + specifies a (non-NetworkManager) script to run +* The dhcpcd backend now requests that dhcpcd only do DHCPv4, fixing + some WWAN devices that don't react well to seeing IPv6 packets. +* Fixed the default value of bridge priority +* The D-Bus policy file has been updated to include the + NetworkManager-iodine VPN plugin +* It is possible to specify the path to dnsmasq at build time +* Removed a GLib 2.32 dependency that accidentally snuck into 0.9.8.8 +* Fixed a bunch of memory leaks +* Fixed a bunch of miscellaneous crashes +* Removed some less-useful bits of logging output + + ================================================ NetworkManager-0.9.8.8 Overview of changes since NetworkManager-0.9.8.6 diff --git a/callouts/Makefile.in b/callouts/Makefile.in index 073bea10..7a58e398 100644 --- a/callouts/Makefile.in +++ b/callouts/Makefile.in @@ -307,6 +307,7 @@ DEPDIR = @DEPDIR@ DHCLIENT_PATH = @DHCLIENT_PATH@ DHCPCD_PATH = @DHCPCD_PATH@ DLLTOOL = @DLLTOOL@ +DNSMASQ_PATH = @DNSMASQ_PATH@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -329,6 +330,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ GNUTLS_LIBS = @GNUTLS_LIBS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ diff --git a/callouts/nm-dispatcher-action.c b/callouts/nm-dispatcher-action.c index 0e4b11a7..de53f123 100644 --- a/callouts/nm-dispatcher-action.c +++ b/callouts/nm-dispatcher-action.c @@ -133,9 +133,10 @@ request_free (Request *request) g_free (request->action); g_free (request->iface); g_strfreev (request->envp); - if (request->scripts) + if (request->scripts) { g_ptr_array_foreach (request->scripts, (GFunc) script_info_free, NULL); - g_ptr_array_free (request->scripts, TRUE); + g_ptr_array_free (request->scripts, TRUE); + } } static gboolean @@ -171,7 +172,7 @@ next_script (gpointer user_data) } /* All done */ - results = g_ptr_array_sized_new (request->scripts->len); + results = g_ptr_array_new_full (request->scripts->len, (GDestroyNotify) g_value_array_free); for (i = 0; i < request->scripts->len; i++) { ScriptInfo *script = g_ptr_array_index (request->scripts, i); GValue elt = {0, }; @@ -202,6 +203,7 @@ next_script (gpointer user_data) dbus_g_method_return (request->context, results); request_free (request); + g_ptr_array_unref (results); return FALSE; } diff --git a/callouts/nm-dispatcher-utils.c b/callouts/nm-dispatcher-utils.c index 8824295d..e5240a7d 100644 --- a/callouts/nm-dispatcher-utils.c +++ b/callouts/nm-dispatcher-utils.c @@ -269,20 +269,17 @@ construct_ip6_items (GSList *items, GHashTable *ip6_config, const char *prefix) for (iter = addresses, num = 0; iter; iter = g_slist_next (iter)) { NMIP6Address *addr = (NMIP6Address *) iter->data; - char str_addr[INET6_ADDRSTRLEN + 1]; - char str_gw[INET6_ADDRSTRLEN + 1]; + char str_addr[INET6_ADDRSTRLEN]; + char str_gw[INET6_ADDRSTRLEN]; const struct in6_addr *tmp_addr; guint32 ip_prefix = nm_ip6_address_get_prefix (addr); char *addrtmp; - memset (str_addr, 0, sizeof (str_addr)); tmp_addr = nm_ip6_address_get_address (addr); - if (!inet_ntop (AF_INET6, &tmp_addr, str_addr, sizeof (str_addr))) - continue; + inet_ntop (AF_INET6, tmp_addr, str_addr, sizeof (str_addr)); - memset (str_gw, 0, sizeof (str_gw)); tmp_addr = nm_ip6_address_get_gateway (addr); - inet_ntop (AF_INET6, &tmp_addr, str_gw, sizeof (str_gw)); + inet_ntop (AF_INET6, tmp_addr, str_gw, sizeof (str_gw)); addrtmp = g_strdup_printf ("%sIP6_ADDRESS_%d=%s/%d %s", prefix, num++, str_addr, ip_prefix, str_gw); items = g_slist_prepend (items, addrtmp); diff --git a/callouts/tests/Makefile.am b/callouts/tests/Makefile.am index e8a13fc6..d33d0f91 100644 --- a/callouts/tests/Makefile.am +++ b/callouts/tests/Makefile.am @@ -1,6 +1,6 @@ if ENABLE_TESTS -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/include \ -I${top_builddir}/include \ -I$(top_srcdir)/libnm-util \ @@ -17,7 +17,8 @@ test_dispatcher_envp_SOURCES = \ test_dispatcher_envp_CPPFLAGS = \ $(GLIB_CFLAGS) \ - $(DBUS_CFLAGS) + $(DBUS_CFLAGS) \ + $(AM_CPPFLAGS) test_dispatcher_envp_LDADD = \ $(top_builddir)/libnm-util/libnm-util.la \ diff --git a/callouts/tests/Makefile.in b/callouts/tests/Makefile.in index f0810c3d..c28aee5c 100644 --- a/callouts/tests/Makefile.in +++ b/callouts/tests/Makefile.in @@ -207,6 +207,7 @@ DEPDIR = @DEPDIR@ DHCLIENT_PATH = @DHCLIENT_PATH@ DHCPCD_PATH = @DHCPCD_PATH@ DLLTOOL = @DLLTOOL@ +DNSMASQ_PATH = @DNSMASQ_PATH@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -229,6 +230,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ GNUTLS_LIBS = @GNUTLS_LIBS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -413,7 +415,7 @@ with_dhclient = @with_dhclient@ with_dhcpcd = @with_dhcpcd@ with_netconfig = @with_netconfig@ with_resolvconf = @with_resolvconf@ -@ENABLE_TESTS_TRUE@INCLUDES = \ +@ENABLE_TESTS_TRUE@AM_CPPFLAGS = \ @ENABLE_TESTS_TRUE@ -I$(top_srcdir)/include \ @ENABLE_TESTS_TRUE@ -I${top_builddir}/include \ @ENABLE_TESTS_TRUE@ -I$(top_srcdir)/libnm-util \ @@ -427,7 +429,8 @@ with_resolvconf = @with_resolvconf@ @ENABLE_TESTS_TRUE@test_dispatcher_envp_CPPFLAGS = \ @ENABLE_TESTS_TRUE@ $(GLIB_CFLAGS) \ -@ENABLE_TESTS_TRUE@ $(DBUS_CFLAGS) +@ENABLE_TESTS_TRUE@ $(DBUS_CFLAGS) \ +@ENABLE_TESTS_TRUE@ $(AM_CPPFLAGS) @ENABLE_TESTS_TRUE@test_dispatcher_envp_LDADD = \ @ENABLE_TESTS_TRUE@ $(top_builddir)/libnm-util/libnm-util.la \ diff --git a/cli/Makefile.in b/cli/Makefile.in index f2559343..dd649e36 100644 --- a/cli/Makefile.in +++ b/cli/Makefile.in @@ -211,6 +211,7 @@ DEPDIR = @DEPDIR@ DHCLIENT_PATH = @DHCLIENT_PATH@ DHCPCD_PATH = @DHCPCD_PATH@ DLLTOOL = @DLLTOOL@ +DNSMASQ_PATH = @DNSMASQ_PATH@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -233,6 +234,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ GNUTLS_LIBS = @GNUTLS_LIBS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ diff --git a/cli/completion/Makefile.in b/cli/completion/Makefile.in index 21dec8a7..62cd8b59 100644 --- a/cli/completion/Makefile.in +++ b/cli/completion/Makefile.in @@ -182,6 +182,7 @@ DEPDIR = @DEPDIR@ DHCLIENT_PATH = @DHCLIENT_PATH@ DHCPCD_PATH = @DHCPCD_PATH@ DLLTOOL = @DLLTOOL@ +DNSMASQ_PATH = @DNSMASQ_PATH@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -204,6 +205,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ GNUTLS_LIBS = @GNUTLS_LIBS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ diff --git a/cli/src/Makefile.am b/cli/src/Makefile.am index 0f379c10..1cd2a006 100644 --- a/cli/src/Makefile.am +++ b/cli/src/Makefile.am @@ -1,13 +1,16 @@ bin_PROGRAMS = \ nmcli -INCLUDES = \ +nmcli_CPPFLAGS = \ -I${top_srcdir} \ -I${top_srcdir}/include \ -I${top_builddir}/include \ -I${top_srcdir}/libnm-util \ -I${top_builddir}/libnm-util \ - -I${top_srcdir}/libnm-glib + -I${top_srcdir}/libnm-glib \ + $(DBUS_CFLAGS) \ + $(GLIB_CFLAGS) \ + -DNMCLI_LOCALEDIR=\"$(datadir)/locale\" nmcli_SOURCES = \ common.c \ @@ -25,11 +28,6 @@ nmcli_SOURCES = \ utils.c \ utils.h -nmcli_CPPFLAGS = \ - $(DBUS_CFLAGS) \ - $(GLIB_CFLAGS) \ - -DNMCLI_LOCALEDIR=\"$(datadir)/locale\" - nmcli_LDADD = \ $(DBUS_LIBS) \ $(GLIB_LIBS) \ diff --git a/cli/src/Makefile.in b/cli/src/Makefile.in index ef2add85..46846571 100644 --- a/cli/src/Makefile.in +++ b/cli/src/Makefile.in @@ -209,6 +209,7 @@ DEPDIR = @DEPDIR@ DHCLIENT_PATH = @DHCLIENT_PATH@ DHCPCD_PATH = @DHCPCD_PATH@ DLLTOOL = @DLLTOOL@ +DNSMASQ_PATH = @DNSMASQ_PATH@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -231,6 +232,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ GNUTLS_LIBS = @GNUTLS_LIBS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -415,13 +417,16 @@ with_dhclient = @with_dhclient@ with_dhcpcd = @with_dhcpcd@ with_netconfig = @with_netconfig@ with_resolvconf = @with_resolvconf@ -INCLUDES = \ +nmcli_CPPFLAGS = \ -I${top_srcdir} \ -I${top_srcdir}/include \ -I${top_builddir}/include \ -I${top_srcdir}/libnm-util \ -I${top_builddir}/libnm-util \ - -I${top_srcdir}/libnm-glib + -I${top_srcdir}/libnm-glib \ + $(DBUS_CFLAGS) \ + $(GLIB_CFLAGS) \ + -DNMCLI_LOCALEDIR=\"$(datadir)/locale\" nmcli_SOURCES = \ common.c \ @@ -439,11 +444,6 @@ nmcli_SOURCES = \ utils.c \ utils.h -nmcli_CPPFLAGS = \ - $(DBUS_CFLAGS) \ - $(GLIB_CFLAGS) \ - -DNMCLI_LOCALEDIR=\"$(datadir)/locale\" - nmcli_LDADD = \ $(DBUS_LIBS) \ $(GLIB_LIBS) \ diff --git a/config.h.in b/config.h.in index e7deb163..1f3a6e6a 100644 --- a/config.h.in +++ b/config.h.in @@ -3,6 +3,12 @@ /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD +/* Define if dhcpcd supports IPv6 (6.x+) */ +#undef DHCPCD_SUPPORTS_IPV6 + +/* Define to path of dnsmasq binary */ +#undef DNSMASQ_PATH + /* Define to 1 if translation of program messages to the user's native language is requested. */ #undef ENABLE_NLS @@ -73,6 +79,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYSLOG_H +/* Define if systemd support is available */ +#undef HAVE_SYSTEMD + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_IOCTL_H diff --git a/configure b/configure index 5f4dcb44..735e2aa3 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for NetworkManager 0.9.8.8. +# Generated by GNU Autoconf 2.69 for NetworkManager 0.9.8.10. # # Report bugs to . # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='NetworkManager' PACKAGE_TARNAME='NetworkManager' -PACKAGE_VERSION='0.9.8.8' -PACKAGE_STRING='NetworkManager 0.9.8.8' +PACKAGE_VERSION='0.9.8.10' +PACKAGE_STRING='NetworkManager 0.9.8.10' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager' PACKAGE_URL='' @@ -648,11 +648,14 @@ GTK_DOC_BUILD_HTML_FALSE GTK_DOC_BUILD_HTML_TRUE ENABLE_GTK_DOC_FALSE ENABLE_GTK_DOC_TRUE +HAVE_GTK_DOC_FALSE +HAVE_GTK_DOC_TRUE GTKDOC_DEPS_LIBS GTKDOC_DEPS_CFLAGS HTML_DIR GTKDOC_MKPDF GTKDOC_REBASE +GTKDOC_CHECK_PATH GTKDOC_CHECK RUN_ROOT_TESTS_FALSE RUN_ROOT_TESTS_TRUE @@ -669,6 +672,7 @@ LIBSOUP_LIBS LIBSOUP_CFLAGS KERNEL_FIRMWARE_DIR SYSTEM_CA_PATH +DNSMASQ_PATH IPTABLES_PATH with_netconfig with_resolvconf @@ -1003,6 +1007,7 @@ with_dhcpcd with_resolvconf with_netconfig with_iptables +with_dnsmasq with_system_ca_path with_kernel_firmware_dir enable_concheck @@ -1605,7 +1610,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures NetworkManager 0.9.8.8 to adapt to many kinds of systems. +\`configure' configures NetworkManager 0.9.8.10 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1675,7 +1680,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of NetworkManager 0.9.8.8:";; + short | recursive ) echo "Configuration of NetworkManager 0.9.8.10:";; esac cat <<\_ACEOF @@ -1765,6 +1770,8 @@ Optional Packages: --with-netconfig=yes|no Enable SUSE netconfig support --with-iptables=/path/to/iptables path to iptables + --with-dnsmasq=/path/to/dnsmasq + path to dnsmasq --with-system-ca-path=/path/to/ssl/certs path to system CA certificates --with-kernel-firmware-dir=DIR @@ -1909,7 +1916,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -NetworkManager configure 0.9.8.8 +NetworkManager configure 0.9.8.10 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2453,7 +2460,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by NetworkManager $as_me 0.9.8.8, which was +It was created by NetworkManager $as_me 0.9.8.10, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3322,7 +3329,7 @@ fi # Define the identity of the package. PACKAGE='NetworkManager' - VERSION='0.9.8.8' + VERSION='0.9.8.10' cat >>confdefs.h <<_ACEOF @@ -8454,7 +8461,7 @@ ia64-*-hpux*) rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -8472,7 +8479,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*linux*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -8491,7 +8501,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -16569,7 +16582,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu NM_MAJOR_VERSION=0 NM_MINOR_VERSION=9 NM_MICRO_VERSION=8 -NM_VERSION=0.9.8.8 +NM_VERSION=0.9.8.10 +NM_GIT_SHA=b784f9700adc363b077d26e5ac6412ff7c410b22 + @@ -21056,6 +21071,13 @@ fi if test "$with_systemdsystemunitdir" != no; then systemdsystemunitdir=$with_systemdsystemunitdir + +$as_echo "#define HAVE_SYSTEMD 1" >>confdefs.h + +else + +$as_echo "#define HAVE_SYSTEMD 0" >>confdefs.h + fi @@ -22446,6 +22468,10 @@ test -n "$with_dhcpcd" || with_dhcpcd="no" { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot use dhcpcd, version 4.x or higher is required" >&5 $as_echo "$as_me: WARNING: Cannot use dhcpcd, version 4.x or higher is required" >&2;} with_dhcpcd=no + elif $with_dhcpcd --version 2>&1 | grep -q "^dhcpcd [6789]\."; then + +$as_echo "#define DHCPCD_SUPPORTS_IPV6 1" >>confdefs.h + fi fi fi @@ -22684,6 +22710,65 @@ _ACEOF +# dnsmasq path + +# Check whether --with-dnsmasq was given. +if test "${with_dnsmasq+set}" = set; then : + withval=$with_dnsmasq; +fi + +if test "x${with_dnsmasq}" = x; then + # Extract the first word of "dnsmasq", so it can be a program name with args. +set dummy dnsmasq; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_DNSMASQ_PATH+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $DNSMASQ_PATH in + [\\/]* | ?:[\\/]*) + ac_cv_path_DNSMASQ_PATH="$DNSMASQ_PATH" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_dummy="$PATH:/sbin:/usr/sbin" +for as_dir in $as_dummy +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_DNSMASQ_PATH="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +DNSMASQ_PATH=$ac_cv_path_DNSMASQ_PATH +if test -n "$DNSMASQ_PATH"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DNSMASQ_PATH" >&5 +$as_echo "$DNSMASQ_PATH" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +else + DNSMASQ_PATH="$with_dnsmasq" +fi + +cat >>confdefs.h <<_ACEOF +#define DNSMASQ_PATH "$DNSMASQ_PATH" +_ACEOF + + + # system CA certificates path # Check whether --with-system-ca-path was given. @@ -23187,16 +23272,78 @@ fi - # Extract the first word of "gtkdoc-check", so it can be a program name with args. + gtk_doc_requires="gtk-doc >= 1.0" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk-doc" >&5 +$as_echo_n "checking for gtk-doc... " >&6; } + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gtk_doc_requires\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$gtk_doc_requires") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + have_gtk_doc=yes +else + have_gtk_doc=no +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_gtk_doc" >&5 +$as_echo "$have_gtk_doc" >&6; } + + if test "$have_gtk_doc" = "no"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: + You will not be able to create source packages with 'make dist' + because $gtk_doc_requires is not found." >&5 +$as_echo "$as_me: WARNING: + You will not be able to create source packages with 'make dist' + because $gtk_doc_requires is not found." >&2;} + fi + + # Extract the first word of "gtkdoc-check", so it can be a program name with args. +set dummy gtkdoc-check; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_GTKDOC_CHECK+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$GTKDOC_CHECK"; then + ac_cv_prog_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_GTKDOC_CHECK="gtkdoc-check.test" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +GTKDOC_CHECK=$ac_cv_prog_GTKDOC_CHECK +if test -n "$GTKDOC_CHECK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5 +$as_echo "$GTKDOC_CHECK" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + # Extract the first word of "gtkdoc-check", so it can be a program name with args. set dummy gtkdoc-check; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GTKDOC_CHECK+:} false; then : +if ${ac_cv_path_GTKDOC_CHECK_PATH+:} false; then : $as_echo_n "(cached) " >&6 else - case $GTKDOC_CHECK in + case $GTKDOC_CHECK_PATH in [\\/]* | ?:[\\/]*) - ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path. + ac_cv_path_GTKDOC_CHECK_PATH="$GTKDOC_CHECK_PATH" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -23206,7 +23353,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_GTKDOC_CHECK_PATH="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -23217,10 +23364,10 @@ IFS=$as_save_IFS ;; esac fi -GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK -if test -n "$GTKDOC_CHECK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5 -$as_echo "$GTKDOC_CHECK" >&6; } +GTKDOC_CHECK_PATH=$ac_cv_path_GTKDOC_CHECK_PATH +if test -n "$GTKDOC_CHECK_PATH"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK_PATH" >&5 +$as_echo "$GTKDOC_CHECK_PATH" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -23333,18 +23480,19 @@ else fi - if test x$enable_gtk_doc = xyes; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - : -else - as_fn_error $? "You need to have gtk-doc >= 1.0 installed to build $PACKAGE_NAME" "$LINENO" 5 -fi - if test "x$PACKAGE_NAME" != "xglib"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 +$as_echo_n "checking whether to build gtk-doc documentation... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5 +$as_echo "$enable_gtk_doc" >&6; } + + if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then + as_fn_error $? " + You must have $gtk_doc_requires installed to build documentation for + $PACKAGE_NAME. Please install gtk-doc or disable building the + documentation by adding '--disable-gtk-doc' to '$0'." "$LINENO" 5 + fi + + if test "x$PACKAGE_NAME" != "xglib"; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKDOC_DEPS" >&5 @@ -23416,14 +23564,8 @@ else $as_echo "yes" >&6; } fi - fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 -$as_echo_n "checking whether to build gtk-doc documentation... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5 -$as_echo "$enable_gtk_doc" >&6; } - # Check whether --enable-gtk-doc-html was given. if test "${enable_gtk_doc_html+set}" = set; then : enableval=$enable_gtk_doc_html; @@ -23448,6 +23590,14 @@ fi fi + if test x$have_gtk_doc = xyes; then + HAVE_GTK_DOC_TRUE= + HAVE_GTK_DOC_FALSE='#' +else + HAVE_GTK_DOC_TRUE='#' + HAVE_GTK_DOC_FALSE= +fi + if test x$enable_gtk_doc = xyes; then ENABLE_GTK_DOC_TRUE= ENABLE_GTK_DOC_FALSE='#' @@ -23757,6 +23907,10 @@ if test -z "${RUN_ROOT_TESTS_TRUE}" && test -z "${RUN_ROOT_TESTS_FALSE}"; then as_fn_error $? "conditional \"RUN_ROOT_TESTS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAVE_GTK_DOC_TRUE}" && test -z "${HAVE_GTK_DOC_FALSE}"; then + as_fn_error $? "conditional \"HAVE_GTK_DOC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then as_fn_error $? "conditional \"ENABLE_GTK_DOC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -24178,7 +24332,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by NetworkManager $as_me 0.9.8.8, which was +This file was extended by NetworkManager $as_me 0.9.8.10, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -24244,7 +24398,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -NetworkManager config.status 0.9.8.8 +NetworkManager config.status 0.9.8.10 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 6f40badb..c32a8dc5 100644 --- a/configure.ac +++ b/configure.ac @@ -4,9 +4,10 @@ dnl The NM version number m4_define([nm_major_version], [0]) m4_define([nm_minor_version], [9]) m4_define([nm_micro_version], [8]) -m4_define([nm_nano_version], [8]) +m4_define([nm_nano_version], [10]) m4_define([nm_version], [nm_major_version.nm_minor_version.nm_micro_version.nm_nano_version]) +m4_define([nm_git_sha], [m4_esyscmd([ ( [[ -d ./.git/ && "$(realpath ./.git/)" = "$(realpath "$(git rev-parse --git-dir 2>/dev/null)" 2>/dev/null)" ]] && git rev-parse --verify -q HEAD 2>/dev/null ) || true ])]) AC_INIT([NetworkManager], [nm_version], [http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager], @@ -42,6 +43,7 @@ NM_MAJOR_VERSION=nm_major_version NM_MINOR_VERSION=nm_minor_version NM_MICRO_VERSION=nm_micro_version NM_VERSION=nm_version +NM_GIT_SHA=nm_git_sha AC_SUBST(NM_MAJOR_VERSION) AC_SUBST(NM_MINOR_VERSION) AC_SUBST(NM_MICRO_VERSION) @@ -278,6 +280,9 @@ AS_IF([test -z "$with_systemdsystemunitdir"], with_systemdsystemunitdir=no) AM_CONDITIONAL(HAVE_SYSTEMD, [test "$with_systemdsystemunitdir" != no]) if test "$with_systemdsystemunitdir" != no; then AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) + AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd support is available]) +else + AC_DEFINE(HAVE_SYSTEMD, 0, [Define if systemd support is available]) fi PKG_CHECK_MODULES(SYSTEMD_200, [systemd >= 200], [have_systemd_200=yes],[have_systemd_200=no]) @@ -522,6 +527,8 @@ if test "$with_dhcpcd" = "yes"; then if ! $with_dhcpcd --version 2>&1 | grep -q "^dhcpcd [[456789]]\."; then AC_MSG_WARN([Cannot use dhcpcd, version 4.x or higher is required]) with_dhcpcd=no + elif $with_dhcpcd --version 2>&1 | grep -q "^dhcpcd [[6789]]\."; then + AC_DEFINE(DHCPCD_SUPPORTS_IPV6, 1, [Define if dhcpcd supports IPv6 (6.x+)]) fi fi fi @@ -574,6 +581,16 @@ fi AC_DEFINE_UNQUOTED(IPTABLES_PATH, "$IPTABLES_PATH", [Define to path of iptables binary]) AC_SUBST(IPTABLES_PATH) +# dnsmasq path +AC_ARG_WITH(dnsmasq, AS_HELP_STRING([--with-dnsmasq=/path/to/dnsmasq], [path to dnsmasq])) +if test "x${with_dnsmasq}" = x; then + AC_PATH_PROG(DNSMASQ_PATH, dnsmasq, [], $PATH:/sbin:/usr/sbin) +else + DNSMASQ_PATH="$with_dnsmasq" +fi +AC_DEFINE_UNQUOTED(DNSMASQ_PATH, "$DNSMASQ_PATH", [Define to path of dnsmasq binary]) +AC_SUBST(DNSMASQ_PATH) + # system CA certificates path AC_ARG_WITH(system-ca-path, AS_HELP_STRING([--with-system-ca-path=/path/to/ssl/certs], [path to system CA certificates])) if test "x${with_system_ca_path}" = x; then diff --git a/data/Makefile.in b/data/Makefile.in index 35b1a3c4..9496a3aa 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -182,6 +182,7 @@ DEPDIR = @DEPDIR@ DHCLIENT_PATH = @DHCLIENT_PATH@ DHCPCD_PATH = @DHCPCD_PATH@ DLLTOOL = @DLLTOOL@ +DNSMASQ_PATH = @DNSMASQ_PATH@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -204,6 +205,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ GNUTLS_LIBS = @GNUTLS_LIBS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ diff --git a/docs/Makefile.in b/docs/Makefile.in index 71584bae..42046844 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -211,6 +211,7 @@ DEPDIR = @DEPDIR@ DHCLIENT_PATH = @DHCLIENT_PATH@ DHCPCD_PATH = @DHCPCD_PATH@ DLLTOOL = @DLLTOOL@ +DNSMASQ_PATH = @DNSMASQ_PATH@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -233,6 +234,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ GNUTLS_LIBS = @GNUTLS_LIBS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ diff --git a/docs/api/Makefile.in b/docs/api/Makefile.in index a9ee52e0..8681680c 100644 --- a/docs/api/Makefile.in +++ b/docs/api/Makefile.in @@ -158,6 +158,7 @@ DEPDIR = @DEPDIR@ DHCLIENT_PATH = @DHCLIENT_PATH@ DHCPCD_PATH = @DHCPCD_PATH@ DLLTOOL = @DLLTOOL@ +DNSMASQ_PATH = @DNSMASQ_PATH@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -180,6 +181,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ GNUTLS_LIBS = @GNUTLS_LIBS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -438,13 +440,14 @@ REPORT_FILES = \ $(DOC_MODULE)-undeclared.txt \ $(DOC_MODULE)-unused.txt -CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) html/* \ - tmpl/* xml/* NetworkManager-sections.txt \ - NetworkManager-overrides.txt $(GENERATED_FILES) -@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = -@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp -@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = -@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp +CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) \ + gtkdoc-check.test html/* tmpl/* xml/* \ + NetworkManager-sections.txt NetworkManager-overrides.txt \ + $(GENERATED_FILES) +@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = +@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp +@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = +@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp #### setup #### GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_$(V)) @@ -565,6 +568,7 @@ distdir: $(DISTFILES) dist-hook check-am: all-am check: check-am +@ENABLE_GTK_DOC_FALSE@all-local: all-am: Makefile all-local installdirs: install: install-am @@ -696,8 +700,15 @@ uninstall-am: uninstall-local # Top-level SGML file includes (depends on) settings-spec.xml $(DOC_MAIN_SGML_FILE): settings-spec.xml -@ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) -@ENABLE_GTK_DOC_FALSE@all-local: +gtkdoc-check.test: Makefile + $(AM_V_GEN)echo "#!/bin/sh -e" > $@; \ + echo "$(GTKDOC_CHECK_PATH) || exit 1" >> $@; \ + chmod +x $@ + +all-gtk-doc: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) +.PHONY: all-gtk-doc + +@ENABLE_GTK_DOC_TRUE@all-local: all-gtk-doc docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) @@ -708,17 +719,19 @@ setup-build.stamp: files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ if test "x$$files" != "x" ; then \ for file in $$files ; do \ + destdir=`dirname $(abs_builddir)/$$file` ;\ + test -d "$$destdir" || mkdir -p "$$destdir"; \ test -f $(abs_srcdir)/$$file && \ - cp -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ + cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ done; \ fi; \ test -d $(abs_srcdir)/tmpl && \ - { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \ + { cp -pR $(abs_srcdir)/tmpl $(abs_builddir)/; \ chmod -R u+w $(abs_builddir)/tmpl; } \ fi $(AM_V_at)touch setup-build.stamp -scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) +scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(GTK_DOC_V_SCAN)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ @@ -748,7 +761,7 @@ tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DO $(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) $(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ if test -w $(abs_srcdir) ; then \ - cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \ + cp -pR $(abs_builddir)/tmpl $(abs_srcdir)/; \ fi \ fi $(AM_V_at)touch tmpl-build.stamp @@ -760,7 +773,7 @@ $(srcdir)/tmpl/*.sgml: @true sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) - $(GTK_DOC_V_XML)-chmod -R u+w $(srcdir) && _source_dir='' ; \ + -$(GTK_DOC_V_XML)chmod -R u+w $(srcdir) && _source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ @@ -822,6 +835,9 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) clean-local: @rm -f *~ *.bak @rm -rf .libs + @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \ + rm -f $(DOC_MODULE).types; \ + fi distclean-local: @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ @@ -867,12 +883,14 @@ uninstall-local: # # Require gtk-doc when making dist # -@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: docs -@ENABLE_GTK_DOC_FALSE@dist-check-gtkdoc: -@ENABLE_GTK_DOC_FALSE@ @echo "*** gtk-doc must be installed and enabled in order to make dist" -@ENABLE_GTK_DOC_FALSE@ @false - -dist-hook: dist-check-gtkdoc dist-hook-local +@HAVE_GTK_DOC_TRUE@dist-check-gtkdoc: docs +@HAVE_GTK_DOC_FALSE@dist-check-gtkdoc: +@HAVE_GTK_DOC_FALSE@ @echo "*** gtk-doc is needed to run 'make dist'. ***" +@HAVE_GTK_DOC_FALSE@ @echo "*** gtk-doc was not found when 'configure' ran. ***" +@HAVE_GTK_DOC_FALSE@ @echo "*** please install gtk-doc and rerun 'configure'. ***" +@HAVE_GTK_DOC_FALSE@ @false + +dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local @mkdir $(distdir)/tmpl @mkdir $(distdir)/html @-cp ./tmpl/*.sgml $(distdir)/tmpl diff --git a/docs/api/html/home.png b/docs/api/html/home.png index 17003611..9346b336 100644 Binary files a/docs/api/html/home.png and b/docs/api/html/home.png differ diff --git a/docs/api/html/index.html b/docs/api/html/index.html index aab8e218..778d86ae 100644 --- a/docs/api/html/index.html +++ b/docs/api/html/index.html @@ -2,11 +2,11 @@ -NetworkManager D-Bus Reference Manual +NetworkManager D-Bus Reference Manual: NetworkManager D-Bus Reference Manual - + @@ -14,7 +14,7 @@
-

Version 0.9.8.8 +

Version 0.9.8.10

Copyright © 2012 The NetworkManager Authors

@@ -73,6 +73,6 @@
- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20
\ No newline at end of file diff --git a/docs/api/html/ix01.html b/docs/api/html/ix01.html index ae39f850..31506c91 100644 --- a/docs/api/html/ix01.html +++ b/docs/api/html/ix01.html @@ -2,22 +2,22 @@ -Index +NetworkManager D-Bus Reference Manual: Index - + - - - - - - + + + + + +

@@ -26,6 +26,6 @@

- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20
\ No newline at end of file diff --git a/docs/api/html/left-insensitive.png b/docs/api/html/left-insensitive.png new file mode 100644 index 00000000..3269393a Binary files /dev/null and b/docs/api/html/left-insensitive.png differ diff --git a/docs/api/html/left.png b/docs/api/html/left.png index 2d05b3d5..2abde032 100644 Binary files a/docs/api/html/left.png and b/docs/api/html/left.png differ diff --git a/docs/api/html/license.html b/docs/api/html/license.html index 6cd55c46..10c38b2e 100644 --- a/docs/api/html/license.html +++ b/docs/api/html/license.html @@ -2,21 +2,21 @@ -Appendix A. License +NetworkManager D-Bus Reference Manual: Appendix A. License - + - - - - - - + + + + + +

@@ -380,6 +380,6 @@ Public License instead of this License.

- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20
\ No newline at end of file diff --git a/docs/api/html/ref-dbus.html b/docs/api/html/ref-dbus.html index 353bfa5b..dff6d1c9 100644 --- a/docs/api/html/ref-dbus.html +++ b/docs/api/html/ref-dbus.html @@ -2,22 +2,22 @@ -D-Bus API Reference +NetworkManager D-Bus Reference Manual: D-Bus API Reference - + - - - - - - + + + + + +

@@ -30,6 +30,6 @@

- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20
\ No newline at end of file diff --git a/docs/api/html/ref-migrating.html b/docs/api/html/ref-migrating.html index c9a2acda..2ea30224 100644 --- a/docs/api/html/ref-migrating.html +++ b/docs/api/html/ref-migrating.html @@ -2,22 +2,22 @@ -Migrating from NetworkManager 0.8 to NetworkManager 0.9 +NetworkManager D-Bus Reference Manual: Migrating from NetworkManager 0.8 to NetworkManager 0.9 - + - - - - - - + + + + + +

@@ -536,6 +536,6 @@

- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20
\ No newline at end of file diff --git a/docs/api/html/ref-settings.html b/docs/api/html/ref-settings.html index 28b89a23..b32f6b01 100644 --- a/docs/api/html/ref-settings.html +++ b/docs/api/html/ref-settings.html @@ -2,22 +2,22 @@ -Network Configuration Setting Specification +NetworkManager D-Bus Reference Manual: Network Configuration Setting Specification - + - - - - - - + + + + + +

@@ -441,7 +441,7 @@ 
priority
uint32
-
128
+
32768
Sets the Spanning Tree Protocol (STP) priority for this bridge. Lower values are 'better'; the lowest priority bridge will be elected the root bridge. @@ -1770,6 +1770,6 @@

- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20
\ No newline at end of file diff --git a/docs/api/html/right-insensitive.png b/docs/api/html/right-insensitive.png new file mode 100644 index 00000000..4c95785b Binary files /dev/null and b/docs/api/html/right-insensitive.png differ diff --git a/docs/api/html/right.png b/docs/api/html/right.png index 92832e3a..76260ec8 100644 Binary files a/docs/api/html/right.png and b/docs/api/html/right.png differ diff --git a/docs/api/html/secrets-flags.html b/docs/api/html/secrets-flags.html index 4948a0a4..91d40d5d 100644 --- a/docs/api/html/secrets-flags.html +++ b/docs/api/html/secrets-flags.html @@ -2,22 +2,22 @@ -Secret flag types +NetworkManager D-Bus Reference Manual: Secret flag types - + - - - - - - + + + + + +

@@ -59,6 +59,6 @@

- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20
\ No newline at end of file diff --git a/docs/api/html/spec.html b/docs/api/html/spec.html index 25c3f8a9..0573bc4f 100644 --- a/docs/api/html/spec.html +++ b/docs/api/html/spec.html @@ -1,4 +1,4 @@ -NetworkManager D-Bus Interface Specification version 0.9.8.8

NetworkManager D-Bus Interface Specification

Version 0.9.8.8

Copyright (C) 2008 - 2011 Red Hat, Inc.
Copyright (C) 2008 - 2009 Novell, Inc.
+

NetworkManager D-Bus Interface Specification

Version 0.9.8.10

Copyright (C) 2008 - 2011 Red Hat, Inc.
Copyright (C) 2008 - 2009 Novell, Inc.

This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or diff --git a/docs/api/html/style.css b/docs/api/html/style.css index d6f6c26e..705a5c9a 100644 --- a/docs/api/html/style.css +++ b/docs/api/html/style.css @@ -1,15 +1,23 @@ +body +{ + font-family: cantarell, sans-serif; +} .synopsis, .classsynopsis { /* tango:aluminium 1/2 */ background: #eeeeec; - border: solid 1px #d3d7cf; + background: rgba(238, 238, 236, 0.5); + border: solid 1px rgb(238, 238, 236); padding: 0.5em; } .programlisting { /* tango:sky blue 0/1 */ + /* fallback for no rgba support */ background: #e6f3ff; border: solid 1px #729fcf; + background: rgba(114, 159, 207, 0.1); + border: solid 1px rgba(114, 159, 207, 0.2); padding: 0.5em; } .variablelist @@ -27,7 +35,6 @@ { position: relative; top: 0em ! important; - } /* this is needed so that the local anchors are displayed below the naviagtion */ div.footnote a[name], div.refnamediv a[name], div.refsect1 a[name], div.refsect2 a[name], div.index a[name], div.glossary a[name], div.sect1 a[name] @@ -46,16 +53,20 @@ */ body { - padding-top: 3.2em; - padding-bottom: 20em; + padding-top: 5em; + padding-bottom: 500px; + max-width: 60em; + } + p + { + max-width: 60em; } /* style and size the navigation bar */ table.navigation#top { position: fixed; - /* tango:scarlet red 0/1 */ - background: #ffe6e6; - border: solid 1px #ef2929; + background: #e2e2e2; + border-bottom: solid 1px #babdb6; margin-top: 0; margin-bottom: 0; top: 0; @@ -65,21 +76,57 @@ } .navigation a, .navigation a:visited { - /* tango:scarlet red 3 */ - color: #a40000; + /* tango:sky blue 3 */ + color: #204a87; } .navigation a:hover { - /* tango:scarlet red 1 */ - color: #ef2929; + /* tango:sky blue 2 */ + color: #3465a4; } td.shortcuts { - /* tango:scarlet red 1 */ - color: #ef2929; + /* tango:sky blue 2 */ + color: #3465a4; font-size: 80%; white-space: nowrap; } + td.shortcuts .dim + { + color: #babdb6; + } +} +@media screen and (min-width: 60em) { + /* screen larger than 60em */ + body { margin: auto; } +} +@media screen and (max-width: 60em) { + /* screen less than 60em */ + #nav_hierarchy { display: none; } + #nav_interfaces { display: none; } + #nav_prerequisites { display: none; } + #nav_derived_interfaces { display: none; } + #nav_implementations { display: none; } + #nav_child_properties { display: none; } + #nav_style_properties { display: none; } + #nav_index { display: none; } + #nav_glossary { display: none; } + .gallery_image { display: none; } + .property_flags { display: none; } + .signal_flags { display: none; } + .parameter_annotations { display: none; } + .enum_member_annotations { display: none; } + .struct_member_annotations { display: none; } + .union_member_annotations { display: none; } + /* now that a column is hidden, optimize space */ + col.parameters_name { width: auto; } + col.parameters_description { width: auto; } + col.struct_members_name { width: auto; } + col.struct_members_description { width: auto; } + col.enum_members_name { width: auto; } + col.enum_members_description { width: auto; } + col.union_members_name { width: auto; } + col.union_members_description { width: auto; } } @media print { table.navigation { @@ -89,9 +136,8 @@ div.titlepage table.navigation { visibility: visible; display: table; - /* tango:scarlet red 0/1 */ - background: #ffe6e6; - border: solid 1px #ef2929; + background: #e2e2e2; + border: solid 1px #babdb6; margin-top: 0; margin-bottom: 0; top: 0; @@ -102,7 +148,7 @@ .navigation .title { - font-size: 200%; + font-size: 120%; } div.gallery-float @@ -132,6 +178,67 @@ a:hover color: #729fcf; } +div.informaltable table +{ + border-collapse: separate; + border-spacing: 20px 3px; + border: none; +} + +div.informaltable table td, div.informaltable table th +{ + vertical-align: top; +} + +.function_type, +.variable_type, +.property_type, +.signal_type, +.parameter_name, +.struct_member_name, +.union_member_name, +.define_keyword, +.datatype_keyword, +.typedef_keyword +{ + text-align: right; +} + +/* dim non-primary columns */ +.c_punctuation, +.function_type, +.variable_type, +.property_type, +.signal_type, +.define_keyword, +.datatype_keyword, +.typedef_keyword, +.property_flags, +.signal_flags, +.parameter_annotations, +.enum_member_annotations, +.struct_member_annotations, +.union_member_annotations +{ + color: #888a85; +} + +.function_type a, +.function_type a:visited, +.function_type a:hover, +.property_type a, +.property_type a:visited, +.property_type a:hover, +.signal_type a, +.signal_type a:visited, +.signal_type a:hover, +.signal_flags a, +.signal_flags a:visited, +.signal_flags a:hover +{ + color: #729fcf; +} + div.table table { border-collapse: collapse; @@ -154,14 +261,43 @@ div.table table th background-color: #d3d7cf; } +h4 +{ + color: #555753; +} + hr { - /* tango:aluminium 3 */ - color: #babdb6; - background: #babdb6; + /* tango:aluminium 1 */ + color: #d3d7cf; + background: #d3d7cf; border: none 0px; height: 1px; clear: both; + margin: 2.0em 0em 2.0em 0em; +} + +dl.toc dt +{ + padding-bottom: 0.25em; +} + +dl.toc > dd > dl > dt +{ + padding-top: 0.25em; + padding-bottom: 0.25em; +} + +dl.toc > dt +{ + padding-top: 1em; + padding-bottom: 0.5em; + font-weight: bold; +} + +.parameter +{ + font-style: normal; } .footer @@ -173,31 +309,70 @@ hr font-size: 80%; } +.informalfigure, +.figure +{ + margin: 1em; +} + +.informalexample, +.example +{ + margin-top: 1em; + margin-bottom: 1em; +} + .warning { /* tango:orange 0/1 */ background: #ffeed9; + background: rgba(252, 175, 62, 0.1); border-color: #ffb04f; + border-color: rgba(252, 175, 62, 0.2); } .note { /* tango:chameleon 0/0.5 */ background: #d8ffb2; + background: rgba(138, 226, 52, 0.1); border-color: #abf562; + border-color: rgba(138, 226, 52, 0.2); } -.note, .warning +div.blockquote +{ + border-color: #eeeeec; +} +.note, .warning, div.blockquote { padding: 0.5em; border-width: 1px; border-style: solid; + margin: 2em; } -.note h3, .warning h3 +.note p, .warning p { - margin-top: 0.0em + margin: 0; } -.note p, .warning p + +div.warning h3.title, +div.note h3.title { - margin-bottom: 0.0em + display: none; +} + +p + div.section +{ + margin-top: 1em; +} + +div.refnamediv, +div.refsynopsisdiv, +div.refsect1, +div.refsect2, +div.toc, +div.section +{ + margin-bottom: 1em; } /* blob links */ @@ -210,11 +385,22 @@ h2 .extralinks, h3 .extralinks font-weight: normal; } +.lineart +{ + color: #d3d7cf; + font-weight: normal; +} + .annotation { /* tango:aluminium 5 */ color: #555753; - font-size: 80%; + font-weight: normal; +} + +.structfield +{ + font-style: normal; font-weight: normal; } @@ -237,6 +423,7 @@ h2 .extralinks, h3 .extralinks .listing_frame { /* tango:sky blue 1 */ border: solid 1px #729fcf; + border: solid 1px rgba(114, 159, 207, 0.2); padding: 0px; } @@ -245,20 +432,28 @@ h2 .extralinks, h3 .extralinks margin-bottom: 0px; padding: 0.5em; } +.listing_lines { + /* this just adds visual clutter and + takes precious room from small screens */ + display: none; +} .listing_lines { /* tango:sky blue 0.5 */ background: #a6c5e3; + background: rgba(114, 159, 207, 0.2); /* tango:aluminium 6 */ color: #2e3436; } .listing_code { /* tango:sky blue 0 */ background: #e6f3ff; + background: rgba(114, 159, 207, 0.1); } .listing_code .programlisting { /* override from previous */ border: none 0px; padding: 0px; + background: none; } .listing_lines pre, .listing_code pre { margin: 0px; diff --git a/docs/api/html/up-insensitive.png b/docs/api/html/up-insensitive.png new file mode 100644 index 00000000..f4049860 Binary files /dev/null and b/docs/api/html/up-insensitive.png differ diff --git a/docs/api/html/up.png b/docs/api/html/up.png index 85b3e2a2..80b4b37e 100644 Binary files a/docs/api/html/up.png and b/docs/api/html/up.png differ diff --git a/docs/api/settings-spec.xml b/docs/api/settings-spec.xml index e793df1c..c7b88b4e 100644 --- a/docs/api/settings-spec.xml +++ b/docs/api/settings-spec.xml @@ -379,7 +379,7 @@ priority uint32 - 128 + 32768 Sets the Spanning Tree Protocol (STP) priority for this bridge. Lower values are 'better'; the lowest priority bridge will be elected the root bridge. diff --git a/docs/api/spec.html b/docs/api/spec.html index 25c3f8a9..0573bc4f 100644 --- a/docs/api/spec.html +++ b/docs/api/spec.html @@ -1,4 +1,4 @@ -NetworkManager D-Bus Interface Specification version 0.9.8.8

NetworkManager D-Bus Interface Specification

Version 0.9.8.8

Copyright (C) 2008 - 2011 Red Hat, Inc.
Copyright (C) 2008 - 2009 Novell, Inc.
+

NetworkManager D-Bus Interface Specification

Version 0.9.8.10

Copyright (C) 2008 - 2011 Red Hat, Inc.
Copyright (C) 2008 - 2009 Novell, Inc.

This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or diff --git a/docs/api/version.xml b/docs/api/version.xml index fe98bd59..dd62f24f 100644 --- a/docs/api/version.xml +++ b/docs/api/version.xml @@ -1 +1 @@ -0.9.8.8 +0.9.8.10 diff --git a/docs/libnm-glib/Makefile.in b/docs/libnm-glib/Makefile.in index ab677caa..3cfc7313 100644 --- a/docs/libnm-glib/Makefile.in +++ b/docs/libnm-glib/Makefile.in @@ -158,6 +158,7 @@ DEPDIR = @DEPDIR@ DHCLIENT_PATH = @DHCLIENT_PATH@ DHCPCD_PATH = @DHCPCD_PATH@ DLLTOOL = @DLLTOOL@ +DNSMASQ_PATH = @DNSMASQ_PATH@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -180,6 +181,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ GNUTLS_LIBS = @GNUTLS_LIBS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -488,12 +490,12 @@ REPORT_FILES = \ $(DOC_MODULE)-unused.txt CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) \ - libnm-glib-sections.txt libnm-glib-overrides.txt html/* tmpl/* \ - xml/* -@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = -@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp -@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = -@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp + gtkdoc-check.test libnm-glib-sections.txt \ + libnm-glib-overrides.txt html/* tmpl/* xml/* +@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = +@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp +@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = +@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp #### setup #### GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_$(V)) @@ -614,6 +616,7 @@ distdir: $(DISTFILES) dist-hook check-am: all-am check: check-am +@ENABLE_GTK_DOC_FALSE@all-local: all-am: Makefile all-local installdirs: install: install-am @@ -731,8 +734,15 @@ uninstall-am: uninstall-local uninstall-am uninstall-local -@ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) -@ENABLE_GTK_DOC_FALSE@all-local: +gtkdoc-check.test: Makefile + $(AM_V_GEN)echo "#!/bin/sh -e" > $@; \ + echo "$(GTKDOC_CHECK_PATH) || exit 1" >> $@; \ + chmod +x $@ + +all-gtk-doc: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) +.PHONY: all-gtk-doc + +@ENABLE_GTK_DOC_TRUE@all-local: all-gtk-doc docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) @@ -743,17 +753,19 @@ setup-build.stamp: files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ if test "x$$files" != "x" ; then \ for file in $$files ; do \ + destdir=`dirname $(abs_builddir)/$$file` ;\ + test -d "$$destdir" || mkdir -p "$$destdir"; \ test -f $(abs_srcdir)/$$file && \ - cp -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ + cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ done; \ fi; \ test -d $(abs_srcdir)/tmpl && \ - { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \ + { cp -pR $(abs_srcdir)/tmpl $(abs_builddir)/; \ chmod -R u+w $(abs_builddir)/tmpl; } \ fi $(AM_V_at)touch setup-build.stamp -scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) +scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(GTK_DOC_V_SCAN)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ @@ -783,7 +795,7 @@ tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DO $(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) $(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ if test -w $(abs_srcdir) ; then \ - cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \ + cp -pR $(abs_builddir)/tmpl $(abs_srcdir)/; \ fi \ fi $(AM_V_at)touch tmpl-build.stamp @@ -795,7 +807,7 @@ $(srcdir)/tmpl/*.sgml: @true sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) - $(GTK_DOC_V_XML)-chmod -R u+w $(srcdir) && _source_dir='' ; \ + -$(GTK_DOC_V_XML)chmod -R u+w $(srcdir) && _source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ @@ -857,6 +869,9 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) clean-local: @rm -f *~ *.bak @rm -rf .libs + @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \ + rm -f $(DOC_MODULE).types; \ + fi distclean-local: @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ @@ -902,12 +917,14 @@ uninstall-local: # # Require gtk-doc when making dist # -@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: docs -@ENABLE_GTK_DOC_FALSE@dist-check-gtkdoc: -@ENABLE_GTK_DOC_FALSE@ @echo "*** gtk-doc must be installed and enabled in order to make dist" -@ENABLE_GTK_DOC_FALSE@ @false - -dist-hook: dist-check-gtkdoc dist-hook-local +@HAVE_GTK_DOC_TRUE@dist-check-gtkdoc: docs +@HAVE_GTK_DOC_FALSE@dist-check-gtkdoc: +@HAVE_GTK_DOC_FALSE@ @echo "*** gtk-doc is needed to run 'make dist'. ***" +@HAVE_GTK_DOC_FALSE@ @echo "*** gtk-doc was not found when 'configure' ran. ***" +@HAVE_GTK_DOC_FALSE@ @echo "*** please install gtk-doc and rerun 'configure'. ***" +@HAVE_GTK_DOC_FALSE@ @false + +dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local @mkdir $(distdir)/tmpl @mkdir $(distdir)/html @-cp ./tmpl/*.sgml $(distdir)/tmpl diff --git a/docs/libnm-glib/html/NMAccessPoint.html b/docs/libnm-glib/html/NMAccessPoint.html index dfa604c6..ee09109e 100644 --- a/docs/libnm-glib/html/NMAccessPoint.html +++ b/docs/libnm-glib/html/NMAccessPoint.html @@ -2,36 +2,28 @@ -NMAccessPoint +libnm-glib Reference Manual: NMAccessPoint - + - - - - - - - - - - + + + + + + +

@@ -39,649 +31,823 @@

NMAccessPoint

NMAccessPoint

- +
-
-

Synopsis

-
#define             NM_ACCESS_POINT_FLAGS
-#define             NM_ACCESS_POINT_WPA_FLAGS
-#define             NM_ACCESS_POINT_RSN_FLAGS
-#define             NM_ACCESS_POINT_SSID
-#define             NM_ACCESS_POINT_BSSID
-#define             NM_ACCESS_POINT_FREQUENCY
-#define             NM_ACCESS_POINT_MODE
-#define             NM_ACCESS_POINT_MAX_BITRATE
-#define             NM_ACCESS_POINT_STRENGTH
-#define             NM_ACCESS_POINT_HW_ADDRESS
-                    NMAccessPoint;
-                    NMAccessPointClass;
-GObject *           nm_access_point_new                 (DBusGConnection *connection,
-                                                         const char *path);
-NM80211ApFlags      nm_access_point_get_flags           (NMAccessPoint *ap);
-NM80211ApSecurityFlags nm_access_point_get_wpa_flags    (NMAccessPoint *ap);
-NM80211ApSecurityFlags nm_access_point_get_rsn_flags    (NMAccessPoint *ap);
-const GByteArray *  nm_access_point_get_ssid            (NMAccessPoint *ap);
-const char *        nm_access_point_get_bssid           (NMAccessPoint *ap);
-guint32             nm_access_point_get_frequency       (NMAccessPoint *ap);
-NM80211Mode         nm_access_point_get_mode            (NMAccessPoint *ap);
-guint32             nm_access_point_get_max_bitrate     (NMAccessPoint *ap);
-guint8              nm_access_point_get_strength        (NMAccessPoint *ap);
-GSList *            nm_access_point_filter_connections  (NMAccessPoint *ap,
-                                                         const GSList *connections);
-gboolean            nm_access_point_connection_valid    (NMAccessPoint *ap,
-                                                         NMConnection *connection);
-const char *        nm_access_point_get_hw_address      (NMAccessPoint *ap);
-
-
-
-

Object Hierarchy

-
-  GObject
-   +----NMObject
-         +----NMAccessPoint
-
-
-
-

Implemented Interfaces

-

-NMAccessPoint implements - GInitable and GAsyncInitable.

-
-
-

Properties

-
-  "bssid"                    gchar*                : Read
-  "flags"                    guint                 : Read
-  "frequency"                guint                 : Read
-  "hw-address"               gchar*                : Read
-  "max-bitrate"              guint                 : Read
-  "mode"                     guint                 : Read
-  "rsn-flags"                guint                 : Read
-  "ssid"                     NMSsid*               : Read
-  "strength"                 guchar                : Read
-  "wpa-flags"                guint                 : Read
-
-
-

Description

-

-

-
-
-

Details

-
-

NM_ACCESS_POINT_FLAGS

-
#define NM_ACCESS_POINT_FLAGS       "flags"
-
-

-

-
-
-
-

NM_ACCESS_POINT_WPA_FLAGS

-
#define NM_ACCESS_POINT_WPA_FLAGS   "wpa-flags"
-
-

-

-
-
-
-

NM_ACCESS_POINT_RSN_FLAGS

-
#define NM_ACCESS_POINT_RSN_FLAGS   "rsn-flags"
-
-

-

-
-
-
-

NM_ACCESS_POINT_SSID

-
#define NM_ACCESS_POINT_SSID        "ssid"
-
-

-

-
-
-
-

NM_ACCESS_POINT_BSSID

-
#define NM_ACCESS_POINT_BSSID       "bssid"
-
-

-

-
-
-
-

NM_ACCESS_POINT_FREQUENCY

-
#define NM_ACCESS_POINT_FREQUENCY   "frequency"
-
-

-

-
-
-
-

NM_ACCESS_POINT_MODE

-
#define NM_ACCESS_POINT_MODE        "mode"
-
-

-

-
-
-
-

NM_ACCESS_POINT_MAX_BITRATE

-
#define NM_ACCESS_POINT_MAX_BITRATE "max-bitrate"
-
-

-

-
-
-
-

NM_ACCESS_POINT_STRENGTH

-
#define NM_ACCESS_POINT_STRENGTH    "strength"
-
-

-

-
-
-
-

NM_ACCESS_POINT_HW_ADDRESS

-
#define NM_ACCESS_POINT_HW_ADDRESS  "hw-address"
-
-

-

-
-
-
-

NMAccessPoint

-
typedef struct _NMAccessPoint NMAccessPoint;
-

-

-
-
-
-

NMAccessPointClass

-
typedef struct {
-	NMObjectClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMAccessPointClass;
-
-

-

-
-
-
-

nm_access_point_new ()

-
GObject *           nm_access_point_new                 (DBusGConnection *connection,
-                                                         const char *path);
-

-Creates a new NMAccessPoint. -

-
+

Functions

+
--++ - - + - - + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

connection :

the DBusGConnection + +GObject * + +nm_access_point_new ()

path :

the DBusobject path of the access point +NM80211ApFlags + +nm_access_point_get_flags () +
+NM80211ApSecurityFlags + +nm_access_point_get_wpa_flags () +

Returns :

a new access point. [transfer full] + +NM80211ApSecurityFlags + +nm_access_point_get_rsn_flags () +
const GByteArray * + +nm_access_point_get_ssid () +
const char * + +nm_access_point_get_bssid () +
+guint32 + +nm_access_point_get_frequency () +
+NM80211Mode + +nm_access_point_get_mode () +
+guint32 + +nm_access_point_get_max_bitrate () +
+guint8 + +nm_access_point_get_strength () +
+GSList * + +nm_access_point_filter_connections () +
+gboolean + +nm_access_point_connection_valid () +
const char * + +nm_access_point_get_hw_address ()
-
-
-

nm_access_point_get_flags ()

-
NM80211ApFlags      nm_access_point_get_flags           (NMAccessPoint *ap);
-

-Gets the flags of the access point. -

-
+
+

Properties

+
--+++ - - + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + +

ap :

a NMAccessPoint - +gchar *bssidRead
guintflagsRead
guintfrequencyRead
+gchar *hw-addressRead
guintmax-bitrateRead

Returns :

the flagsguintmodeRead
guintrsn-flagsRead
+NMSsid *ssidRead
gucharstrengthRead
guintwpa-flagsRead
-
-
-

nm_access_point_get_wpa_flags ()

-
NM80211ApSecurityFlags nm_access_point_get_wpa_flags    (NMAccessPoint *ap);
-

-Gets the WPA (version 1) flags of the access point. -

-
+
+

Types and Values

+
--++ - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + +

ap :

a NMAccessPoint -#defineNM_ACCESS_POINT_FLAGS
#defineNM_ACCESS_POINT_WPA_FLAGS
#defineNM_ACCESS_POINT_RSN_FLAGS
#defineNM_ACCESS_POINT_SSID
#defineNM_ACCESS_POINT_BSSID
#defineNM_ACCESS_POINT_FREQUENCY
#defineNM_ACCESS_POINT_MODE

Returns :

the WPA flags#defineNM_ACCESS_POINT_MAX_BITRATE
#defineNM_ACCESS_POINT_STRENGTH
#defineNM_ACCESS_POINT_HW_ADDRESS
-
-
-

nm_access_point_get_rsn_flags ()

-
NM80211ApSecurityFlags nm_access_point_get_rsn_flags    (NMAccessPoint *ap);
+
+

Object Hierarchy

+
    GObject
+    ╰── NMObject
+        ╰── NMAccessPoint
+
+
+
+

Description

-Gets the RSN (Robust Secure Network, ie WPA version 2) flags of the access -point.

-
+ +
+

Functions

+
+

nm_access_point_new ()

+
GObject *
+nm_access_point_new (DBusGConnection *connection,
+                     const char *path);
+

Creates a new NMAccessPoint.

+
+

Parameters

+
--+++ - - + + + - - + + +

ap :

a NMAccessPoint -

connection

the DBusGConnection

 

Returns :

the RSN flags

path

the DBusobject path of the access point

 
+
+

Returns

+

a new access point.

+

[transfer full]

+
+
-

nm_access_point_get_ssid ()

-
const GByteArray *  nm_access_point_get_ssid            (NMAccessPoint *ap);
-

-Gets the SSID of the access point. -

-
+

nm_access_point_get_flags ()

+
NM80211ApFlags
+nm_access_point_get_flags (NMAccessPoint *ap);
+

Gets the flags of the access point.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

ap :

a NMAccessPoint -

Returns :

the GByteArray containing the SSID. This is the internal copy used by the -access point, and must not be modified.

ap

a NMAccessPoint

 
+
+

Returns

+

the flags

+

+
+
-

nm_access_point_get_bssid ()

-
const char *        nm_access_point_get_bssid           (NMAccessPoint *ap);
-

-Gets the Basic Service Set ID (BSSID) of the WiFi access point. -

-
+

nm_access_point_get_wpa_flags ()

+
NM80211ApSecurityFlags
+nm_access_point_get_wpa_flags (NMAccessPoint *ap);
+

Gets the WPA (version 1) flags of the access point.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

ap :

a NMAccessPoint -

Returns :

the BSSID of the access point. This is an internal string and must -not be modified or freed.

ap

a NMAccessPoint

 
+
+

Returns

+

the WPA flags

+

+
+
-

nm_access_point_get_frequency ()

-
guint32             nm_access_point_get_frequency       (NMAccessPoint *ap);
-

-Gets the frequency of the access point. -

-
+

nm_access_point_get_rsn_flags ()

+
NM80211ApSecurityFlags
+nm_access_point_get_rsn_flags (NMAccessPoint *ap);
+

Gets the RSN (Robust Secure Network, ie WPA version 2) flags of the access +point.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

ap :

a NMAccessPoint -

Returns :

the frequency

ap

a NMAccessPoint

 
+
+

Returns

+

the RSN flags

+

+
+
-

nm_access_point_get_mode ()

-
NM80211Mode         nm_access_point_get_mode            (NMAccessPoint *ap);
-

-Gets the mode of the access point. -

-
+

nm_access_point_get_ssid ()

+
const GByteArray *
+nm_access_point_get_ssid (NMAccessPoint *ap);
+

Gets the SSID of the access point.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

ap :

a NMAccessPoint -

Returns :

the mode

ap

a NMAccessPoint

 
+
+

Returns

+

the GByteArray containing the SSID. This is the internal copy used by the +access point, and must not be modified.

+

+
+
-

nm_access_point_get_max_bitrate ()

-
guint32             nm_access_point_get_max_bitrate     (NMAccessPoint *ap);
-

-Gets the maximum bit rate of the access point. -

-
+

nm_access_point_get_bssid ()

+
const char *
+nm_access_point_get_bssid (NMAccessPoint *ap);
+

Gets the Basic Service Set ID (BSSID) of the WiFi access point.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

ap :

a NMAccessPoint -

Returns :

the maximum bit rate

ap

a NMAccessPoint

 
+
+

Returns

+

the BSSID of the access point. This is an internal string and must +not be modified or freed.

+

+
+
-

nm_access_point_get_strength ()

-
guint8              nm_access_point_get_strength        (NMAccessPoint *ap);
-

-Gets the current signal strength of the access point. -

-
+

nm_access_point_get_frequency ()

+
guint32
+nm_access_point_get_frequency (NMAccessPoint *ap);
+

Gets the frequency of the access point.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

ap :

a NMAccessPoint -

Returns :

the signal strength

ap

a NMAccessPoint

 
+
+

Returns

+

the frequency

+

+
+
-

nm_access_point_filter_connections ()

-
GSList *            nm_access_point_filter_connections  (NMAccessPoint *ap,
-                                                         const GSList *connections);
-

-Filters a given list of connections for a given NMAccessPoint object and +

nm_access_point_get_mode ()

+
NM80211Mode
+nm_access_point_get_mode (NMAccessPoint *ap);
+

Gets the mode of the access point.

+
+

Parameters

+
+++++ + + + + + +

ap

a NMAccessPoint

 
+
+
+

Returns

+

the mode

+

+
+
+
+
+

nm_access_point_get_max_bitrate ()

+
guint32
+nm_access_point_get_max_bitrate (NMAccessPoint *ap);
+

Gets the maximum bit rate of the access point.

+
+

Parameters

+
+++++ + + + + + +

ap

a NMAccessPoint

 
+
+
+

Returns

+

the maximum bit rate

+

+
+
+
+
+

nm_access_point_get_strength ()

+
guint8
+nm_access_point_get_strength (NMAccessPoint *ap);
+

Gets the current signal strength of the access point.

+
+

Parameters

+
+++++ + + + + + +

ap

a NMAccessPoint

 
+
+
+

Returns

+

the signal strength

+

+
+
+
+
+

nm_access_point_filter_connections ()

+
GSList *
+nm_access_point_filter_connections (NMAccessPoint *ap,
+                                    const GSList *connections);
+

Filters a given list of connections for a given NMAccessPoint object and return connections which may be activated with the access point. Any -returned connections will match the ap's SSID and (if given) BSSID and -other attributes like security settings, channel, etc. -

-

-To obtain the list of connections that are compatible with this access point, -use nm_remote_settings_list_connections() and then filter the returned list -for a given NMDevice using nm_device_filter_connections() and finally -filter that list with this function. -

-
+returned connections will match the ap +'s SSID and (if given) BSSID and +other attributes like security settings, channel, etc.

+

To obtain the list of connections that are compatible with this access point, +use nm_remote_settings_list_connections() and then filter the returned list +for a given NMDevice using nm_device_filter_connections() and finally +filter that list with this function.

+
+

Parameters

+
--+++ - - + + + - - - - - - + + +

ap :

an NMAccessPoint to filter connections for

ap

an NMAccessPoint to filter connections for

 

connections :

a list of -NMConnection objects to filter. [element-type NetworkManager.Connection] -

Returns :

a -list of NMConnection objects that could be activated with the given ap. -The elements of the list are owned by their creator and should not be freed -by the caller, but the returned list itself is owned by the caller and should -be freed with g_slist_free() when it is no longer required. [transfer container][element-type NetworkManager.Connection] -

connections

a list of +NMConnection objects to filter.

[element-type NetworkManager.Connection]
+
+

Returns

+

a +list of NMConnection objects that could be activated with the given ap +. +The elements of the list are owned by their creator and should not be freed +by the caller, but the returned list itself is owned by the caller and should +be freed with g_slist_free() when it is no longer required.

+

[transfer container][element-type NetworkManager.Connection]

+
+
-

nm_access_point_connection_valid ()

-
gboolean            nm_access_point_connection_valid    (NMAccessPoint *ap,
-                                                         NMConnection *connection);
-

-Validates a given connection against a given WiFi access point to ensure that +

nm_access_point_connection_valid ()

+
gboolean
+nm_access_point_connection_valid (NMAccessPoint *ap,
+                                  NMConnection *connection);
+

Validates a given connection against a given WiFi access point to ensure that the connection may be activated with that AP. The connection must match the -ap's SSID, (if given) BSSID, and other attributes like security settings, -channel, band, etc. -

-
+ap +'s SSID, (if given) BSSID, and other attributes like security settings, +channel, band, etc.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + +

ap :

an NMAccessPoint to validate connection against

connection :

an NMConnection to validate against ap -

ap

an NMAccessPoint to validate connection +against

 

Returns :

 -TRUE if the connection may be activated with this WiFi AP, -FALSE if it cannot be.

connection

an NMConnection to validate against ap +

 
+
+

Returns

+

TRUE if the connection may be activated with this WiFi AP, +FALSE if it cannot be.

+

+
+
-

nm_access_point_get_hw_address ()

-
const char *        nm_access_point_get_hw_address      (NMAccessPoint *ap);
-
-

Warning

-

nm_access_point_get_hw_address has been deprecated since version 0.9 and should not be used in newly-written code. Use nm_access_point_get_bssid() instead.

+

nm_access_point_get_hw_address ()

+
const char *
+nm_access_point_get_hw_address (NMAccessPoint *ap);
+
+

nm_access_point_get_hw_address has been deprecated since version 0.9 and should not be used in newly-written code.

+

Use nm_access_point_get_bssid() instead.

-

-Gets the hardware (MAC) address of the access point. -

-
+

Gets the hardware (MAC) address of the access point.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

ap :

a NMAccessPoint -

Returns :

the hardware address of the access point. This is the internal string used by the -access point and must not be modified.

ap

a NMAccessPoint

 
+
+

Returns

+

the hardware address of the access point. This is the internal string used by the +access point and must not be modified.

+

+
+
-

Property Details

+

Types and Values

-

The "bssid" property

-
  "bssid"                    gchar*                : Read
+

NM_ACCESS_POINT_FLAGS

+
#define NM_ACCESS_POINT_FLAGS       "flags"
+

-The BSSID of the access point.

-

Default value: NULL

-

The "flags" property

-
  "flags"                    guint                 : Read
+

NM_ACCESS_POINT_WPA_FLAGS

+
#define NM_ACCESS_POINT_WPA_FLAGS   "wpa-flags"
+

-The flags of the access point.

-

Allowed values: <= 1

-

Default value: 0

-

The "frequency" property

-
  "frequency"                guint                 : Read
+

NM_ACCESS_POINT_RSN_FLAGS

+
#define NM_ACCESS_POINT_RSN_FLAGS   "rsn-flags"
+

-The frequency of the access point.

-

Allowed values: <= 10000

-

Default value: 0

-

The "hw-address" property

-
  "hw-address"               gchar*                : Read
+

NM_ACCESS_POINT_SSID

+
#define NM_ACCESS_POINT_SSID        "ssid"
+

-The hardware address of the access point.

-

Default value: NULL

-

The "max-bitrate" property

-
  "max-bitrate"              guint                 : Read
+

NM_ACCESS_POINT_BSSID

+
#define NM_ACCESS_POINT_BSSID       "bssid"
+

-The maximum bit rate of the access point.

-

Default value: 0

-

The "mode" property

-
  "mode"                     guint                 : Read
+

NM_ACCESS_POINT_FREQUENCY

+
#define NM_ACCESS_POINT_FREQUENCY   "frequency"
+

-The mode of the access point; either "infrastructure" (a central -coordinator of the wireless network allowing clients to connect) or -"ad-hoc" (a network with no central controller).

-

Allowed values: [1,2]

-

Default value: 2

-

The "rsn-flags" property

-
  "rsn-flags"                guint                 : Read
+

NM_ACCESS_POINT_MODE

+
#define NM_ACCESS_POINT_MODE        "mode"
+

-The RSN flags of the access point.

-

Default value: 0

-

The "ssid" property

-
  "ssid"                     NMSsid*               : Read
+

NM_ACCESS_POINT_MAX_BITRATE

+
#define NM_ACCESS_POINT_MAX_BITRATE "max-bitrate"
+

-The SSID of the access point.

-

The "strength" property

-
  "strength"                 guchar                : Read
+

NM_ACCESS_POINT_STRENGTH

+
#define NM_ACCESS_POINT_STRENGTH    "strength"
+

-The current signal strength of the access point.

-

Default value: 0

-

The "wpa-flags" property

-
  "wpa-flags"                guint                 : Read
+

NM_ACCESS_POINT_HW_ADDRESS

+
#define NM_ACCESS_POINT_HW_ADDRESS  "hw-address"
+

-The WPA flags of the access point.

+
+
+
+

Property Details

+
+

The “bssid” property

+
  “bssid”                    gchar *
+

BSSID.

+

Flags: Read

+

Default value: NULL

+
+
+
+

The “flags” property

+
  “flags”                    guint
+

Flags.

+

Flags: Read

+

Allowed values: <= 1

+

Default value: 0

+
+
+
+

The “frequency” property

+
  “frequency”                guint
+

Frequency.

+

Flags: Read

+

Allowed values: <= 10000

+

Default value: 0

+
+
+
+

The “hw-address” property

+
  “hw-address”               gchar *
+

Hardware MAC address.

+

Flags: Read

+

Default value: NULL

+
+
+
+

The “max-bitrate” property

+
  “max-bitrate”              guint
+

Max Bitrate.

+

Flags: Read

+

Default value: 0

+
+
+
+

The “mode” property

+
  “mode”                     guint
+

Mode.

+

Flags: Read

+

Allowed values: [1,2]

+

Default value: 2

+
+
+
+

The “rsn-flags” property

+
  “rsn-flags”                guint
+

RSN Flags.

+

Flags: Read

+

Default value: 0

+
+
+
+

The “ssid” property

+
  “ssid”                     NMSsid *
+

SSID.

+

Flags: Read

+
+
+
+

The “strength” property

+
  “strength”                 guchar
+

Strength.

+

Flags: Read

+

Default value: 0

+
+
+
+

The “wpa-flags” property

+
  “wpa-flags”                guint
+

WPA Flags.

+

Flags: Read

Default value: 0

- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20
\ No newline at end of file diff --git a/docs/libnm-glib/html/NMActiveConnection.html b/docs/libnm-glib/html/NMActiveConnection.html index 9cb406f4..ba775eab 100644 --- a/docs/libnm-glib/html/NMActiveConnection.html +++ b/docs/libnm-glib/html/NMActiveConnection.html @@ -2,36 +2,28 @@ -NMActiveConnection +libnm-glib Reference Manual: NMActiveConnection - + - - - - - - - - - - + + + + + + +
@@ -39,59 +31,192 @@

NMActiveConnection

NMActiveConnection

- +
-
-

Synopsis

-
#define             NM_ACTIVE_CONNECTION_CONNECTION
-#define             NM_ACTIVE_CONNECTION_UUID
-#define             NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT
-#define             NM_ACTIVE_CONNECTION_DEVICES
-#define             NM_ACTIVE_CONNECTION_STATE
-#define             NM_ACTIVE_CONNECTION_DEFAULT
-#define             NM_ACTIVE_CONNECTION_DEFAULT6
-#define             NM_ACTIVE_CONNECTION_MASTER
-                    NMActiveConnection;
-                    NMActiveConnectionClass;
-GObject *           nm_active_connection_new            (DBusGConnection *connection,
-                                                         const char *path);
-const char *        nm_active_connection_get_connection (NMActiveConnection *connection);
-const char *        nm_active_connection_get_uuid       (NMActiveConnection *connection);
-const char *        nm_active_connection_get_specific_object
-                                                        (NMActiveConnection *connection);
-const GPtrArray *   nm_active_connection_get_devices    (NMActiveConnection *connection);
-NMActiveConnectionState nm_active_connection_get_state  (NMActiveConnection *connection);
-gboolean            nm_active_connection_get_default    (NMActiveConnection *connection);
-gboolean            nm_active_connection_get_default6   (NMActiveConnection *connection);
-const char *        nm_active_connection_get_master     (NMActiveConnection *connection);
-
+
+

Functions

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+GObject * + +nm_active_connection_new () +
const char * + +nm_active_connection_get_connection () +
const char * + +nm_active_connection_get_uuid () +
const char * + +nm_active_connection_get_specific_object () +
const GPtrArray * + +nm_active_connection_get_devices () +
+NMActiveConnectionState + +nm_active_connection_get_state () +
+gboolean + +nm_active_connection_get_default () +
+gboolean + +nm_active_connection_get_default6 () +
const char * + +nm_active_connection_get_master () +
-

Object Hierarchy

-
-  GObject
-   +----NMObject
-         +----NMActiveConnection
-               +----NMVPNConnection
-
+

Properties

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+gchar *connectionRead
gbooleandefaultRead
gbooleandefault6Read
+NMObjectArray *devicesRead
+gchar *masterRead
+gchar *specific-objectRead
guintstateRead
+gchar *uuidRead
-

Implemented Interfaces

-

-NMActiveConnection implements - GInitable and GAsyncInitable.

+

Types and Values

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#defineNM_ACTIVE_CONNECTION_CONNECTION
#defineNM_ACTIVE_CONNECTION_UUID
#defineNM_ACTIVE_CONNECTION_SPECIFIC_OBJECT
#defineNM_ACTIVE_CONNECTION_DEVICES
#defineNM_ACTIVE_CONNECTION_STATE
#defineNM_ACTIVE_CONNECTION_DEFAULT
#defineNM_ACTIVE_CONNECTION_DEFAULT6
#defineNM_ACTIVE_CONNECTION_MASTER
-

Properties

-
-  "connection"               gchar*                : Read
-  "default"                  gboolean              : Read
-  "default6"                 gboolean              : Read
-  "devices"                  NMObjectArray*        : Read
-  "master"                   gchar*                : Read
-  "specific-object"          gchar*                : Read
-  "state"                    guint                 : Read
-  "uuid"                     gchar*                : Read
+
Object Hierarchy

+
    GObject
+    ╰── NMObject
+        ╰── NMActiveConnection
+            ╰── NMVPNConnection
@@ -100,413 +225,401 @@ NMActiveConnection implements

-

Details

+

Functions

-

NM_ACTIVE_CONNECTION_CONNECTION

-
#define NM_ACTIVE_CONNECTION_CONNECTION          "connection"
-
-

-

+

nm_active_connection_new ()

+
GObject *
+nm_active_connection_new (DBusGConnection *connection,
+                          const char *path);
+

Creates a new NMActiveConnection.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

connection

the DBusGConnection

 

path

the DBus object path of the device

 
-
-
-

NM_ACTIVE_CONNECTION_UUID

-
#define NM_ACTIVE_CONNECTION_UUID                "uuid"
-
-

-

+
+

Returns

+

a new active connection.

+

[transfer full]

-
-
-

NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT

-
#define NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT     "specific-object"
-
-

-

-

NM_ACTIVE_CONNECTION_DEVICES

-
#define NM_ACTIVE_CONNECTION_DEVICES             "devices"
-
-

-

+

nm_active_connection_get_connection ()

+
const char *
+nm_active_connection_get_connection (NMActiveConnection *connection);
+

Gets the NMConnection's DBus object path.

+
+

Parameters

+
+++++ + + + + + +

connection

a NMActiveConnection

 
+
+
+

Returns

+

the object path of the NMConnection inside of NMActiveConnection. +This is the internal string used by the connection, and must not be modified.

+

-
-
-

NM_ACTIVE_CONNECTION_STATE

-
#define NM_ACTIVE_CONNECTION_STATE               "state"
-
-

-

-

NM_ACTIVE_CONNECTION_DEFAULT

-
#define NM_ACTIVE_CONNECTION_DEFAULT             "default"
-
-

-

+

nm_active_connection_get_uuid ()

+
const char *
+nm_active_connection_get_uuid (NMActiveConnection *connection);
+

Gets the NMConnection's UUID.

+
+

Parameters

+
+++++ + + + + + +

connection

a NMActiveConnection

 
+
+
+

Returns

+

the UUID of the NMConnection that backs the NMActiveConnection. +This is the internal string used by the connection, and must not be modified.

+

+
-

NM_ACTIVE_CONNECTION_DEFAULT6

-
#define NM_ACTIVE_CONNECTION_DEFAULT6            "default6"
-
-

-

+

nm_active_connection_get_specific_object ()

+
const char *
+nm_active_connection_get_specific_object
+                               (NMActiveConnection *connection);
+

Gets the "specific object" used at the activation.

+
+

Parameters

+
+++++ + + + + + +

connection

a NMActiveConnection

 
+
+
+

Returns

+

the specific object's DBus path. This is the internal string used by the +connection, and must not be modified.

+

+
-

NM_ACTIVE_CONNECTION_MASTER

-
#define NM_ACTIVE_CONNECTION_MASTER              "master"
-
-

-

+

nm_active_connection_get_devices ()

+
const GPtrArray *
+nm_active_connection_get_devices (NMActiveConnection *connection);
+

Gets the NMDevices used for the active connections.

+
+

Parameters

+
+++++ + + + + + +

connection

a NMActiveConnection

 
+
+
+

Returns

+

the GPtrArray containing NMDevices. +This is the internal copy used by the connection, and must not be modified.

+

[element-type NMClient.Device]

+
-

NMActiveConnection

-
typedef struct _NMActiveConnection NMActiveConnection;
-

-

+

nm_active_connection_get_state ()

+
NMActiveConnectionState
+nm_active_connection_get_state (NMActiveConnection *connection);
+

Gets the active connection's state.

+
+

Parameters

+
+++++ + + + + + +

connection

a NMActiveConnection

 
+
+
+

Returns

+

the state

+

+
-

NMActiveConnectionClass

-
typedef struct {
-	NMObjectClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMActiveConnectionClass;
-
-

-

+

nm_active_connection_get_default ()

+
gboolean
+nm_active_connection_get_default (NMActiveConnection *connection);
+

Whether the active connection is the default IPv4 one (that is, is used for +the default IPv4 route and DNS information).

+
+

Parameters

+
+++++ + + + + + +

connection

a NMActiveConnection

 
+
+
+

Returns

+

TRUE if the active connection is the default IPv4 connection

+

+
-

nm_active_connection_new ()

-
GObject *           nm_active_connection_new            (DBusGConnection *connection,
-                                                         const char *path);
-

-Creates a new NMActiveConnection. -

-
+

nm_active_connection_get_default6 ()

+
gboolean
+nm_active_connection_get_default6 (NMActiveConnection *connection);
+

Whether the active connection is the default IPv6 one (that is, is used for +the default IPv6 route and DNS information).

+
+

Parameters

+
--+++ - - - - - - - - - - - - - - + + + + +

connection :

the DBusGConnection -

path :

the DBus object path of the device

Returns :

a new active connection. [transfer full] -

connection

a NMActiveConnection

 
+
+

Returns

+

TRUE if the active connection is the default IPv6 connection

+

+
+
-

nm_active_connection_get_connection ()

-
const char *        nm_active_connection_get_connection (NMActiveConnection *connection);
-

-Gets the NMConnection's DBus object path. -

-
+

nm_active_connection_get_master ()

+
const char *
+nm_active_connection_get_master (NMActiveConnection *connection);
+

Gets the path to the master NMDevice of the connection.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

connection :

a NMActiveConnection -

Returns :

the object path of the NMConnection inside of NMActiveConnection. -This is the internal string used by the connection, and must not be modified.

connection

a NMActiveConnection

 
+
+

Returns

+

the path of the master NMDevice of the NMActiveConnection. +This is the internal string used by the connection, and must not be modified.

+

+
+
+
+
+

Types and Values

+
+

NM_ACTIVE_CONNECTION_CONNECTION

+
#define NM_ACTIVE_CONNECTION_CONNECTION          "connection"
+
+

+

+
-

nm_active_connection_get_uuid ()

-
const char *        nm_active_connection_get_uuid       (NMActiveConnection *connection);
+

NM_ACTIVE_CONNECTION_UUID

+
#define NM_ACTIVE_CONNECTION_UUID                "uuid"
+

-Gets the NMConnection's UUID.

-
---- - - - - - - - - - - -

connection :

a NMActiveConnection -

Returns :

the UUID of the NMConnection that backs the NMActiveConnection. -This is the internal string used by the connection, and must not be modified.
-

nm_active_connection_get_specific_object ()

-
const char *        nm_active_connection_get_specific_object
-                                                        (NMActiveConnection *connection);
+

NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT

+
#define NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT     "specific-object"
+

-Gets the "specific object" used at the activation.

-
---- - - - - - - - - - - -

connection :

a NMActiveConnection -

Returns :

the specific object's DBus path. This is the internal string used by the -connection, and must not be modified.
-

nm_active_connection_get_devices ()

-
const GPtrArray *   nm_active_connection_get_devices    (NMActiveConnection *connection);
+

NM_ACTIVE_CONNECTION_DEVICES

+
#define NM_ACTIVE_CONNECTION_DEVICES             "devices"
+

-Gets the NMDevices used for the active connections.

-
---- - - - - - - - - - - -

connection :

a NMActiveConnection -

Returns :

the GPtrArray containing NMDevices. -This is the internal copy used by the connection, and must not be modified. [element-type NMClient.Device] -
-

nm_active_connection_get_state ()

-
NMActiveConnectionState nm_active_connection_get_state  (NMActiveConnection *connection);
+

NM_ACTIVE_CONNECTION_STATE

+
#define NM_ACTIVE_CONNECTION_STATE               "state"
+

-Gets the active connection's state.

-
---- - - - - - - - - - - -

connection :

a NMActiveConnection -

Returns :

the state
-

nm_active_connection_get_default ()

-
gboolean            nm_active_connection_get_default    (NMActiveConnection *connection);
+

NM_ACTIVE_CONNECTION_DEFAULT

+
#define NM_ACTIVE_CONNECTION_DEFAULT             "default"
+

-Whether the active connection is the default IPv4 one (that is, is used for -the default IPv4 route and DNS information).

-
---- - - - - - - - - - - -

connection :

a NMActiveConnection -

Returns :

 -TRUE if the active connection is the default IPv4 connection
-

nm_active_connection_get_default6 ()

-
gboolean            nm_active_connection_get_default6   (NMActiveConnection *connection);
+

NM_ACTIVE_CONNECTION_DEFAULT6

+
#define NM_ACTIVE_CONNECTION_DEFAULT6            "default6"
+

-Whether the active connection is the default IPv6 one (that is, is used for -the default IPv6 route and DNS information).

-
---- - - - - - - - - - - -

connection :

a NMActiveConnection -

Returns :

 -TRUE if the active connection is the default IPv6 connection
-

nm_active_connection_get_master ()

-
const char *        nm_active_connection_get_master     (NMActiveConnection *connection);
+

NM_ACTIVE_CONNECTION_MASTER

+
#define NM_ACTIVE_CONNECTION_MASTER              "master"
+

-Gets the path to the master NMDevice of the connection.

-
---- - - - - - - - - - - -

connection :

a NMActiveConnection -

Returns :

the path of the master NMDevice of the NMActiveConnection. -This is the internal string used by the connection, and must not be modified.

Property Details

-

The "connection" property

-
  "connection"               gchar*                : Read
-

-The connection's path of the active connection. -

+

The “connection” property

+
  “connection”               gchar *
+

Connection.

+

Flags: Read

Default value: NULL

-

The "default" property

-
  "default"                  gboolean              : Read
-

-Whether the active connection is the default IPv4 one. -

+

The “default” property

+
  “default”                  gboolean
+

Is the default IPv4 active connection.

+

Flags: Read

Default value: FALSE

-

The "default6" property

-
  "default6"                 gboolean              : Read
-

-Whether the active connection is the default IPv6 one. -

+

The “default6” property

+
  “default6”                 gboolean
+

Is the default IPv6 active connection.

+

Flags: Read

Default value: FALSE

-

The "devices" property

-
  "devices"                  NMObjectArray*        : Read
+

The “devices” property

+
  “devices”                  NMObjectArray *

Devices.

+

Flags: Read

-

The "master" property

-
  "master"                   gchar*                : Read
-

-The path of the master device if one exists. -

+

The “master” property

+
  “master”                   gchar *
+

Path of the master device.

+

Flags: Read

Default value: NULL

-

The "specific-object" property

-
  "specific-object"          gchar*                : Read
-

-The specific object's path of the active connection. -

+

The “specific-object” property

+
  “specific-object”          gchar *
+

Specific object.

+

Flags: Read

Default value: NULL

-

The "state" property

-
  "state"                    guint                 : Read
-

-The state of the active connection. -

+

The “state” property

+
  “state”                    guint
+

State.

+

Flags: Read

Allowed values: <= 3

Default value: 0

-

The "uuid" property

-
  "uuid"                     gchar*                : Read
-

-The active connection's UUID -

+

The “uuid” property

+
  “uuid”                     gchar *
+

UUID.

+

Flags: Read

Default value: NULL

- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20
\ No newline at end of file diff --git a/docs/libnm-glib/html/NMClient.html b/docs/libnm-glib/html/NMClient.html index 18eddaf5..842183d9 100644 --- a/docs/libnm-glib/html/NMClient.html +++ b/docs/libnm-glib/html/NMClient.html @@ -2,38 +2,29 @@ -NMClient +libnm-glib Reference Manual: NMClient - + - - - - - - - - - - + + + + + + +
@@ -41,1818 +32,2150 @@

NMClient

NMClient

- +
-
-

Synopsis

-
#define             NM_CLIENT_VERSION
-#define             NM_CLIENT_STATE
-#define             NM_CLIENT_MANAGER_RUNNING
-#define             NM_CLIENT_NETWORKING_ENABLED
-#define             NM_CLIENT_WIRELESS_ENABLED
-#define             NM_CLIENT_WIRELESS_HARDWARE_ENABLED
-#define             NM_CLIENT_WWAN_ENABLED
-#define             NM_CLIENT_WWAN_HARDWARE_ENABLED
-#define             NM_CLIENT_WIMAX_ENABLED
-#define             NM_CLIENT_WIMAX_HARDWARE_ENABLED
-#define             NM_CLIENT_ACTIVE_CONNECTIONS
-#define             NM_CLIENT_CONNECTIVITY
-#define             NM_CLIENT_PRIMARY_CONNECTION
-#define             NM_CLIENT_ACTIVATING_CONNECTION
-enum                NMClientPermission;
-enum                NMClientPermissionResult;
-                    NMClient;
-                    NMClientClass;
-NMClient *          nm_client_new                       (void);
-void                nm_client_new_async                 (GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
-NMClient *          nm_client_new_finish                (GAsyncResult *result,
-                                                         GError **error);
-const GPtrArray *   nm_client_get_devices               (NMClient *client);
-NMDevice *          nm_client_get_device_by_path        (NMClient *client,
-                                                         const char *object_path);
-NMDevice *          nm_client_get_device_by_iface       (NMClient *client,
-                                                         const char *iface);
-void                (*NMClientActivateFn)               (NMClient *client,
-                                                         NMActiveConnection *active_connection,
-                                                         GError *error,
-                                                         gpointer user_data);
-void                nm_client_activate_connection       (NMClient *client,
-                                                         NMConnection *connection,
-                                                         NMDevice *device,
-                                                         const char *specific_object,
-                                                         NMClientActivateFn callback,
-                                                         gpointer user_data);
-void                (*NMClientAddActivateFn)            (NMClient *client,
-                                                         NMActiveConnection *connection,
-                                                         const char *new_connection_path,
-                                                         GError *error,
-                                                         gpointer user_data);
-void                nm_client_add_and_activate_connection
-                                                        (NMClient *client,
-                                                         NMConnection *partial,
-                                                         NMDevice *device,
-                                                         const char *specific_object,
-                                                         NMClientAddActivateFn callback,
-                                                         gpointer user_data);
-void                nm_client_deactivate_connection     (NMClient *client,
-                                                         NMActiveConnection *active);
-gboolean            nm_client_networking_get_enabled    (NMClient *client);
-void                nm_client_networking_set_enabled    (NMClient *client,
-                                                         gboolean enabled);
-gboolean            nm_client_wireless_get_enabled      (NMClient *client);
-void                nm_client_wireless_set_enabled      (NMClient *client,
-                                                         gboolean enabled);
-gboolean            nm_client_wireless_hardware_get_enabled
-                                                        (NMClient *client);
-gboolean            nm_client_wwan_get_enabled          (NMClient *client);
-void                nm_client_wwan_set_enabled          (NMClient *client,
-                                                         gboolean enabled);
-gboolean            nm_client_wwan_hardware_get_enabled (NMClient *client);
-gboolean            nm_client_wimax_get_enabled         (NMClient *client);
-void                nm_client_wimax_set_enabled         (NMClient *client,
-                                                         gboolean enabled);
-gboolean            nm_client_wimax_hardware_get_enabled
-                                                        (NMClient *client);
-const char *        nm_client_get_version               (NMClient *client);
-NMState             nm_client_get_state                 (NMClient *client);
-gboolean            nm_client_get_manager_running       (NMClient *client);
-const GPtrArray *   nm_client_get_active_connections    (NMClient *client);
-void                nm_client_sleep                     (NMClient *client,
-                                                         gboolean sleep_);
-NMClientPermissionResult nm_client_get_permission_result
-                                                        (NMClient *client,
-                                                         NMClientPermission permission);
-gboolean            nm_client_get_logging               (NMClient *client,
-                                                         char **level,
-                                                         char **domains,
-                                                         GError **error);
-gboolean            nm_client_set_logging               (NMClient *client,
-                                                         const char *level,
-                                                         const char *domains,
-                                                         GError **error);
-NMConnectivityState nm_client_get_connectivity          (NMClient *client);
-NMConnectivityState nm_client_check_connectivity        (NMClient *client,
-                                                         GCancellable *cancellable,
-                                                         GError **error);
-void                nm_client_check_connectivity_async  (NMClient *client,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
-NMConnectivityState nm_client_check_connectivity_finish (NMClient *client,
-                                                         GAsyncResult *result,
-                                                         GError **error);
-NMActiveConnection * nm_client_get_primary_connection   (NMClient *client);
-NMActiveConnection * nm_client_get_activating_connection
-                                                        (NMClient *client);
-
-
-
-

Object Hierarchy

-
-  GObject
-   +----NMObject
-         +----NMClient
-
-
-

Implemented Interfaces

-

-NMClient implements - GInitable and GAsyncInitable.

+

Functions

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+NMClient * + +nm_client_new () +
+void + +nm_client_new_async () +
+NMClient * + +nm_client_new_finish () +
const GPtrArray * + +nm_client_get_devices () +
+NMDevice * + +nm_client_get_device_by_path () +
+NMDevice * + +nm_client_get_device_by_iface () +
+void + +(*NMClientActivateFn) () +
+void + +nm_client_activate_connection () +
+void + +(*NMClientAddActivateFn) () +
+void + +nm_client_add_and_activate_connection () +
+void + +nm_client_deactivate_connection () +
+gboolean + +nm_client_networking_get_enabled () +
+void + +nm_client_networking_set_enabled () +
+gboolean + +nm_client_wireless_get_enabled () +
+void + +nm_client_wireless_set_enabled () +
+gboolean + +nm_client_wireless_hardware_get_enabled () +
+gboolean + +nm_client_wwan_get_enabled () +
+void + +nm_client_wwan_set_enabled () +
+gboolean + +nm_client_wwan_hardware_get_enabled () +
+gboolean + +nm_client_wimax_get_enabled () +
+void + +nm_client_wimax_set_enabled () +
+gboolean + +nm_client_wimax_hardware_get_enabled () +
const char * + +nm_client_get_version () +
+NMState + +nm_client_get_state () +
+gboolean + +nm_client_get_manager_running () +
const GPtrArray * + +nm_client_get_active_connections () +
+void + +nm_client_sleep () +
+NMClientPermissionResult + +nm_client_get_permission_result () +
+gboolean + +nm_client_get_logging () +
+gboolean + +nm_client_set_logging () +
+NMConnectivityState + +nm_client_get_connectivity () +
+NMConnectivityState + +nm_client_check_connectivity () +
+void + +nm_client_check_connectivity_async () +
+NMConnectivityState + +nm_client_check_connectivity_finish () +
+NMActiveConnection * + +nm_client_get_primary_connection () +
+NMActiveConnection * + +nm_client_get_activating_connection () +

Properties

-
-  "activating-connection"    NMActiveConnection*   : Read
-  "active-connections"       NMObjectArray*        : Read
-  "connectivity"             guint                 : Read
-  "manager-running"          gboolean              : Read
-  "networking-enabled"       gboolean              : Read / Write
-  "primary-connection"       NMActiveConnection*   : Read
-  "state"                    guint                 : Read
-  "version"                  gchar*                : Read
-  "wimax-enabled"            gboolean              : Read / Write
-  "wimax-hardware-enabled"   gboolean              : Read
-  "wireless-enabled"         gboolean              : Read / Write
-  "wireless-hardware-enabled" gboolean              : Read
-  "wwan-enabled"             gboolean              : Read / Write
-  "wwan-hardware-enabled"    gboolean              : Read
-
+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+NMActiveConnection *activating-connectionRead
+NMObjectArray *active-connectionsRead
guintconnectivityRead
gbooleanmanager-runningRead
gbooleannetworking-enabledRead / Write
+NMActiveConnection *primary-connectionRead
guintstateRead
+gchar *versionRead
gbooleanwimax-enabledRead / Write
gbooleanwimax-hardware-enabledRead
gbooleanwireless-enabledRead / Write
gbooleanwireless-hardware-enabledRead
gbooleanwwan-enabledRead / Write
gbooleanwwan-hardware-enabledRead

Signals

-
-  "device-added"                                   : Run First
-  "device-removed"                                 : Run First
-  "permission-changed"                             : Run First
-
+
+++++ + + + + + + + + + + + + + + + + + +
voiddevice-addedRun First
voiddevice-removedRun First
voidpermission-changedRun First
-

Description

-

-

+

Types and Values

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#defineNM_CLIENT_VERSION
#defineNM_CLIENT_STATE
#defineNM_CLIENT_MANAGER_RUNNING
#defineNM_CLIENT_NETWORKING_ENABLED
#defineNM_CLIENT_WIRELESS_ENABLED
#defineNM_CLIENT_WIRELESS_HARDWARE_ENABLED
#defineNM_CLIENT_WWAN_ENABLED
#defineNM_CLIENT_WWAN_HARDWARE_ENABLED
#defineNM_CLIENT_WIMAX_ENABLED
#defineNM_CLIENT_WIMAX_HARDWARE_ENABLED
#defineNM_CLIENT_ACTIVE_CONNECTIONS
#defineNM_CLIENT_CONNECTIVITY
#defineNM_CLIENT_PRIMARY_CONNECTION
#defineNM_CLIENT_ACTIVATING_CONNECTION
enumNMClientPermission
enumNMClientPermissionResult
-

Details

-
-

NM_CLIENT_VERSION

-
#define NM_CLIENT_VERSION "version"
-
-

-

-
-
-
-

NM_CLIENT_STATE

-
#define NM_CLIENT_STATE "state"
-
-

-

-
-
-
-

NM_CLIENT_MANAGER_RUNNING

-
#define NM_CLIENT_MANAGER_RUNNING "manager-running"
-
-

-

-
-
-
-

NM_CLIENT_NETWORKING_ENABLED

-
#define NM_CLIENT_NETWORKING_ENABLED "networking-enabled"
+
Object Hierarchy

+
    GObject
+    ╰── NMObject
+        ╰── NMClient
 

-

-
-
-
-

NM_CLIENT_WIRELESS_ENABLED

-
#define NM_CLIENT_WIRELESS_ENABLED "wireless-enabled"
-
-

-

-
-
-
-

NM_CLIENT_WIRELESS_HARDWARE_ENABLED

-
#define NM_CLIENT_WIRELESS_HARDWARE_ENABLED "wireless-hardware-enabled"
-
+
+

Description

-
-
-

NM_CLIENT_WWAN_ENABLED

-
#define NM_CLIENT_WWAN_ENABLED "wwan-enabled"
-
-

-

+
+

Functions

+
+

nm_client_new ()

+
NMClient *
+nm_client_new (void);
+

Creates a new NMClient.

+

Note that this will do blocking D-Bus calls to initialize the +client. You can use nm_client_new_async() if you want to avoid +that.

+

NOTE: NMClient provides information about devices and a mechanism to +control them. To access and modify network configuration data, use the +NMRemoteSettings object.

+
+

Returns

+

a new NMClient

+

-
-
-

NM_CLIENT_WWAN_HARDWARE_ENABLED

-
#define NM_CLIENT_WWAN_HARDWARE_ENABLED "wwan-hardware-enabled"
-
-

-

-

NM_CLIENT_WIMAX_ENABLED

-
#define NM_CLIENT_WIMAX_ENABLED "wimax-enabled"
-
-

-

+

nm_client_new_async ()

+
void
+nm_client_new_async (GCancellable *cancellable,
+                     GAsyncReadyCallback callback,
+                     gpointer user_data);
+

Creates a new NMClient and begins asynchronously initializing it. +callback + will be called when it is done; use +nm_client_new_finish() to get the result.

+

NOTE: NMClient provides information about devices and a mechanism to +control them. To access and modify network configuration data, use the +NMRemoteSettings object.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

cancellable

a GCancellable, or NULL

 

callback

callback to call when the client is created

 

user_data

data for callback +

 
+
-

NM_CLIENT_WIMAX_HARDWARE_ENABLED

-
#define NM_CLIENT_WIMAX_HARDWARE_ENABLED "wimax-hardware-enabled"
-
-

-

+

nm_client_new_finish ()

+
NMClient *
+nm_client_new_finish (GAsyncResult *result,
+                      GError **error);
+

Gets the result of an nm_client_new_async() call.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

result

a GAsyncResult

 

error

location for a GError, or NULL

 
+
+
+

Returns

+

a new NMClient, or NULL on error

+

+
-

NM_CLIENT_ACTIVE_CONNECTIONS

-
#define NM_CLIENT_ACTIVE_CONNECTIONS "active-connections"
-
-

-

+

nm_client_get_devices ()

+
const GPtrArray *
+nm_client_get_devices (NMClient *client);
+

Gets all the known network devices. Use nm_device_get_type() or the +NM_IS_DEVICE_XXXX() functions to determine what kind of device member of the +returned array is, and then you may use device-specific methods such as +nm_device_ethernet_get_hw_address().

+
+

Parameters

+
+++++ + + + + + +

client

a NMClient

 
+
+
+

Returns

+

a GPtrArray +containing all the NMDevices. The returned array is owned by the +NMClient object and should not be modified.

+

[transfer none][element-type NMClient.Device]

+
-

NM_CLIENT_CONNECTIVITY

-
#define NM_CLIENT_CONNECTIVITY "connectivity"
-
-

-

+

nm_client_get_device_by_path ()

+
NMDevice *
+nm_client_get_device_by_path (NMClient *client,
+                              const char *object_path);
+

Gets a NMDevice from a NMClient.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

client

a NMClient

 

object_path

the object path to search for

 
+
+
+

Returns

+

the NMDevice for the given object_path +or NULL if none is found.

+

[transfer none]

+
-

NM_CLIENT_PRIMARY_CONNECTION

-
#define NM_CLIENT_PRIMARY_CONNECTION "primary-connection"
-
-

-

+

nm_client_get_device_by_iface ()

+
NMDevice *
+nm_client_get_device_by_iface (NMClient *client,
+                               const char *iface);
+

Gets a NMDevice from a NMClient.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

client

a NMClient

 

iface

the interface name to search for

 
+
+
+

Returns

+

the NMDevice for the given iface +or NULL if none is found.

+

[transfer none]

+
-

NM_CLIENT_ACTIVATING_CONNECTION

-
#define NM_CLIENT_ACTIVATING_CONNECTION "activating-connection"
-
+

NMClientActivateFn ()

+
void
+(*NMClientActivateFn) (NMClient *client,
+                       NMActiveConnection *active_connection,
+                       GError *error,
+                       gpointer user_data);

-

enum NMClientPermission

-
typedef enum {
-	NM_CLIENT_PERMISSION_NONE = 0,
-	NM_CLIENT_PERMISSION_ENABLE_DISABLE_NETWORK = 1,
-	NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIFI = 2,
-	NM_CLIENT_PERMISSION_ENABLE_DISABLE_WWAN = 3,
-	NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIMAX = 4,
-	NM_CLIENT_PERMISSION_SLEEP_WAKE = 5,
-	NM_CLIENT_PERMISSION_NETWORK_CONTROL = 6,
-	NM_CLIENT_PERMISSION_WIFI_SHARE_PROTECTED = 7,
-	NM_CLIENT_PERMISSION_WIFI_SHARE_OPEN = 8,
-	NM_CLIENT_PERMISSION_SETTINGS_MODIFY_SYSTEM = 9,
-	NM_CLIENT_PERMISSION_SETTINGS_MODIFY_OWN = 10,
-	NM_CLIENT_PERMISSION_SETTINGS_MODIFY_HOSTNAME = 11,
-
-	NM_CLIENT_PERMISSION_LAST = NM_CLIENT_PERMISSION_SETTINGS_MODIFY_HOSTNAME
-} NMClientPermission;
-
-

-NMClientPermission values indicate various permissions that NetworkManager -clients can obtain to perform certain tasks on behalf of the current user. -

-
+

nm_client_activate_connection ()

+
void
+nm_client_activate_connection (NMClient *client,
+                               NMConnection *connection,
+                               NMDevice *device,
+                               const char *specific_object,
+                               NMClientActivateFn callback,
+                               gpointer user_data);
+

Starts a connection to a particular network using the configuration settings +from connection + and the network device device +. Certain connection types +also take a "specific object" which is the object path of a connection- +specific object, like an NMAccessPoint for WiFi connections, or an +NMWimaxNsp for WiMAX connections, to which you wish to connect. If the +specific object is not given, NetworkManager can, in some cases, automatically +determine which network to connect to given the settings in connection +.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + + +

NM_CLIENT_PERMISSION_NONE

unknown or no permission -

NM_CLIENT_PERMISSION_ENABLE_DISABLE_NETWORK

controls whether networking - can be globally enabled or disabled -

client

a NMClient

 

NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIFI

controls whether WiFi can be - globally enabled or disabled -

connection

an NMConnection

 

NM_CLIENT_PERMISSION_ENABLE_DISABLE_WWAN

controls whether WWAN (3G) can be - globally enabled or disabled -

device

the NMDevice.

[allow-none]

NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIMAX

controls whether WiMAX can be - globally enabled or disabled -

specific_object

the object path of a connection-type-specific +object this activation should use. This parameter is currently ignored for +wired and mobile broadband connections, and the value of NULL should be used +(ie, no specific object). For WiFi or WiMAX connections, pass the object +path of a NMAccessPoint or NMWimaxNsp owned by device +, which you can +get using nm_object_get_path(), and which will be used to complete the +details of the newly added connection.

[allow-none]

NM_CLIENT_PERMISSION_SLEEP_WAKE

controls whether the client can ask - NetworkManager to sleep and wake -

callback

the function to call when the call is done.

[scope async][allow-none]

NM_CLIENT_PERMISSION_NETWORK_CONTROL

controls whether networking connections - can be started, stopped, and changed -

user_data

user data to pass to the callback function.

[closure]
+
+
+
+
+

NMClientAddActivateFn ()

+
void
+(*NMClientAddActivateFn) (NMClient *client,
+                          NMActiveConnection *connection,
+                          const char *new_connection_path,
+                          GError *error,
+                          gpointer user_data);
+

+

+
+
+
+

nm_client_add_and_activate_connection ()

+
void
+nm_client_add_and_activate_connection (NMClient *client,
+                                       NMConnection *partial,
+                                       NMDevice *device,
+                                       const char *specific_object,
+                                       NMClientAddActivateFn callback,
+                                       gpointer user_data);
+

Adds a new connection using the given details (if any) as a template, +automatically filling in missing settings with the capabilities of the +given device and specific object. The new connection is then activated. +Cannot be used for VPN connections at this time.

+
+

Parameters

+
+++++ + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + +

NM_CLIENT_PERMISSION_WIFI_SHARE_PROTECTED

controls whether a password - protected WiFi hotspot can be created -

client

a NMClient

 

NM_CLIENT_PERMISSION_WIFI_SHARE_OPEN

controls whether an open WiFi hotspot - can be created -

partial

an NMConnection to add; the connection may be +partially filled (or even NULL) and will be completed by NetworkManager +using the given device +and specific_object +before being added.

[allow-none]

NM_CLIENT_PERMISSION_SETTINGS_MODIFY_SYSTEM

controls whether connections - that are available to all users can be modified -

device

the NMDevice

 

NM_CLIENT_PERMISSION_SETTINGS_MODIFY_OWN

controls whether connections - owned by the current user can be modified -

specific_object

the object path of a connection-type-specific +object this activation should use. This parameter is currently ignored for +wired and mobile broadband connections, and the value of NULL should be used +(ie, no specific object). For WiFi or WiMAX connections, pass the object +path of a NMAccessPoint or NMWimaxNsp owned by device +, which you can +get using nm_object_get_path(), and which will be used to complete the +details of the newly added connection.

[allow-none]

NM_CLIENT_PERMISSION_SETTINGS_MODIFY_HOSTNAME

controls whether the - persistent hostname can be changed -

callback

the function to call when the call is done.

[scope async][allow-none]

NM_CLIENT_PERMISSION_LAST

a reserved boundary value -

user_data

user data to pass to the callback function.

[closure]
+
-

enum NMClientPermissionResult

-
typedef enum {
-	NM_CLIENT_PERMISSION_RESULT_UNKNOWN = 0,
-	NM_CLIENT_PERMISSION_RESULT_YES,
-	NM_CLIENT_PERMISSION_RESULT_AUTH,
-	NM_CLIENT_PERMISSION_RESULT_NO
-} NMClientPermissionResult;
-
-

-NMClientPermissionResult values indicate what authorizations and permissions -the user requires to obtain a given NMClientPermission -

-
+

nm_client_deactivate_connection ()

+
void
+nm_client_deactivate_connection (NMClient *client,
+                                 NMActiveConnection *active);
+

Deactivates an active NMActiveConnection.

+
+

Parameters

+
--+++ - - + + + - - + + + + +

NM_CLIENT_PERMISSION_RESULT_UNKNOWN

unknown or no authorization -

client

a NMClient

 

NM_CLIENT_PERMISSION_RESULT_YES

the permission is available -

active

the NMActiveConnection to deactivate

 
+
+
+
+
+

nm_client_networking_get_enabled ()

+
gboolean
+nm_client_networking_get_enabled (NMClient *client);
+

Whether networking is enabled or disabled.

+
+

Parameters

+
+++++ + + + + + +

client

a NMClient

 
+
+
+

Returns

+

TRUE if networking is enabled, FALSE if networking is disabled

+

+
+
+
+
+

nm_client_networking_set_enabled ()

+
void
+nm_client_networking_set_enabled (NMClient *client,
+                                  gboolean enabled);
+

Enables or disables networking. When networking is disabled, all controlled +interfaces are disconnected and deactivated. When networking is enabled, +all controlled interfaces are available for activation.

+
+

Parameters

+
+++++ + - - + + + - - + + +

NM_CLIENT_PERMISSION_RESULT_AUTH

authorization is necessary before the - permission is available -

client

a NMClient

 

NM_CLIENT_PERMISSION_RESULT_NO

permission to perform the operation is - denied by system policy -

enabled

TRUE to set networking enabled, FALSE to set networking disabled

 
+
-

NMClient

-
typedef struct _NMClient NMClient;
-

-

+

nm_client_wireless_get_enabled ()

+
gboolean
+nm_client_wireless_get_enabled (NMClient *client);
+

Determines whether the wireless is enabled.

+
+

Parameters

+
+++++ + + + + + +

client

a NMClient

 
+
+
+

Returns

+

TRUE if wireless is enabled

+

+
-

NMClientClass

-
typedef struct {
-	NMObjectClass parent;
-
-	/* Signals */
-	void (*device_added) (NMClient *client, NMDevice *device);
-	void (*device_removed) (NMClient *client, NMDevice *device);
-	void (*permission_changed) (NMClient *client,
-	                            NMClientPermission permission,
-	                            NMClientPermissionResult result);
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMClientClass;
-
-

-

+

nm_client_wireless_set_enabled ()

+
void
+nm_client_wireless_set_enabled (NMClient *client,
+                                gboolean enabled);
+

Enables or disables wireless devices.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

client

a NMClient

 

enabled

TRUE to enable wireless

 
+
-

nm_client_new ()

-
NMClient *          nm_client_new                       (void);
-

-Creates a new NMClient. -

-

-Note that this will do blocking D-Bus calls to initialize the -client. You can use nm_client_new_async() if you want to avoid -that. -

-

-NOTE: NMClient provides information about devices and a mechanism to -control them. To access and modify network configuration data, use the -NMRemoteSettings object. -

-
+

nm_client_wireless_hardware_get_enabled ()

+
gboolean
+nm_client_wireless_hardware_get_enabled
+                               (NMClient *client);
+

Determines whether the wireless hardware is enabled.

+
+

Parameters

+
--+++ - - + + +

Returns :

a new NMClient -

client

a NMClient

 
+
+

Returns

+

TRUE if the wireless hardware is enabled

+

+
+
-

nm_client_new_async ()

-
void                nm_client_new_async                 (GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
-

-Creates a new NMClient and begins asynchronously initializing it. -callback will be called when it is done; use -nm_client_new_finish() to get the result. -

-

-NOTE: NMClient provides information about devices and a mechanism to -control them. To access and modify network configuration data, use the -NMRemoteSettings object. -

-
+

nm_client_wwan_get_enabled ()

+
gboolean
+nm_client_wwan_get_enabled (NMClient *client);
+

Determines whether WWAN is enabled.

+
+

Parameters

+
+++++ + + + + + +

client

a NMClient

 
+
+
+

Returns

+

TRUE if WWAN is enabled

+

+
+
+
+
+

nm_client_wwan_set_enabled ()

+
void
+nm_client_wwan_set_enabled (NMClient *client,
+                            gboolean enabled);
+

Enables or disables WWAN devices.

+
+

Parameters

+
--+++ - - + + + - - + + + + +

cancellable :

a GCancellable, or NULL -

client

a NMClient

 

callback :

callback to call when the client is created

enabled

TRUE to enable WWAN

 
+
+
+
+
+

nm_client_wwan_hardware_get_enabled ()

+
gboolean
+nm_client_wwan_hardware_get_enabled (NMClient *client);
+

Determines whether the WWAN hardware is enabled.

+
+

Parameters

+
+++++ + + + + + +

client

a NMClient

 
+
+
+

Returns

+

TRUE if the WWAN hardware is enabled

+

+
+
+
+
+

nm_client_wimax_get_enabled ()

+
gboolean
+nm_client_wimax_get_enabled (NMClient *client);
+

Determines whether WiMAX is enabled.

+
+

Parameters

+
+++++ + + + + + +

client

a NMClient

 
+
+
+

Returns

+

TRUE if WiMAX is enabled

+

+
+
+
+
+

nm_client_wimax_set_enabled ()

+
void
+nm_client_wimax_set_enabled (NMClient *client,
+                             gboolean enabled);
+

Enables or disables WiMAX devices.

+
+

Parameters

+
+++++ + - - + + + + + + + +

user_data :

data for callback -

client

a NMClient

 

enabled

TRUE to enable WiMAX

 
+
+
+
+

nm_client_wimax_hardware_get_enabled ()

+
gboolean
+nm_client_wimax_hardware_get_enabled (NMClient *client);
+

Determines whether the WiMAX hardware is enabled.

+
+

Parameters

+
+++++ + + + + + +

client

a NMClient

 
+
+
+

Returns

+

TRUE if the WiMAX hardware is enabled

+

+
+
+
+
+

nm_client_get_version ()

+
const char *
+nm_client_get_version (NMClient *client);
+

Gets NetworkManager version.

+
+

Parameters

+
+++++ + + + + + +

client

a NMClient

 
+
+
+

Returns

+

string with the version

+

+
+
+
+
+

nm_client_get_state ()

+
NMState
+nm_client_get_state (NMClient *client);
+

Gets the current daemon state.

+
+

Parameters

+
+++++ + + + + + +

client

a NMClient

 
+
+
+

Returns

+

the current NMState

+

+
+
-

nm_client_new_finish ()

-
NMClient *          nm_client_new_finish                (GAsyncResult *result,
-                                                         GError **error);
-

-Gets the result of an nm_client_new_async() call. -

-
+

nm_client_get_manager_running ()

+
gboolean
+nm_client_get_manager_running (NMClient *client);
+

Determines whether the daemon is running.

+
+

Parameters

+
--+++ - - - - - - - - - - - - - - + + + + +

result :

a GAsyncResult -

error :

location for a GError, or NULL -

Returns :

a new NMClient, or NULL on error

client

a NMClient

 
+
+

Returns

+

TRUE if the daemon is running

+

+
+
-

nm_client_get_devices ()

-
const GPtrArray *   nm_client_get_devices               (NMClient *client);
-

-Gets all the known network devices. Use nm_device_get_type() or the -NM_IS_DEVICE_XXXX() functions to determine what kind of device member of the -returned array is, and then you may use device-specific methods such as -nm_device_ethernet_get_hw_address(). -

-
+

nm_client_get_active_connections ()

+
const GPtrArray *
+nm_client_get_active_connections (NMClient *client);
+

Gets the active connections.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

client :

a NMClient -

Returns :

a GPtrArray -containing all the NMDevices. The returned array is owned by the -NMClient object and should not be modified. [transfer none][element-type NMClient.Device] -

client

a NMClient

 
+
+

Returns

+

a GPtrArray +containing all the active NMActiveConnections. +The returned array is owned by the client and should not be modified.

+

[transfer none][element-type NMClient.ActiveConnection]

+
+
-

nm_client_get_device_by_path ()

-
NMDevice *          nm_client_get_device_by_path        (NMClient *client,
-                                                         const char *object_path);
-

-Gets a NMDevice from a NMClient. -

-
+

nm_client_sleep ()

+
void
+nm_client_sleep (NMClient *client,
+                 gboolean sleep_);
+

Deprecated; use nm_client_networking_set_enabled() instead.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + +

client :

a NMClient -

object_path :

the object path to search for

client

a NMClient

 

Returns :

the NMDevice for the given object_path or NULL if none is found. [transfer none] -

sleep_

TRUE to put the daemon to sleep

 
+
-

nm_client_get_device_by_iface ()

-
NMDevice *          nm_client_get_device_by_iface       (NMClient *client,
-                                                         const char *iface);
-

-Gets a NMDevice from a NMClient. -

-
+

nm_client_get_permission_result ()

+
NMClientPermissionResult
+nm_client_get_permission_result (NMClient *client,
+                                 NMClientPermission permission);
+

Requests the result of a specific permission, which indicates whether the +client can or cannot perform the action the permission represents

+
+

Parameters

+
--+++ - - - - - - + + + - - + + +

client :

a NMClient -

iface :

the interface name to search for

client

a NMClient

 

Returns :

the NMDevice for the given iface or NULL if none is found. [transfer none] -

permission

the permission for which to return the result, one of NMClientPermission

 
-
-
-

NMClientActivateFn ()

-
void                (*NMClientActivateFn)               (NMClient *client,
-                                                         NMActiveConnection *active_connection,
-                                                         GError *error,
-                                                         gpointer user_data);
-

-

+
+

Returns

+

the permission's result, one of NMClientPermissionResult

+

+
-

nm_client_activate_connection ()

-
void                nm_client_activate_connection       (NMClient *client,
-                                                         NMConnection *connection,
-                                                         NMDevice *device,
-                                                         const char *specific_object,
-                                                         NMClientActivateFn callback,
-                                                         gpointer user_data);
-

-Starts a connection to a particular network using the configuration settings -from connection and the network device device. Certain connection types -also take a "specific object" which is the object path of a connection- -specific object, like an NMAccessPoint for WiFi connections, or an -NMWimaxNsp for WiMAX connections, to which you wish to connect. If the -specific object is not given, NetworkManager can, in some cases, automatically -determine which network to connect to given the settings in connection. -

-
+

nm_client_get_logging ()

+
gboolean
+nm_client_get_logging (NMClient *client,
+                       char **level,
+                       char **domains,
+                       GError **error);
+

Gets NetworkManager current logging level and domains.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + - - + + + - - + + + - - + + +

client :

a NMClient -

connection :

an NMConnection -

device :

the NMDevice. [allow-none] -

client

a NMClient

 

specific_object :

the object path of a connection-type-specific -object this activation should use. This parameter is currently ignored for -wired and mobile broadband connections, and the value of NULL should be used -(ie, no specific object). For WiFi or WiMAX connections, pass the object -path of a NMAccessPoint or NMWimaxNsp owned by device, which you can -get using nm_object_get_path(), and which will be used to complete the -details of the newly added connection. [allow-none] -

level

return location for logging level string.

[allow-none]

callback :

the function to call when the call is done. [scope async][allow-none] -

domains

return location for log domains string. The string is +a list of domains separated by ",".

[allow-none]

user_data :

user data to pass to the callback function. [closure] -

error

return location for a GError, or NULL.

[allow-none]
-
-
-

NMClientAddActivateFn ()

-
void                (*NMClientAddActivateFn)            (NMClient *client,
-                                                         NMActiveConnection *connection,
-                                                         const char *new_connection_path,
-                                                         GError *error,
-                                                         gpointer user_data);
-

-

+
+

Returns

+

TRUE on success, FALSE otherwise

+

+
+

Since 0.9.8

-

nm_client_add_and_activate_connection ()

-
void                nm_client_add_and_activate_connection
-                                                        (NMClient *client,
-                                                         NMConnection *partial,
-                                                         NMDevice *device,
-                                                         const char *specific_object,
-                                                         NMClientAddActivateFn callback,
-                                                         gpointer user_data);
-

-Adds a new connection using the given details (if any) as a template, -automatically filling in missing settings with the capabilities of the -given device and specific object. The new connection is then activated. -Cannot be used for VPN connections at this time. -

-
+

nm_client_set_logging ()

+
gboolean
+nm_client_set_logging (NMClient *client,
+                       const char *level,
+                       const char *domains,
+                       GError **error);
+

Sets NetworkManager logging level and/or domains.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + - - + + + - - + + + - - + + +

client :

a NMClient -

partial :

an NMConnection to add; the connection may be -partially filled (or even NULL) and will be completed by NetworkManager -using the given device and specific_object before being added. [allow-none] -

device :

the NMDevice -

client

a NMClient

 

specific_object :

the object path of a connection-type-specific -object this activation should use. This parameter is currently ignored for -wired and mobile broadband connections, and the value of NULL should be used -(ie, no specific object). For WiFi or WiMAX connections, pass the object -path of a NMAccessPoint or NMWimaxNsp owned by device, which you can -get using nm_object_get_path(), and which will be used to complete the -details of the newly added connection. [allow-none] -

level

logging level to set (NULL or an empty string for no change).

[allow-none]

callback :

the function to call when the call is done. [scope async][allow-none] -

domains

logging domains to set. The string should be a list of log +domains separated by ",". (NULL or an empty string for no change).

[allow-none]

user_data :

user data to pass to the callback function. [closure] -

error

return location for a GError, or NULL.

[allow-none]
+
+

Returns

+

TRUE on success, FALSE otherwise

+

+
+

Since 0.9.8

+
-

nm_client_deactivate_connection ()

-
void                nm_client_deactivate_connection     (NMClient *client,
-                                                         NMActiveConnection *active);
-

-Deactivates an active NMActiveConnection. -

-
+

nm_client_get_connectivity ()

+
NMConnectivityState
+nm_client_get_connectivity (NMClient *client);
+

Gets the current network connectivity state. Contrast +nm_client_check_connectivity() and +nm_client_check_connectivity_async(), which re-check the +connectivity state first before returning any information.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

client :

a NMClient -

active :

the NMActiveConnection to deactivate

client

an NMClient

 
+
+

Returns

+

the current connectivity state

+

+
+

Since 0.9.8.4

+
-

nm_client_networking_get_enabled ()

-
gboolean            nm_client_networking_get_enabled    (NMClient *client);
-

-Whether networking is enabled or disabled. -

-
+

nm_client_check_connectivity ()

+
NMConnectivityState
+nm_client_check_connectivity (NMClient *client,
+                              GCancellable *cancellable,
+                              GError **error);
+

Updates the network connectivity state and returns the (new) +current state. Contrast nm_client_get_connectivity(), which returns +the most recent known state without re-checking.

+

This is a blocking call; use nm_client_check_connectivity_async() +if you do not want to block.

+
+

Parameters

+
--+++ - - - - - - + + + - -

client :

a NMClient -

Returns :

 -TRUE if networking is enabled, FALSE if networking is disabled

client

an NMClient

 
-
-
-
-

nm_client_networking_set_enabled ()

-
void                nm_client_networking_set_enabled    (NMClient *client,
-                                                         gboolean enabled);
-

-Enables or disables networking. When networking is disabled, all controlled -interfaces are disconnected and deactivated. When networking is enabled, -all controlled interfaces are available for activation. -

-
---- - - - + + + - - + + +

client :

a NMClient -

cancellable

a GCancellable

 

enabled :

 -TRUE to set networking enabled, FALSE to set networking disabled

error

return location for a GError

 
+
+

Returns

+

the (new) current connectivity state

+

+
+

Since 0.9.8.4

+
-

nm_client_wireless_get_enabled ()

-
gboolean            nm_client_wireless_get_enabled      (NMClient *client);
-

-Determines whether the wireless is enabled. -

-
+

nm_client_check_connectivity_async ()

+
void
+nm_client_check_connectivity_async (NMClient *client,
+                                    GCancellable *cancellable,
+                                    GAsyncReadyCallback callback,
+                                    gpointer user_data);
+

Asynchronously updates the network connectivity state and invokes +callback + when complete. Contrast nm_client_get_connectivity(), +which (immediately) returns the most recent known state without +re-checking, and nm_client_check_connectivity(), which blocks.

+
+

Parameters

+
--+++ - - + + + - - + + + - -

client :

a NMClient -

client

an NMClient

 

Returns :

 -TRUE if wireless is enabled

cancellable

a GCancellable

 
-
-
-
-

nm_client_wireless_set_enabled ()

-
void                nm_client_wireless_set_enabled      (NMClient *client,
-                                                         gboolean enabled);
-

-Enables or disables wireless devices. -

-
---- - - - + + + - - + + +

client :

a NMClient -

callback

callback to call with the result

 

enabled :

 -TRUE to enable wireless

user_data

data for callback +.

 
+

Since 0.9.8.4

+
-

nm_client_wireless_hardware_get_enabled ()

-
gboolean            nm_client_wireless_hardware_get_enabled
-                                                        (NMClient *client);
-

-Determines whether the wireless hardware is enabled. -

-
+

nm_client_check_connectivity_finish ()

+
NMConnectivityState
+nm_client_check_connectivity_finish (NMClient *client,
+                                     GAsyncResult *result,
+                                     GError **error);
+

Retrieves the result of an nm_client_check_connectivity_async() +call.

+
+

Parameters

+
--+++ - - - - - - + + + - -

client :

a NMClient -

Returns :

 -TRUE if the wireless hardware is enabled

client

an NMClient

 
-
-
-
-

nm_client_wwan_get_enabled ()

-
gboolean            nm_client_wwan_get_enabled          (NMClient *client);
-

-Determines whether WWAN is enabled. -

-
---- - - - + + + - - + + +

client :

a NMClient -

result

the GAsyncResult

 

Returns :

 -TRUE if WWAN is enabled

error

return location for a GError

 
+
+

Returns

+

the (new) current connectivity state

+

+
+

Since 0.9.8.4

+
-

nm_client_wwan_set_enabled ()

-
void                nm_client_wwan_set_enabled          (NMClient *client,
-                                                         gboolean enabled);
-

-Enables or disables WWAN devices. -

-
+

nm_client_get_primary_connection ()

+
NMActiveConnection *
+nm_client_get_primary_connection (NMClient *client);
+

Gets the NMActiveConnection corresponding to the primary active +network device.

+

In particular, when there is no VPN active, or the VPN does not +have the default route, this returns the active connection that has +the default route. If there is a VPN active with the default route, +then this function returns the active connection that contains the +route to the VPN endpoint.

+

If there is no default route, or the default route is over a +non-NetworkManager-recognized device, this will return NULL.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

client :

a NMClient -

enabled :

 -TRUE to enable WWAN

client

an NMClient

 
+
+

Returns

+

the appropriate NMActiveConnection, if +any.

+

[transfer none]

+
+

Since 0.9.8.4

+
-

nm_client_wwan_hardware_get_enabled ()

-
gboolean            nm_client_wwan_hardware_get_enabled (NMClient *client);
-

-Determines whether the WWAN hardware is enabled. -

-
+

nm_client_get_activating_connection ()

+
NMActiveConnection *
+nm_client_get_activating_connection (NMClient *client);
+

Gets the NMActiveConnection corresponding to a +currently-activating connection that is expected to become the new +“primary-connection” upon successful activation.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

client :

a NMClient -

Returns :

 -TRUE if the WWAN hardware is enabled

client

an NMClient

 
-
+
+

Returns

+

the appropriate NMActiveConnection, if +any.

+

[transfer none]

+
+

Since 0.9.8.4

+
+
+
+

Types and Values

-

nm_client_wimax_get_enabled ()

-
gboolean            nm_client_wimax_get_enabled         (NMClient *client);
+

NM_CLIENT_VERSION

+
#define NM_CLIENT_VERSION "version"
+

-Determines whether WiMAX is enabled.

-
---- - - - - - - - - - - -

client :

a NMClient -

Returns :

 -TRUE if WiMAX is enabled
-

nm_client_wimax_set_enabled ()

-
void                nm_client_wimax_set_enabled         (NMClient *client,
-                                                         gboolean enabled);
+

NM_CLIENT_STATE

+
#define NM_CLIENT_STATE "state"
+

-Enables or disables WiMAX devices.

-
---- - - - - - - - - - - -

client :

a NMClient -

enabled :

 -TRUE to enable WiMAX
-

nm_client_wimax_hardware_get_enabled ()

-
gboolean            nm_client_wimax_hardware_get_enabled
-                                                        (NMClient *client);
+

NM_CLIENT_MANAGER_RUNNING

+
#define NM_CLIENT_MANAGER_RUNNING "manager-running"
+

-Determines whether the WiMAX hardware is enabled.

-
---- - - - - - - - - - - -

client :

a NMClient -

Returns :

 -TRUE if the WiMAX hardware is enabled
-

nm_client_get_version ()

-
const char *        nm_client_get_version               (NMClient *client);
+

NM_CLIENT_NETWORKING_ENABLED

+
#define NM_CLIENT_NETWORKING_ENABLED "networking-enabled"
+

-Gets NetworkManager version.

-
---- - - - - - - - - - - -

client :

a NMClient -

Returns :

string with the version
-

nm_client_get_state ()

-
NMState             nm_client_get_state                 (NMClient *client);
+

NM_CLIENT_WIRELESS_ENABLED

+
#define NM_CLIENT_WIRELESS_ENABLED "wireless-enabled"
+

-Gets the current daemon state.

-
---- - - - - - - - - - - -

client :

a NMClient -

Returns :

the current NMState -
-

nm_client_get_manager_running ()

-
gboolean            nm_client_get_manager_running       (NMClient *client);
+

NM_CLIENT_WIRELESS_HARDWARE_ENABLED

+
#define NM_CLIENT_WIRELESS_HARDWARE_ENABLED "wireless-hardware-enabled"
+

-Determines whether the daemon is running.

-
---- - - - - - - - - - - -

client :

a NMClient -

Returns :

 -TRUE if the daemon is running
-

nm_client_get_active_connections ()

-
const GPtrArray *   nm_client_get_active_connections    (NMClient *client);
+

NM_CLIENT_WWAN_ENABLED

+
#define NM_CLIENT_WWAN_ENABLED "wwan-enabled"
+

-Gets the active connections.

-
---- - - - - - - - - - - -

client :

a NMClient -

Returns :

a GPtrArray -containing all the active NMActiveConnections. -The returned array is owned by the client and should not be modified. [transfer none][element-type NMClient.ActiveConnection] -
-

nm_client_sleep ()

-
void                nm_client_sleep                     (NMClient *client,
-                                                         gboolean sleep_);
+

NM_CLIENT_WWAN_HARDWARE_ENABLED

+
#define NM_CLIENT_WWAN_HARDWARE_ENABLED "wwan-hardware-enabled"
+

-Deprecated; use nm_client_networking_set_enabled() instead.

-
---- - - - - - - - - - - -

client :

a NMClient -

sleep_ :

 -TRUE to put the daemon to sleep
-

nm_client_get_permission_result ()

-
NMClientPermissionResult nm_client_get_permission_result
-                                                        (NMClient *client,
-                                                         NMClientPermission permission);
+

NM_CLIENT_WIMAX_ENABLED

+
#define NM_CLIENT_WIMAX_ENABLED "wimax-enabled"
+

-Requests the result of a specific permission, which indicates whether the -client can or cannot perform the action the permission represents

-
---- - - - - - - - - - - - - - - -

client :

a NMClient -

permission :

the permission for which to return the result, one of NMClientPermission -

Returns :

the permission's result, one of NMClientPermissionResult -
-

nm_client_get_logging ()

-
gboolean            nm_client_get_logging               (NMClient *client,
-                                                         char **level,
-                                                         char **domains,
-                                                         GError **error);
+

NM_CLIENT_WIMAX_HARDWARE_ENABLED

+
#define NM_CLIENT_WIMAX_HARDWARE_ENABLED "wimax-hardware-enabled"
+

-Gets NetworkManager current logging level and domains.

-
---- - - - - - - - - - - - - - - - - - - - - - - -

client :

a NMClient -

level :

return location for logging level string. [allow-none] -

domains :

return location for log domains string. The string is -a list of domains separated by ",". [allow-none] -

error :

return location for a GError, or NULL. [allow-none] -

Returns :

 -TRUE on success, FALSE otherwise
-

Since 0.9.8

-

nm_client_set_logging ()

-
gboolean            nm_client_set_logging               (NMClient *client,
-                                                         const char *level,
-                                                         const char *domains,
-                                                         GError **error);
+

NM_CLIENT_ACTIVE_CONNECTIONS

+
#define NM_CLIENT_ACTIVE_CONNECTIONS "active-connections"
+

-Sets NetworkManager logging level and/or domains.

-
---- - - - - - - - - - - - - - - - - - - - - - - -

client :

a NMClient -

level :

logging level to set (NULL or an empty string for no change). [allow-none] -

domains :

logging domains to set. The string should be a list of log -domains separated by ",". (NULL or an empty string for no change). [allow-none] -

error :

return location for a GError, or NULL. [allow-none] -

Returns :

 -TRUE on success, FALSE otherwise
-

Since 0.9.8

-

nm_client_get_connectivity ()

-
NMConnectivityState nm_client_get_connectivity          (NMClient *client);
+

NM_CLIENT_CONNECTIVITY

+
#define NM_CLIENT_CONNECTIVITY "connectivity"
+

-Gets the current network connectivity state. Contrast -nm_client_check_connectivity() and -nm_client_check_connectivity_async(), which re-check the -connectivity state first before returning any information.

-
---- - - - - - - - - - - -

client :

an NMClient -

Returns :

the current connectivity state
-

Since 0.9.8.4

-

nm_client_check_connectivity ()

-
NMConnectivityState nm_client_check_connectivity        (NMClient *client,
-                                                         GCancellable *cancellable,
-                                                         GError **error);
+

NM_CLIENT_PRIMARY_CONNECTION

+
#define NM_CLIENT_PRIMARY_CONNECTION "primary-connection"
+

-Updates the network connectivity state and returns the (new) -current state. Contrast nm_client_get_connectivity(), which returns -the most recent known state without re-checking.

+
+
+
+

NM_CLIENT_ACTIVATING_CONNECTION

+
#define NM_CLIENT_ACTIVATING_CONNECTION "activating-connection"
+

-This is a blocking call; use nm_client_check_connectivity_async() -if you do not want to block.

-
+ +
+
+

enum NMClientPermission

+

NMClientPermission values indicate various permissions that NetworkManager +clients can obtain to perform certain tasks on behalf of the current user.

+
+

Members

+
--+++ - - + + - - + + - - + + - - + + + + + + + + - -

client :

an NMClient +

NM_CLIENT_PERMISSION_NONE

 +

unknown or no permission

 

cancellable :

a GCancellable +

NM_CLIENT_PERMISSION_ENABLE_DISABLE_NETWORK

 +

controls whether networking + can be globally enabled or disabled

 

error :

return location for a GError +

NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIFI

 +

controls whether WiFi can be + globally enabled or disabled

 

Returns :

the (new) current connectivity state

NM_CLIENT_PERMISSION_ENABLE_DISABLE_WWAN

 +

controls whether WWAN (3G) can be + globally enabled or disabled

+		 

NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIMAX

 +

controls whether WiMAX can be + globally enabled or disabled

+		 
-

Since 0.9.8.4

-
-
-
-

nm_client_check_connectivity_async ()

-
void                nm_client_check_connectivity_async  (NMClient *client,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
-

-Asynchronously updates the network connectivity state and invokes -callback when complete. Contrast nm_client_get_connectivity(), -which (immediately) returns the most recent known state without -re-checking, and nm_client_check_connectivity(), which blocks. -

-
---- - - - + + - - + + - - + + + - - + + + - -

client :

an NMClient +

NM_CLIENT_PERMISSION_SLEEP_WAKE

 +

controls whether the client can ask + NetworkManager to sleep and wake

 

cancellable :

a GCancellable +

NM_CLIENT_PERMISSION_NETWORK_CONTROL

 +

controls whether networking connections + can be started, stopped, and changed

 

callback :

callback to call with the result

NM_CLIENT_PERMISSION_WIFI_SHARE_PROTECTED

 +

controls whether a password + protected WiFi hotspot can be created

+		 

user_data :

data for callback.

NM_CLIENT_PERMISSION_WIFI_SHARE_OPEN

 +

controls whether an open WiFi hotspot + can be created

+		 
-

Since 0.9.8.4

-
-
-
-

nm_client_check_connectivity_finish ()

-
NMConnectivityState nm_client_check_connectivity_finish (NMClient *client,
-                                                         GAsyncResult *result,
-                                                         GError **error);
-

-Retrieves the result of an nm_client_check_connectivity_async() -call. -

-
---- - - - + + - - + + - - + + - - + + +

client :

an NMClient +

NM_CLIENT_PERMISSION_SETTINGS_MODIFY_SYSTEM

 +

controls whether connections + that are available to all users can be modified

 

result :

the GAsyncResult +

NM_CLIENT_PERMISSION_SETTINGS_MODIFY_OWN

 +

controls whether connections + owned by the current user can be modified

 

error :

return location for a GError +

NM_CLIENT_PERMISSION_SETTINGS_MODIFY_HOSTNAME

 +

controls whether the + persistent hostname can be changed

 

Returns :

the (new) current connectivity state

NM_CLIENT_PERMISSION_LAST

 +

a reserved boundary value

+		 
-

Since 0.9.8.4

+
-

nm_client_get_primary_connection ()

-
NMActiveConnection * nm_client_get_primary_connection   (NMClient *client);
-

-Gets the NMActiveConnection corresponding to the primary active -network device. -

-

-In particular, when there is no VPN active, or the VPN does not -have the default route, this returns the active connection that has -the default route. If there is a VPN active with the default route, -then this function returns the active connection that contains the -route to the VPN endpoint. -

-

-If there is no default route, or the default route is over a -non-NetworkManager-recognized device, this will return NULL. -

-
+

enum NMClientPermissionResult

+

NMClientPermissionResult values indicate what authorizations and permissions +the user requires to obtain a given NMClientPermission

+
+

Members

+
--+++ - - + + - - + + - -

client :

an NMClient +

NM_CLIENT_PERMISSION_RESULT_UNKNOWN

 +

unknown or no authorization

 

Returns :

the appropriate NMActiveConnection, if -any. [transfer none] +

NM_CLIENT_PERMISSION_RESULT_YES

 +

the permission is available

 
-

Since 0.9.8.4

-
-
-
-

nm_client_get_activating_connection ()

-
NMActiveConnection * nm_client_get_activating_connection
-                                                        (NMClient *client);
-

-Gets the NMActiveConnection corresponding to a -currently-activating connection that is expected to become the new -"primary-connection" upon successful activation. -

-
---- - - - + + - - + +

client :

an NMClient +

NM_CLIENT_PERMISSION_RESULT_AUTH

 +

authorization is necessary before the + permission is available

 

Returns :

the appropriate NMActiveConnection, if -any. [transfer none] +

NM_CLIENT_PERMISSION_RESULT_NO

 +

permission to perform the operation is + denied by system policy

 
-

Since 0.9.8.4

+

Property Details

-

The "activating-connection" property

-
  "activating-connection"    NMActiveConnection*   : Read
-

-The NMActiveConnection of the activating connection that is -likely to become the new "primary-connection". -

+

The “activating-connection” property

+
  “activating-connection”    NMActiveConnection *
+

Activating connection.

+

Flags: Read

Since 0.9.8.4

-

The "active-connections" property

-
  "active-connections"       NMObjectArray*        : Read
+

The “active-connections” property

+
  “active-connections”       NMObjectArray *

Active connections.

+

Flags: Read

-

The "connectivity" property

-
  "connectivity"             guint                 : Read
-

-The network connectivity state. -

+

The “connectivity” property

+
  “connectivity”             guint
+

Connectivity state.

+

Flags: Read

Allowed values: <= 4

Default value: 0

Since 0.9.8.4

-

The "manager-running" property

-
  "manager-running"          gboolean              : Read
+

The “manager-running” property

+
  “manager-running”          gboolean

Whether NetworkManager is running.

+

Flags: Read

Default value: FALSE

-

The "networking-enabled" property

-
  "networking-enabled"       gboolean              : Read / Write
+

The “networking-enabled” property

+
  “networking-enabled”       gboolean

Is networking enabled.

+

Flags: Read / Write

Default value: TRUE

-

The "primary-connection" property

-
  "primary-connection"       NMActiveConnection*   : Read
-

-The NMActiveConnection of the device with the default route; -see nm_client_get_primary_connection() for more details. -

+

The “primary-connection” property

+
  “primary-connection”       NMActiveConnection *
+

Primary connection.

+

Flags: Read

Since 0.9.8.4

-

The "state" property

-
  "state"                    guint                 : Read
-

-The current daemon state. -

+

The “state” property

+
  “state”                    guint
+

NetworkManager state.

+

Flags: Read

Allowed values: <= 70

Default value: 0

-

The "version" property

-
  "version"                  gchar*                : Read
-

-The NetworkManager version. -

+

The “version” property

+
  “version”                  gchar *
+

NetworkManager version.

+

Flags: Read

Default value: NULL

-

The "wimax-enabled" property

-
  "wimax-enabled"            gboolean              : Read / Write
+

The “wimax-enabled” property

+
  “wimax-enabled”            gboolean

Is WiMAX enabled.

+

Flags: Read / Write

Default value: FALSE

-

The "wimax-hardware-enabled" property

-
  "wimax-hardware-enabled"   gboolean              : Read
+

The “wimax-hardware-enabled” property

+
  “wimax-hardware-enabled”   gboolean

Is WiMAX hardware enabled.

+

Flags: Read

Default value: FALSE

-

The "wireless-enabled" property

-
  "wireless-enabled"         gboolean              : Read / Write
+

The “wireless-enabled” property

+
  “wireless-enabled”         gboolean

Is wireless enabled.

+

Flags: Read / Write

Default value: FALSE

-

The "wireless-hardware-enabled" property

-
  "wireless-hardware-enabled" gboolean              : Read
+

The “wireless-hardware-enabled” property

+
  “wireless-hardware-enabled” gboolean

Is wireless hardware enabled.

+

Flags: Read

Default value: TRUE

-

The "wwan-enabled" property

-
  "wwan-enabled"             gboolean              : Read / Write
+

The “wwan-enabled” property

+
  “wwan-enabled”             gboolean

Is WWAN enabled.

+

Flags: Read / Write

Default value: FALSE

-

The "wwan-hardware-enabled" property

-
  "wwan-hardware-enabled"    gboolean              : Read
+

The “wwan-hardware-enabled” property

+
  “wwan-hardware-enabled”    gboolean

Is WWAN hardware enabled.

+

Flags: Read

Default value: FALSE

Signal Details

-

The "device-added" signal

-
void                user_function                      (NMClient *client,
-                                                        GObject  *device,
-                                                        gpointer  user_data)      : Run First
-

-Notifies that a NMDevice is added. -

-
---- - - - - - - - - - - - - - - -

client :

the client that received the signal

device :

the new device. [type NMClient.Device] -

user_data :

user data set when the signal handler was connected.
+

The “device-added” signal

+
void
+user_function (NMClient *client,
+               GObject  *device,
+               gpointer  user_data)
+

Flags: Run First

-

The "device-removed" signal

-
void                user_function                      (NMClient *client,
-                                                        GObject  *device,
-                                                        gpointer  user_data)      : Run First
-

-Notifies that a NMDevice is removed. -

-
---- - - - - - - - - - - - - - - -

client :

the client that received the signal

device :

the removed device. [type NMClient.Device] -

user_data :

user data set when the signal handler was connected.
+

The “device-removed” signal

+
void
+user_function (NMClient *client,
+               GObject  *device,
+               gpointer  user_data)
+

Flags: Run First

-

The "permission-changed" signal

-
void                user_function                      (NMClient *client,
-                                                        guint     permission,
-                                                        guint     result,
-                                                        gpointer  user_data)       : Run First
-

-Notifies that a permission has changed -

-
---- - - - - - - - - - - - - - - - - - - -

client :

the client that received the signal

permission :

a permission from NMClientPermission -

result :

the permission's result, one of NMClientPermissionResult -

user_data :

user data set when the signal handler was connected.
+

The “permission-changed” signal

+
void
+user_function (NMClient *client,
+               guint     permission,
+               guint     result,
+               gpointer  user_data)
+

Flags: Run First

- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20 \ No newline at end of file diff --git a/docs/libnm-glib/html/NMDHCP4Config.html b/docs/libnm-glib/html/NMDHCP4Config.html index aff13165..5809f4b7 100644 --- a/docs/libnm-glib/html/NMDHCP4Config.html +++ b/docs/libnm-glib/html/NMDHCP4Config.html @@ -2,36 +2,28 @@ -NMDHCP4Config +libnm-glib Reference Manual: NMDHCP4Config - + - - - - - - - - - - + + + + + + +
@@ -39,38 +31,76 @@

NMDHCP4Config

NMDHCP4Config

- +
-
-

Synopsis

-
                    NMDHCP4Config;
-                    NMDHCP4ConfigClass;
-#define             NM_DHCP4_CONFIG_OPTIONS
-GObject *           nm_dhcp4_config_new                 (DBusGConnection *connection,
-                                                         const char *object_path);
-GHashTable *        nm_dhcp4_config_get_options         (NMDHCP4Config *config);
-const char *        nm_dhcp4_config_get_one_option      (NMDHCP4Config *config,
-                                                         const char *option);
-
+
+

Functions

+
++++ + + + + + + + + + + + + + + +
+GObject * + +nm_dhcp4_config_new () +
+GHashTable * + +nm_dhcp4_config_get_options () +
const char * + +nm_dhcp4_config_get_one_option () +
-

Object Hierarchy

-
-  GObject
-   +----NMObject
-         +----NMDHCP4Config
-
+

Properties

+
+++++ + + + + + +
+GHashTable *optionsRead
-

Implemented Interfaces

-

-NMDHCP4Config implements - GInitable and GAsyncInitable.

+

Types and Values

+
++++ + + + + +
#defineNM_DHCP4_CONFIG_OPTIONS
-

Properties

-
-  "options"                  GHashTable*           : Read
+
Object Hierarchy

+
    GObject
+    ╰── NMObject
+        ╰── NMDHCP4Config
@@ -79,145 +109,128 @@ NMDHCP4Config implements

-

Details

-
-

NMDHCP4Config

-
typedef struct _NMDHCP4Config NMDHCP4Config;
-

-

-
-
-
-

NMDHCP4ConfigClass

-
typedef struct {
-	NMObjectClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMDHCP4ConfigClass;
-
-

-

-
-
-
-

NM_DHCP4_CONFIG_OPTIONS

-
#define NM_DHCP4_CONFIG_OPTIONS "options"
-
-

-

-
-
+

Functions

-

nm_dhcp4_config_new ()

-
GObject *           nm_dhcp4_config_new                 (DBusGConnection *connection,
-                                                         const char *object_path);
-

-Creates a new NMDHCP4Config. -

-
+

nm_dhcp4_config_new ()

+
GObject *
+nm_dhcp4_config_new (DBusGConnection *connection,
+                     const char *object_path);
+

Creates a new NMDHCP4Config.

+
+

Parameters

+
--+++ - - + + + - - - - - - + + +

connection :

the DBusGConnection -

connection

the DBusGConnection

 

object_path :

the DBus object path of the device

Returns :

a new configuration. [transfer full] -

object_path

the DBus object path of the device

 
+
+

Returns

+

a new configuration.

+

[transfer full]

+
+
-

nm_dhcp4_config_get_options ()

-
GHashTable *        nm_dhcp4_config_get_options         (NMDHCP4Config *config);
-

-Gets all the options contained in the configuration. -

-
+

nm_dhcp4_config_get_options ()

+
GHashTable *
+nm_dhcp4_config_get_options (NMDHCP4Config *config);
+

Gets all the options contained in the configuration.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

config :

a NMDHCP4Config -

Returns :

the GHashTable containing strings for keys and values. -This is the internal copy used by the configuration, and must not be modified. [transfer none][element-type utf8 GObject.Value] -

config

a NMDHCP4Config

 
+
+

Returns

+

the GHashTable containing strings for keys and values. +This is the internal copy used by the configuration, and must not be modified.

+

[transfer none][element-type utf8 GObject.Value]

+
+
-

nm_dhcp4_config_get_one_option ()

-
const char *        nm_dhcp4_config_get_one_option      (NMDHCP4Config *config,
-                                                         const char *option);
-

-Gets one option by option name. -

-
+

nm_dhcp4_config_get_one_option ()

+
const char *
+nm_dhcp4_config_get_one_option (NMDHCP4Config *config,
+                                const char *option);
+

Gets one option by option name.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + +

config :

a NMDHCP4Config -

option :

the option to retrieve

config

a NMDHCP4Config

 

Returns :

the configuration option's value. This is the internal string used by the -configuration, and must not be modified.

option

the option to retrieve

 
+
+

Returns

+

the configuration option's value. This is the internal string used by the +configuration, and must not be modified.

+

+
+
-

Property Details

+

Types and Values

-

The "options" property

-
  "options"                  GHashTable*           : Read
-

-The GHashTable containing options of the configuration. -

+

NM_DHCP4_CONFIG_OPTIONS

+
#define NM_DHCP4_CONFIG_OPTIONS "options"
+

-Type: GLib.HashTable(utf8,GObject.Value)

+
+

Property Details

+
+

The “options” property

+
  “options”                  GHashTable *
+

Options.

+

Flags: Read

+
+
- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20 \ No newline at end of file diff --git a/docs/libnm-glib/html/NMDHCP6Config.html b/docs/libnm-glib/html/NMDHCP6Config.html index cc5b4931..6d0c04f6 100644 --- a/docs/libnm-glib/html/NMDHCP6Config.html +++ b/docs/libnm-glib/html/NMDHCP6Config.html @@ -2,36 +2,28 @@ -NMDHCP6Config +libnm-glib Reference Manual: NMDHCP6Config - + - - - - - - - - - - + + + + + + +
@@ -39,38 +31,76 @@

NMDHCP6Config

NMDHCP6Config

- +
-
-

Synopsis

-
                    NMDHCP6Config;
-                    NMDHCP6ConfigClass;
-#define             NM_DHCP6_CONFIG_OPTIONS
-GObject *           nm_dhcp6_config_new                 (DBusGConnection *connection,
-                                                         const char *object_path);
-GHashTable *        nm_dhcp6_config_get_options         (NMDHCP6Config *config);
-const char *        nm_dhcp6_config_get_one_option      (NMDHCP6Config *config,
-                                                         const char *option);
-
+
+

Functions

+
++++ + + + + + + + + + + + + + + +
+GObject * + +nm_dhcp6_config_new () +
+GHashTable * + +nm_dhcp6_config_get_options () +
const char * + +nm_dhcp6_config_get_one_option () +
-

Object Hierarchy

-
-  GObject
-   +----NMObject
-         +----NMDHCP6Config
-
+

Properties

+
+++++ + + + + + +
+GHashTable *optionsRead
-

Implemented Interfaces

-

-NMDHCP6Config implements - GInitable and GAsyncInitable.

+

Types and Values

+
++++ + + + + +
#defineNM_DHCP6_CONFIG_OPTIONS
-

Properties

-
-  "options"                  GHashTable*           : Read
+
Object Hierarchy

+
    GObject
+    ╰── NMObject
+        ╰── NMDHCP6Config
@@ -79,145 +109,128 @@ NMDHCP6Config implements

-

Details

-
-

NMDHCP6Config

-
typedef struct _NMDHCP6Config NMDHCP6Config;
-

-

-
-
-
-

NMDHCP6ConfigClass

-
typedef struct {
-	NMObjectClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMDHCP6ConfigClass;
-
-

-

-
-
-
-

NM_DHCP6_CONFIG_OPTIONS

-
#define NM_DHCP6_CONFIG_OPTIONS "options"
-
-

-

-
-
+

Functions

-

nm_dhcp6_config_new ()

-
GObject *           nm_dhcp6_config_new                 (DBusGConnection *connection,
-                                                         const char *object_path);
-

-Creates a new NMDHCP6Config. -

-
+

nm_dhcp6_config_new ()

+
GObject *
+nm_dhcp6_config_new (DBusGConnection *connection,
+                     const char *object_path);
+

Creates a new NMDHCP6Config.

+
+

Parameters

+
--+++ - - + + + - - - - - - + + +

connection :

the DBusGConnection -

connection

the DBusGConnection

 

object_path :

the DBus object path of the device

Returns :

a new configuration. [transfer full] -

object_path

the DBus object path of the device

 
+
+

Returns

+

a new configuration.

+

[transfer full]

+
+
-

nm_dhcp6_config_get_options ()

-
GHashTable *        nm_dhcp6_config_get_options         (NMDHCP6Config *config);
-

-Gets all the options contained in the configuration. -

-
+

nm_dhcp6_config_get_options ()

+
GHashTable *
+nm_dhcp6_config_get_options (NMDHCP6Config *config);
+

Gets all the options contained in the configuration.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

config :

a NMDHCP6Config -

Returns :

the GHashTable containing strings for keys and values. -This is the internal copy used by the configuration, and must not be modified. [transfer none][element-type utf8 GObject.Value] -

config

a NMDHCP6Config

 
+
+

Returns

+

the GHashTable containing strings for keys and values. +This is the internal copy used by the configuration, and must not be modified.

+

[transfer none][element-type utf8 GObject.Value]

+
+
-

nm_dhcp6_config_get_one_option ()

-
const char *        nm_dhcp6_config_get_one_option      (NMDHCP6Config *config,
-                                                         const char *option);
-

-Gets one option by option name. -

-
+

nm_dhcp6_config_get_one_option ()

+
const char *
+nm_dhcp6_config_get_one_option (NMDHCP6Config *config,
+                                const char *option);
+

Gets one option by option name.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + +

config :

a NMDHCP6Config -

option :

the option to retrieve

config

a NMDHCP6Config

 

Returns :

the configuration option's value. This is the internal string used by the -configuration, and must not be modified.

option

the option to retrieve

 
+
+

Returns

+

the configuration option's value. This is the internal string used by the +configuration, and must not be modified.

+

+
+
-

Property Details

+

Types and Values

-

The "options" property

-
  "options"                  GHashTable*           : Read
-

-The GHashTable containing options of the configuration. -

+

NM_DHCP6_CONFIG_OPTIONS

+
#define NM_DHCP6_CONFIG_OPTIONS "options"
+

-Type: GLib.HashTable(utf8,GObject.Value)

+
+

Property Details

+
+

The “options” property

+
  “options”                  GHashTable *
+

Options.

+

Flags: Read

+
+
- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20 \ No newline at end of file diff --git a/docs/libnm-glib/html/NMDevice.html b/docs/libnm-glib/html/NMDevice.html index 621a183b..35d1dd2a 100644 --- a/docs/libnm-glib/html/NMDevice.html +++ b/docs/libnm-glib/html/NMDevice.html @@ -2,38 +2,29 @@ -NMDevice +libnm-glib Reference Manual: NMDevice - + - - - - - - - - - - + + + + + + +
@@ -41,1370 +32,1710 @@

NMDevice

NMDevice

- +
-
-

Synopsis

-
#define             NM_DEVICE_DEVICE_TYPE
-#define             NM_DEVICE_UDI
-#define             NM_DEVICE_INTERFACE
-#define             NM_DEVICE_IP_INTERFACE
-#define             NM_DEVICE_DRIVER
-#define             NM_DEVICE_DRIVER_VERSION
-#define             NM_DEVICE_FIRMWARE_VERSION
-#define             NM_DEVICE_CAPABILITIES
-#define             NM_DEVICE_MANAGED
-#define             NM_DEVICE_AUTOCONNECT
-#define             NM_DEVICE_FIRMWARE_MISSING
-#define             NM_DEVICE_IP4_CONFIG
-#define             NM_DEVICE_DHCP4_CONFIG
-#define             NM_DEVICE_IP6_CONFIG
-#define             NM_DEVICE_DHCP6_CONFIG
-#define             NM_DEVICE_STATE
-#define             NM_DEVICE_STATE_REASON
-#define             NM_DEVICE_ACTIVE_CONNECTION
-#define             NM_DEVICE_AVAILABLE_CONNECTIONS
-#define             NM_DEVICE_VENDOR
-#define             NM_DEVICE_PRODUCT
-                    NMDevice;
-                    NMDeviceClass;
-GObject *           nm_device_new                       (DBusGConnection *connection,
-                                                         const char *path);
-const char *        nm_device_get_iface                 (NMDevice *device);
-const char *        nm_device_get_ip_iface              (NMDevice *device);
-NMDeviceType        nm_device_get_device_type           (NMDevice *device);
-const char *        nm_device_get_udi                   (NMDevice *device);
-const char *        nm_device_get_driver                (NMDevice *device);
-const char *        nm_device_get_driver_version        (NMDevice *device);
-const char *        nm_device_get_firmware_version      (NMDevice *device);
-NMDeviceCapabilities nm_device_get_capabilities         (NMDevice *device);
-gboolean            nm_device_get_managed               (NMDevice *device);
-gboolean            nm_device_get_autoconnect           (NMDevice *device);
-void                nm_device_set_autoconnect           (NMDevice *device,
-                                                         gboolean autoconnect);
-gboolean            nm_device_get_firmware_missing      (NMDevice *device);
-NMIP4Config *       nm_device_get_ip4_config            (NMDevice *device);
-NMDHCP4Config *     nm_device_get_dhcp4_config          (NMDevice *device);
-NMIP6Config *       nm_device_get_ip6_config            (NMDevice *device);
-NMDHCP6Config *     nm_device_get_dhcp6_config          (NMDevice *device);
-NMDeviceState       nm_device_get_state                 (NMDevice *device);
-NMDeviceState       nm_device_get_state_reason          (NMDevice *device,
-                                                         NMDeviceStateReason *reason);
-NMActiveConnection * nm_device_get_active_connection    (NMDevice *device);
-const GPtrArray *   nm_device_get_available_connections (NMDevice *device);
-const char *        nm_device_get_product               (NMDevice *device);
-const char *        nm_device_get_vendor                (NMDevice *device);
-void                (*NMDeviceDeactivateFn)             (NMDevice *device,
-                                                         GError *error,
-                                                         gpointer user_data);
-void                nm_device_disconnect                (NMDevice *device,
-                                                         NMDeviceDeactivateFn callback,
-                                                         gpointer user_data);
-GSList *            nm_device_filter_connections        (NMDevice *device,
-                                                         const GSList *connections);
-gboolean            nm_device_connection_valid          (NMDevice *device,
-                                                         NMConnection *connection);
-gboolean            nm_device_connection_compatible     (NMDevice *device,
-                                                         NMConnection *connection,
-                                                         GError **error);
-
-
-
-

Object Hierarchy

-
-  GObject
-   +----NMObject
-         +----NMDevice
-               +----NMDeviceEthernet
-               +----NMDeviceWifi
-               +----NMDeviceModem
-               +----NMDeviceBt
-               +----NMDeviceWimax
-               +----NMDeviceOlpcMesh
-               +----NMDeviceAdsl
-               +----NMDeviceInfiniband
-               +----NMDeviceBond
-               +----NMDeviceBridge
-               +----NMDeviceVlan
-
-
-

Implemented Interfaces

-

-NMDevice implements - GInitable and GAsyncInitable.

+

Functions

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+GObject * + +nm_device_new () +
const char * + +nm_device_get_iface () +
const char * + +nm_device_get_ip_iface () +
+NMDeviceType + +nm_device_get_device_type () +
const char * + +nm_device_get_udi () +
const char * + +nm_device_get_driver () +
const char * + +nm_device_get_driver_version () +
const char * + +nm_device_get_firmware_version () +
+NMDeviceCapabilities + +nm_device_get_capabilities () +
+gboolean + +nm_device_get_managed () +
+gboolean + +nm_device_get_autoconnect () +
+void + +nm_device_set_autoconnect () +
+gboolean + +nm_device_get_firmware_missing () +
+NMIP4Config * + +nm_device_get_ip4_config () +
+NMDHCP4Config * + +nm_device_get_dhcp4_config () +
+NMIP6Config * + +nm_device_get_ip6_config () +
+NMDHCP6Config * + +nm_device_get_dhcp6_config () +
+NMDeviceState + +nm_device_get_state () +
+NMDeviceState + +nm_device_get_state_reason () +
+NMActiveConnection * + +nm_device_get_active_connection () +
const GPtrArray * + +nm_device_get_available_connections () +
const char * + +nm_device_get_product () +
const char * + +nm_device_get_vendor () +
+void + +(*NMDeviceDeactivateFn) () +
+void + +nm_device_disconnect () +
+GSList * + +nm_device_filter_connections () +
+gboolean + +nm_device_connection_valid () +
+gboolean + +nm_device_connection_compatible () +

Properties

-
-  "active-connection"        NMActiveConnection*   : Read
-  "autoconnect"              gboolean              : Read / Write
-  "available-connections"    NMObjectArray*        : Read
-  "capabilities"             guint                 : Read
-  "device-type"              guint                 : Read
-  "dhcp4-config"             NMDHCP4Config*        : Read
-  "dhcp6-config"             NMDHCP6Config*        : Read
-  "driver"                   gchar*                : Read
-  "driver-version"           gchar*                : Read
-  "firmware-missing"         gboolean              : Read
-  "firmware-version"         gchar*                : Read
-  "interface"                gchar*                : Read
-  "ip-interface"             gchar*                : Read
-  "ip4-config"               NMIP4Config*          : Read
-  "ip6-config"               NMIP6Config*          : Read
-  "managed"                  gboolean              : Read
-  "product"                  gchar*                : Read
-  "state"                    guint                 : Read
-  "state-reason"             GValueArray_guint+guint_*  : Read
-  "udi"                      gchar*                : Read
-  "vendor"                   gchar*                : Read
-
-
-
-

Signals

-
-  "state-changed"                                  : Run First
-
-
-
-

Description

-

-

-
-
-

Details

-
-

NM_DEVICE_DEVICE_TYPE

-
#define NM_DEVICE_DEVICE_TYPE "device-type"
-
-

-

-
-
-
-

NM_DEVICE_UDI

-
#define NM_DEVICE_UDI "udi"
-
-

-

-
-
-
-

NM_DEVICE_INTERFACE

-
#define NM_DEVICE_INTERFACE "interface"
-
-

-

-
-
-
-

NM_DEVICE_IP_INTERFACE

-
#define NM_DEVICE_IP_INTERFACE "ip-interface"
-
-

-

-
-
-
-

NM_DEVICE_DRIVER

-
#define NM_DEVICE_DRIVER "driver"
-
-

-

-
-
-
-

NM_DEVICE_DRIVER_VERSION

-
#define NM_DEVICE_DRIVER_VERSION "driver-version"
-
-

-

-
-
-
-

NM_DEVICE_FIRMWARE_VERSION

-
#define NM_DEVICE_FIRMWARE_VERSION "firmware-version"
-
-

-

-
-
-
-

NM_DEVICE_CAPABILITIES

-
#define NM_DEVICE_CAPABILITIES "capabilities"
-
-

-

-
-
-
-

NM_DEVICE_MANAGED

-
#define NM_DEVICE_MANAGED "managed"
-
-

-

-
-
-
-

NM_DEVICE_AUTOCONNECT

-
#define NM_DEVICE_AUTOCONNECT "autoconnect"
-
-

-

-
-
-
-

NM_DEVICE_FIRMWARE_MISSING

-
#define NM_DEVICE_FIRMWARE_MISSING "firmware-missing"
-
-

-

-
-
-
-

NM_DEVICE_IP4_CONFIG

-
#define NM_DEVICE_IP4_CONFIG "ip4-config"
-
-

-

-
-
-
-

NM_DEVICE_DHCP4_CONFIG

-
#define NM_DEVICE_DHCP4_CONFIG "dhcp4-config"
-
-

-

-
-
-
-

NM_DEVICE_IP6_CONFIG

-
#define NM_DEVICE_IP6_CONFIG "ip6-config"
-
-

-

-
-
-
-

NM_DEVICE_DHCP6_CONFIG

-
#define NM_DEVICE_DHCP6_CONFIG "dhcp6-config"
-
-

-

-
-
-
-

NM_DEVICE_STATE

-
#define NM_DEVICE_STATE "state"
-
-

-

-
-
-
-

NM_DEVICE_STATE_REASON

-
#define NM_DEVICE_STATE_REASON "state-reason"
-
-

-

-
-
-
-

NM_DEVICE_ACTIVE_CONNECTION

-
#define NM_DEVICE_ACTIVE_CONNECTION "active-connection"
-
-

-

-
-
-
-

NM_DEVICE_AVAILABLE_CONNECTIONS

-
#define NM_DEVICE_AVAILABLE_CONNECTIONS "available-connections"
-
-

-

-
-
-
-

NM_DEVICE_VENDOR

-
#define NM_DEVICE_VENDOR "vendor"
-
-

-

-
-
-
-

NM_DEVICE_PRODUCT

-
#define NM_DEVICE_PRODUCT "product"
-
-

-

-
-
-
-

NMDevice

-
typedef struct _NMDevice NMDevice;
-

-

-
-
-
-

NMDeviceClass

-
typedef struct {
-	NMObjectClass parent;
-
-	/* Signals */
-	void (*state_changed) (NMDevice *device,
-	                       NMDeviceState new_state,
-	                       NMDeviceState old_state,
-	                       NMDeviceStateReason reason);
-
-	gboolean (*connection_compatible) (NMDevice *device,
-	                                   NMConnection *connection,
-	                                   GError **error);
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMDeviceClass;
-
-

-

-
-
-
-

nm_device_new ()

-
GObject *           nm_device_new                       (DBusGConnection *connection,
-                                                         const char *path);
-

-Creates a new NMDevice. -

-
+
--+++ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + - - + + +

connection :

the DBusGConnection - +NMActiveConnection *active-connectionRead
gbooleanautoconnectRead / Write
+NMObjectArray *available-connectionsRead
guintcapabilitiesRead
guintdevice-typeRead
+NMDHCP4Config *dhcp4-configRead
+NMDHCP6Config *dhcp6-configRead
+gchar *driverRead
+gchar *driver-versionRead
gbooleanfirmware-missingRead
+gchar *firmware-versionRead
+gchar *interfaceRead
+gchar *ip-interfaceRead
+NMIP4Config *ip4-configRead
+NMIP6Config *ip6-configRead
gbooleanmanagedRead
+gchar *productRead
guintstateRead
GValueArray_guint+guint_*state-reasonRead

path :

the DBus object path of the device +gchar *udiRead

Returns :

a new device. [transfer full] - +gchar *vendorRead
-
-
-

nm_device_get_iface ()

-
const char *        nm_device_get_iface                 (NMDevice *device);
-

-Gets the interface name of the NMDevice. -

-
+
+

Signals

+
+++++ + + + + + +
voidstate-changedRun First
+
+
+

Types and Values

+
--++ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + +

device :

a NMDevice -#defineNM_DEVICE_DEVICE_TYPE
#defineNM_DEVICE_UDI
#defineNM_DEVICE_INTERFACE
#defineNM_DEVICE_IP_INTERFACE
#defineNM_DEVICE_DRIVER
#defineNM_DEVICE_DRIVER_VERSION
#defineNM_DEVICE_FIRMWARE_VERSION
#defineNM_DEVICE_CAPABILITIES
#defineNM_DEVICE_MANAGED
#defineNM_DEVICE_AUTOCONNECT
#defineNM_DEVICE_FIRMWARE_MISSING
#defineNM_DEVICE_IP4_CONFIG
#defineNM_DEVICE_DHCP4_CONFIG
#defineNM_DEVICE_IP6_CONFIG
#defineNM_DEVICE_DHCP6_CONFIG
#defineNM_DEVICE_STATE
#defineNM_DEVICE_STATE_REASON
#defineNM_DEVICE_ACTIVE_CONNECTION
#defineNM_DEVICE_AVAILABLE_CONNECTIONS
#defineNM_DEVICE_VENDOR

Returns :

the interface of the device. This is the internal string used by the -device, and must not be modified.#defineNM_DEVICE_PRODUCT
-
-
-

nm_device_get_ip_iface ()

-
const char *        nm_device_get_ip_iface              (NMDevice *device);
+
+

Object Hierarchy

+
    GObject
+    ╰── NMObject
+        ╰── NMDevice
+            ├── NMDeviceEthernet
+            ├── NMDeviceWifi
+            ├── NMDeviceModem
+            ├── NMDeviceBt
+            ├── NMDeviceWimax
+            ├── NMDeviceOlpcMesh
+            ├── NMDeviceAdsl
+            ├── NMDeviceInfiniband
+            ├── NMDeviceBond
+            ├── NMDeviceBridge
+            ╰── NMDeviceVlan
+
+
+
+

Description

-Gets the IP interface name of the NMDevice over which IP traffic flows -when the device is in the ACTIVATED state.

-
+ +
+

Functions

+
+

nm_device_new ()

+
GObject *
+nm_device_new (DBusGConnection *connection,
+               const char *path);
+

Creates a new NMDevice.

+
+

Parameters

+
--+++ - - + + + - - + + +

device :

a NMDevice -

connection

the DBusGConnection

 

Returns :

the IP traffic interface of the device. This is the internal string -used by the device, and must not be modified.

path

the DBus object path of the device

 
+
+

Returns

+

a new device.

+

[transfer full]

+
+
-

nm_device_get_device_type ()

-
NMDeviceType        nm_device_get_device_type           (NMDevice *device);
-

-Returns the numeric type of the NMDevice, ie ethernet, wifi, etc. -

-
+

nm_device_get_iface ()

+
const char *
+nm_device_get_iface (NMDevice *device);
+

Gets the interface name of the NMDevice.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

device :

a NMDevice -

Returns :

the device type

device

a NMDevice

 
+
+

Returns

+

the interface of the device. This is the internal string used by the +device, and must not be modified.

+

+
+
-

nm_device_get_udi ()

-
const char *        nm_device_get_udi                   (NMDevice *device);
-

-Gets the Unique Device Identifier of the NMDevice. -

-
+

nm_device_get_ip_iface ()

+
const char *
+nm_device_get_ip_iface (NMDevice *device);
+

Gets the IP interface name of the NMDevice over which IP traffic flows +when the device is in the ACTIVATED state.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

device :

a NMDevice -

Returns :

the Unique Device Identifier of the device. This identifier may be -used to gather more information about the device from various operating -system services like udev or sysfs.

device

a NMDevice

 
+
+

Returns

+

the IP traffic interface of the device. This is the internal string +used by the device, and must not be modified.

+

+
+
-

nm_device_get_driver ()

-
const char *        nm_device_get_driver                (NMDevice *device);
-

-Gets the driver of the NMDevice. -

-
+

nm_device_get_device_type ()

+
NMDeviceType
+nm_device_get_device_type (NMDevice *device);
+

Returns the numeric type of the NMDevice, ie ethernet, wifi, etc.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

device :

a NMDevice -

Returns :

the driver of the device. This is the internal string used by the -device, and must not be modified.

device

a NMDevice

 
+
+

Returns

+

the device type

+

+
+
-

nm_device_get_driver_version ()

-
const char *        nm_device_get_driver_version        (NMDevice *device);
-

-Gets the driver version of the NMDevice. -

-
+

nm_device_get_udi ()

+
const char *
+nm_device_get_udi (NMDevice *device);
+

Gets the Unique Device Identifier of the NMDevice.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

device :

a NMDevice -

Returns :

the version of the device driver. This is the internal string used by the -device, and must not be modified.

device

a NMDevice

 
+
+

Returns

+

the Unique Device Identifier of the device. This identifier may be +used to gather more information about the device from various operating +system services like udev or sysfs.

+

+
+
-

nm_device_get_firmware_version ()

-
const char *        nm_device_get_firmware_version      (NMDevice *device);
-

-Gets the firmware version of the NMDevice. -

-
+

nm_device_get_driver ()

+
const char *
+nm_device_get_driver (NMDevice *device);
+

Gets the driver of the NMDevice.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

device :

a NMDevice -

Returns :

the firmware version of the device. This is the internal string used by the -device, and must not be modified.

device

a NMDevice

 
+
+

Returns

+

the driver of the device. This is the internal string used by the +device, and must not be modified.

+

+
+
-

nm_device_get_capabilities ()

-
NMDeviceCapabilities nm_device_get_capabilities         (NMDevice *device);
-

-Gets the device' capabilities. -

-
+

nm_device_get_driver_version ()

+
const char *
+nm_device_get_driver_version (NMDevice *device);
+

Gets the driver version of the NMDevice.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

device :

a NMDevice -

Returns :

the capabilities

device

a NMDevice

 
+
+

Returns

+

the version of the device driver. This is the internal string used by the +device, and must not be modified.

+

+
+
-

nm_device_get_managed ()

-
gboolean            nm_device_get_managed               (NMDevice *device);
-

-Whether the NMDevice is managed by NetworkManager. -

-
+

nm_device_get_firmware_version ()

+
const char *
+nm_device_get_firmware_version (NMDevice *device);
+

Gets the firmware version of the NMDevice.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

device :

a NMDevice -

Returns :

 -TRUE if the device is managed by NetworkManager

device

a NMDevice

 
+
+

Returns

+

the firmware version of the device. This is the internal string used by the +device, and must not be modified.

+

+
+
-

nm_device_get_autoconnect ()

-
gboolean            nm_device_get_autoconnect           (NMDevice *device);
-

-Whether the NMDevice can be autoconnected. -

-
+

nm_device_get_capabilities ()

+
NMDeviceCapabilities
+nm_device_get_capabilities (NMDevice *device);
+

Gets the device' capabilities.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

device :

a NMDevice -

Returns :

 -TRUE if the device is allowed to be autoconnected

device

a NMDevice

 
+
+

Returns

+

the capabilities

+

+
+
-

nm_device_set_autoconnect ()

-
void                nm_device_set_autoconnect           (NMDevice *device,
-                                                         gboolean autoconnect);
-

-Enables or disables automatic activation of the NMDevice. -

-
+

nm_device_get_managed ()

+
gboolean
+nm_device_get_managed (NMDevice *device);
+

Whether the NMDevice is managed by NetworkManager.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

device :

a NMDevice -

autoconnect :

 -TRUE to enable autoconnecting

device

a NMDevice

 
+
+

Returns

+

TRUE if the device is managed by NetworkManager

+

+
+
-

nm_device_get_firmware_missing ()

-
gboolean            nm_device_get_firmware_missing      (NMDevice *device);
-

-Indicates that firmware required for the device's operation is likely -to be missing. -

-
+

nm_device_get_autoconnect ()

+
gboolean
+nm_device_get_autoconnect (NMDevice *device);
+

Whether the NMDevice can be autoconnected.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

device :

a NMDevice -

Returns :

 -TRUE if firmware required for the device's operation is likely -to be missing.

device

a NMDevice

 
+
+

Returns

+

TRUE if the device is allowed to be autoconnected

+

+
+
-

nm_device_get_ip4_config ()

-
NMIP4Config *       nm_device_get_ip4_config            (NMDevice *device);
-

-Gets the current NMIP4Config associated with the NMDevice. -

-
+

nm_device_set_autoconnect ()

+
void
+nm_device_set_autoconnect (NMDevice *device,
+                           gboolean autoconnect);
+

Enables or disables automatic activation of the NMDevice.

+
+

Parameters

+
--+++ - - + + + - - + + +

device :

a NMDevice -

device

a NMDevice

 

Returns :

the NMIP4Config or NULL if the device is not activated. [transfer none] -

autoconnect

TRUE to enable autoconnecting

 
+
-

nm_device_get_dhcp4_config ()

-
NMDHCP4Config *     nm_device_get_dhcp4_config          (NMDevice *device);
-

-Gets the current NMDHCP4Config associated with the NMDevice. -

-
+

nm_device_get_firmware_missing ()

+
gboolean
+nm_device_get_firmware_missing (NMDevice *device);
+

Indicates that firmware required for the device's operation is likely +to be missing.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

device :

a NMDevice -

Returns :

the NMDHCP4Config or NULL if the device is not activated or not -using DHCP. [transfer none] -

device

a NMDevice

 
+
+

Returns

+

TRUE if firmware required for the device's operation is likely +to be missing.

+

+
+
-

nm_device_get_ip6_config ()

-
NMIP6Config *       nm_device_get_ip6_config            (NMDevice *device);
-

-Gets the current NMIP6Config associated with the NMDevice. -

-
+

nm_device_get_ip4_config ()

+
NMIP4Config *
+nm_device_get_ip4_config (NMDevice *device);
+

Gets the current NMIP4Config associated with the NMDevice.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

device :

a NMDevice -

Returns :

the NMIP6Config or NULL if the device is not activated. [transfer none] -

device

a NMDevice

 
+
+

Returns

+

the NMIP4Config or NULL if the device is not activated.

+

[transfer none]

+
+
-

nm_device_get_dhcp6_config ()

-
NMDHCP6Config *     nm_device_get_dhcp6_config          (NMDevice *device);
-

-Gets the current NMDHCP6Config associated with the NMDevice. -

-
+

nm_device_get_dhcp4_config ()

+
NMDHCP4Config *
+nm_device_get_dhcp4_config (NMDevice *device);
+

Gets the current NMDHCP4Config associated with the NMDevice.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

device :

a NMDevice -

Returns :

the NMDHCP6Config or NULL if the device is not activated or not -using DHCP. [transfer none] -

device

a NMDevice

 
+
+

Returns

+

the NMDHCP4Config or NULL if the device is not activated or not +using DHCP.

+

[transfer none]

+
+
-

nm_device_get_state ()

-
NMDeviceState       nm_device_get_state                 (NMDevice *device);
-

-Gets the current NMDevice state. -

-
+

nm_device_get_ip6_config ()

+
NMIP6Config *
+nm_device_get_ip6_config (NMDevice *device);
+

Gets the current NMIP6Config associated with the NMDevice.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

device :

a NMDevice -

Returns :

the current device state

device

a NMDevice

 
+
+

Returns

+

the NMIP6Config or NULL if the device is not activated.

+

[transfer none]

+
+
-

nm_device_get_state_reason ()

-
NMDeviceState       nm_device_get_state_reason          (NMDevice *device,
-                                                         NMDeviceStateReason *reason);
-

-Gets the current NMDevice state (return value) and the reason for entering -the state (reason argument). -

-
+

nm_device_get_dhcp6_config ()

+
NMDHCP6Config *
+nm_device_get_dhcp6_config (NMDevice *device);
+

Gets the current NMDHCP6Config associated with the NMDevice.

+
+

Parameters

+
--+++ - - - - - - - - - - - - - - + + + + +

device :

a NMDevice -

reason :

location to store reason (NMDeviceStateReason), or NULL. [out][allow-none] -

Returns :

the current device state

device

a NMDevice

 
+
+

Returns

+

the NMDHCP6Config or NULL if the device is not activated or not +using DHCP.

+

[transfer none]

+
+
-

nm_device_get_active_connection ()

-
NMActiveConnection * nm_device_get_active_connection    (NMDevice *device);
-

-Gets the NMActiveConnection object which owns this device during activation. -

-
+

nm_device_get_state ()

+
NMDeviceState
+nm_device_get_state (NMDevice *device);
+

Gets the current NMDevice state.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

device :

a NMDevice -

Returns :

the NMActiveConnection or NULL if the device is -not part of an active connection. [transfer none] -

device

a NMDevice

 
+
+

Returns

+

the current device state

+

+
+
-

nm_device_get_available_connections ()

-
const GPtrArray *   nm_device_get_available_connections (NMDevice *device);
-

-Gets the NMRemoteConnections currently known to the daemon that could -be activated on device. -

-
+

nm_device_get_state_reason ()

+
NMDeviceState
+nm_device_get_state_reason (NMDevice *device,
+                            NMDeviceStateReason *reason);
+

Gets the current NMDevice state (return value) and the reason for entering +the state (reason + argument).

+
+

Parameters

+
--+++ - - + + + - - + + +

device :

a NMDevice -

device

a NMDevice

 

Returns :

the GPtrArray -containing NMRemoteConnections. This is the internal copy used by -the connection, and must not be modified. [element-type NMClient.RemoteConnection] -

reason

location to store reason (NMDeviceStateReason), or NULL.

[out][allow-none]
+
+
+

Returns

+

the current device state

+

+
+ +
+
+

nm_device_get_active_connection ()

+
NMActiveConnection *
+nm_device_get_active_connection (NMDevice *device);
+

Gets the NMActiveConnection object which owns this device during activation.

+
+

Parameters

+
+++++ + + + + + +

device

a NMDevice

 
+
+
+

Returns

+

the NMActiveConnection or NULL if the device is +not part of an active connection.

+

[transfer none]

+
+
+
+
+

nm_device_get_available_connections ()

+
const GPtrArray *
+nm_device_get_available_connections (NMDevice *device);
+

Gets the NMRemoteConnections currently known to the daemon that could +be activated on device +.

+
+

Parameters

+
+++++ + + + + + +

device

a NMDevice

 
+
+
+

Returns

+

the GPtrArray +containing NMRemoteConnections. This is the internal copy used by +the connection, and must not be modified.

+

[element-type NMClient.RemoteConnection]

+

Since 0.9.8

-

nm_device_get_product ()

-
const char *        nm_device_get_product               (NMDevice *device);
-

-Gets the product string of the NMDevice. -

-
+

nm_device_get_product ()

+
const char *
+nm_device_get_product (NMDevice *device);
+

Gets the product string of the NMDevice.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

device :

a NMDevice -

Returns :

the product name of the device. This is the internal string used by the -device, and must not be modified.

device

a NMDevice

 
+
+

Returns

+

the product name of the device. This is the internal string used by the +device, and must not be modified.

+

+
+
-

nm_device_get_vendor ()

-
const char *        nm_device_get_vendor                (NMDevice *device);
-

-Gets the vendor string of the NMDevice. -

-
+

nm_device_get_vendor ()

+
const char *
+nm_device_get_vendor (NMDevice *device);
+

Gets the vendor string of the NMDevice.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

device :

a NMDevice -

Returns :

the vendor name of the device. This is the internal string used by the -device, and must not be modified.

device

a NMDevice

 
+
+

Returns

+

the vendor name of the device. This is the internal string used by the +device, and must not be modified.

+

+
+
-

NMDeviceDeactivateFn ()

-
void                (*NMDeviceDeactivateFn)             (NMDevice *device,
-                                                         GError *error,
-                                                         gpointer user_data);
+

NMDeviceDeactivateFn ()

+
void
+(*NMDeviceDeactivateFn) (NMDevice *device,
+                         GError *error,
+                         gpointer user_data);

-

nm_device_disconnect ()

-
void                nm_device_disconnect                (NMDevice *device,
-                                                         NMDeviceDeactivateFn callback,
-                                                         gpointer user_data);
-

-Disconnects the device if currently connected, and prevents the device from +

nm_device_disconnect ()

+
void
+nm_device_disconnect (NMDevice *device,
+                      NMDeviceDeactivateFn callback,
+                      gpointer user_data);
+

Disconnects the device if currently connected, and prevents the device from automatically connecting to networks until the next manual network connection -request. -

-
+request.

+
+

Parameters

+
--+++ - - + + + - - + + + - - + + +

device :

a NMDevice -

device

a NMDevice

 

callback :

callback to be called when disconnect -operation completes. [scope async][allow-none] -

callback

callback to be called when disconnect +operation completes.

[scope async][allow-none]

user_data :

caller-specific data passed to callback. [closure] -

user_data

caller-specific data passed to callback +.

[closure]
+
-

nm_device_filter_connections ()

-
GSList *            nm_device_filter_connections        (NMDevice *device,
-                                                         const GSList *connections);
-

-Filters a given list of connections for a given NMDevice object and return +

nm_device_filter_connections ()

+
GSList *
+nm_device_filter_connections (NMDevice *device,
+                              const GSList *connections);
+

Filters a given list of connections for a given NMDevice object and return connections which may be activated with the device. For example if device + is a WiFi device that supports only WEP encryption, the returned list will -contain any WiFi connections in connections that allow connection to +contain any WiFi connections in connections + that allow connection to unencrypted or WEP-enabled SSIDs. The returned list will not contain Ethernet, Bluetooth, WiFi WPA connections, or any other connection that is incompatible with the device. To get the full list of connections see -nm_remote_settings_list_connections(). -

-
+nm_remote_settings_list_connections().

+
+

Parameters

+
--+++ - - - - - - + + + - - + + +

device :

an NMDevice to filter connections for

connections :

a list of NMConnection objects to filter. [element-type NetworkManager.Connection] -

device

an NMDevice to filter connections for

 

Returns :

a -list of NMConnection objects that could be activated with the given device. -The elements of the list are owned by their creator and should not be freed -by the caller, but the returned list itself is owned by the caller and should -be freed with g_slist_free() when it is no longer required. [transfer container][element-type NetworkManager.Connection] -

connections

a list of NMConnection objects to filter.

[element-type NetworkManager.Connection]
+
+

Returns

+

a +list of NMConnection objects that could be activated with the given device +. +The elements of the list are owned by their creator and should not be freed +by the caller, but the returned list itself is owned by the caller and should +be freed with g_slist_free() when it is no longer required.

+

[transfer container][element-type NetworkManager.Connection]

+
+
-

nm_device_connection_valid ()

-
gboolean            nm_device_connection_valid          (NMDevice *device,
-                                                         NMConnection *connection);
-

-Validates a given connection for a given NMDevice object and returns +

nm_device_connection_valid ()

+
gboolean
+nm_device_connection_valid (NMDevice *device,
+                            NMConnection *connection);
+

Validates a given connection for a given NMDevice object and returns whether the connection may be activated with the device. For example if -device is a WiFi device that supports only WEP encryption, the connection +device + is a WiFi device that supports only WEP encryption, the connection will only be valid if it is a WiFi connection which describes a WEP or open network, and will not be valid if it describes a WPA network, or if it is an Ethernet, Bluetooth, WWAN, etc connection that is incompatible with the -device. -

-
+device.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + +

device :

an NMDevice to validate connection against

connection :

an NMConnection to validate against device -

device

an NMDevice to validate connection +against

 

Returns :

 -TRUE if the connection may be activated with this device, FALSE -if is incompatible with the device's capabilities and characteristics.

connection

an NMConnection to validate against device +

 
+
+

Returns

+

TRUE if the connection may be activated with this device, FALSE +if is incompatible with the device's capabilities and characteristics.

+

+
+
-

nm_device_connection_compatible ()

-
gboolean            nm_device_connection_compatible     (NMDevice *device,
-                                                         NMConnection *connection,
-                                                         GError **error);
-

-Validates a given connection for a given NMDevice object and returns +

nm_device_connection_compatible ()

+
gboolean
+nm_device_connection_compatible (NMDevice *device,
+                                 NMConnection *connection,
+                                 GError **error);
+

Validates a given connection for a given NMDevice object and returns whether the connection may be activated with the device. For example if -device is a WiFi device that supports only WEP encryption, the connection +device + is a WiFi device that supports only WEP encryption, the connection will only be valid if it is a WiFi connection which describes a WEP or open network, and will not be valid if it describes a WPA network, or if it is an Ethernet, Bluetooth, WWAN, etc connection that is incompatible with the -device. -

-

-This function does the same as nm_device_connection_valid(), i.e. checking +device.

+

This function does the same as nm_device_connection_valid(), i.e. checking compatibility of the given device and connection. But, in addition, it sets -GError when FALSE is returned. -

-
+GError when FALSE is returned.

+
+

Parameters

+
--+++ - - + + + - - - - - - + + + - - + + +

device :

an NMDevice to validate connection against

device

an NMDevice to validate connection +against

 

connection :

an NMConnection to validate against device -

error :

return location for a GError, or NULL -

connection

an NMConnection to validate against device +

 

Returns :

 -TRUE if the connection may be activated with this device, FALSE -if is incompatible with the device's capabilities and characteristics.

error

return location for a GError, or NULL

 
+
+

Returns

+

TRUE if the connection may be activated with this device, FALSE +if is incompatible with the device's capabilities and characteristics.

+

+
+
-

Property Details

+

Types and Values

-

The "active-connection" property

-
  "active-connection"        NMActiveConnection*   : Read
+

NM_DEVICE_DEVICE_TYPE

+
#define NM_DEVICE_DEVICE_TYPE "device-type"
+

-The NMActiveConnection object that "owns" this device during activation.

-

The "autoconnect" property

-
  "autoconnect"              gboolean              : Read / Write
+

NM_DEVICE_UDI

+
#define NM_DEVICE_UDI "udi"
+

-Whether the device can auto-activate a connection.

-

Default value: TRUE

-

The "available-connections" property

-
  "available-connections"    NMObjectArray*        : Read
+

NM_DEVICE_INTERFACE

+
#define NM_DEVICE_INTERFACE "interface"
+

-The available connections (NMRemoteConnection) of the device

-

Since 0.9.8

-

The "capabilities" property

-
  "capabilities"             guint                 : Read
+

NM_DEVICE_IP_INTERFACE

+
#define NM_DEVICE_IP_INTERFACE "ip-interface"
+

-The capabilities of the device.

-

Default value: 0

-

The "device-type" property

-
  "device-type"              guint                 : Read
+

NM_DEVICE_DRIVER

+
#define NM_DEVICE_DRIVER "driver"
+

-The numeric type of the device.

-

Default value: 0

-

The "dhcp4-config" property

-
  "dhcp4-config"             NMDHCP4Config*        : Read
+

NM_DEVICE_DRIVER_VERSION

+
#define NM_DEVICE_DRIVER_VERSION "driver-version"
+

-The NMDHCP4Config of the device.

-

The "dhcp6-config" property

-
  "dhcp6-config"             NMDHCP6Config*        : Read
+

NM_DEVICE_FIRMWARE_VERSION

+
#define NM_DEVICE_FIRMWARE_VERSION "firmware-version"
+

-The NMDHCP6Config of the device.

-

The "driver" property

-
  "driver"                   gchar*                : Read
+

NM_DEVICE_CAPABILITIES

+
#define NM_DEVICE_CAPABILITIES "capabilities"
+

-The driver of the device.

-

Default value: NULL

-

The "driver-version" property

-
  "driver-version"           gchar*                : Read
+

NM_DEVICE_MANAGED

+
#define NM_DEVICE_MANAGED "managed"
+

-The version of the device driver.

-

Default value: NULL

-

The "firmware-missing" property

-
  "firmware-missing"         gboolean              : Read
+

NM_DEVICE_AUTOCONNECT

+
#define NM_DEVICE_AUTOCONNECT "autoconnect"
+

-When TRUE indicates the device is likely missing firmware required -for its operation.

-

Default value: FALSE

-

The "firmware-version" property

-
  "firmware-version"         gchar*                : Read
+

NM_DEVICE_FIRMWARE_MISSING

+
#define NM_DEVICE_FIRMWARE_MISSING "firmware-missing"
+

-The firmware version of the device.

-

Default value: NULL

-

The "interface" property

-
  "interface"                gchar*                : Read
+

NM_DEVICE_IP4_CONFIG

+
#define NM_DEVICE_IP4_CONFIG "ip4-config"
+

-The interface of the device.

-

Default value: NULL

-

The "ip-interface" property

-
  "ip-interface"             gchar*                : Read
+

NM_DEVICE_DHCP4_CONFIG

+
#define NM_DEVICE_DHCP4_CONFIG "dhcp4-config"
+

-The IP interface of the device which should be used for all IP-related -operations like addressing and routing.

-

Default value: NULL

-

The "ip4-config" property

-
  "ip4-config"               NMIP4Config*          : Read
+

NM_DEVICE_IP6_CONFIG

+
#define NM_DEVICE_IP6_CONFIG "ip6-config"
+

-The NMIP4Config of the device.

-

The "ip6-config" property

-
  "ip6-config"               NMIP6Config*          : Read
+

NM_DEVICE_DHCP6_CONFIG

+
#define NM_DEVICE_DHCP6_CONFIG "dhcp6-config"
+

-The NMIP6Config of the device.

-

The "managed" property

-
  "managed"                  gboolean              : Read
+

NM_DEVICE_STATE

+
#define NM_DEVICE_STATE "state"
+

-Whether the device is managed by NetworkManager.

-

Default value: FALSE

-

The "product" property

-
  "product"                  gchar*                : Read
+

NM_DEVICE_STATE_REASON

+
#define NM_DEVICE_STATE_REASON "state-reason"
+

-The product string of the device.

-

Default value: NULL

-

The "state" property

-
  "state"                    guint                 : Read
+

NM_DEVICE_ACTIVE_CONNECTION

+
#define NM_DEVICE_ACTIVE_CONNECTION "active-connection"
+

-The state of the device.

-

Default value: 0

-

The "state-reason" property

-
  "state-reason"             GValueArray_guint+guint_*  : Read
+

NM_DEVICE_AVAILABLE_CONNECTIONS

+
#define NM_DEVICE_AVAILABLE_CONNECTIONS "available-connections"
+

-The state and reason of the device.

-

The "udi" property

-
  "udi"                      gchar*                : Read
+

NM_DEVICE_VENDOR

+
#define NM_DEVICE_VENDOR "vendor"
+

-An operating-system specific device hardware identifier; this is not -unique to a specific hardware device across reboots or hotplugs. It -is an opaque string which for some device types (Bluetooth, Modem) -contains an identifier provided by the underlying hardware service daemon -such as Bluez or ModemManager, and clients can use this property to -request more information about the device from those services.

-

Default value: NULL

-

The "vendor" property

-
  "vendor"                   gchar*                : Read
+

NM_DEVICE_PRODUCT

+
#define NM_DEVICE_PRODUCT "product"
+

-The vendor string of the device.

+
+
+
+

Property Details

+
+

The “active-connection” property

+
  “active-connection”        NMActiveConnection *
+

Active Connection.

+

Flags: Read

+
+
+
+

The “autoconnect” property

+
  “autoconnect”              gboolean
+

Autoconnect.

+

Flags: Read / Write

+

Default value: TRUE

+
+
+
+

The “available-connections” property

+
  “available-connections”    NMObjectArray *
+

Available Connections.

+

Flags: Read

+

Since 0.9.8

+
+
+
+

The “capabilities” property

+
  “capabilities”             guint
+

Capabilities.

+

Flags: Read

+

Default value: 0

+
+
+
+

The “device-type” property

+
  “device-type”              guint
+

Numeric device type (ie ethernet, wifi, etc).

+

Flags: Read

+

Default value: 0

+
+
+
+

The “dhcp4-config” property

+
  “dhcp4-config”             NMDHCP4Config *
+

DHCP4 Config.

+

Flags: Read

+
+
+
+

The “dhcp6-config” property

+
  “dhcp6-config”             NMDHCP6Config *
+

DHCP6 Config.

+

Flags: Read

+
+
+
+

The “driver” property

+
  “driver”                   gchar *
+

Driver.

+

Flags: Read

+

Default value: NULL

+
+
+
+

The “driver-version” property

+
  “driver-version”           gchar *
+

Driver Version.

+

Flags: Read

+

Default value: NULL

+
+
+
+

The “firmware-missing” property

+
  “firmware-missing”         gboolean
+

Firmware missing.

+

Flags: Read

+

Default value: FALSE

+
+
+
+

The “firmware-version” property

+
  “firmware-version”         gchar *
+

Firmware Version.

+

Flags: Read

+

Default value: NULL

+
+
+
+

The “interface” property

+
  “interface”                gchar *
+

Interface name.

+

Flags: Read

+

Default value: NULL

+
+
+
+

The “ip-interface” property

+
  “ip-interface”             gchar *
+

IP Interface name.

+

Flags: Read

+

Default value: NULL

+
+
+
+

The “ip4-config” property

+
  “ip4-config”               NMIP4Config *
+

IP4 Config.

+

Flags: Read

+
+
+
+

The “ip6-config” property

+
  “ip6-config”               NMIP6Config *
+

IP6 Config.

+

Flags: Read

+
+
+
+

The “managed” property

+
  “managed”                  gboolean
+

Managed.

+

Flags: Read

+

Default value: FALSE

+
+
+
+

The “product” property

+
  “product”                  gchar *
+

Product string.

+

Flags: Read

+

Default value: NULL

+
+
+
+

The “state” property

+
  “state”                    guint
+

State.

+

Flags: Read

+

Default value: 0

+
+
+
+

The “state-reason” property

+
  “state-reason”             GValueArray_guint+guint_*
+

StateReason.

+

Flags: Read

+
+
+
+

The “udi” property

+
  “udi”                      gchar *
+

Unique Device Identifier.

+

Flags: Read

+

Default value: NULL

+
+
+
+

The “vendor” property

+
  “vendor”                   gchar *
+

Vendor string.

+

Flags: Read

Default value: NULL

Signal Details

-

The "state-changed" signal

-
void                user_function                      (NMDevice *device,
-                                                        guint     new_state,
-                                                        guint     old_state,
-                                                        guint     reason,
-                                                        gpointer  user_data)      : Run First
-

-Notifies the state change of a NMDevice. -

-
---- - - - - - - - - - - - - - - - - - - - - - - -

device :

the device object that received the signal

new_state :

the new state of the device

old_state :

the previous state of the device

reason :

the reason describing the state change

user_data :

user data set when the signal handler was connected.
+

The “state-changed” signal

+
void
+user_function (NMDevice *device,
+               guint     new_state,
+               guint     old_state,
+               guint     reason,
+               gpointer  user_data)
+

Flags: Run First

- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20 \ No newline at end of file diff --git a/docs/libnm-glib/html/NMDeviceAdsl.html b/docs/libnm-glib/html/NMDeviceAdsl.html index 8f20351f..fef737a4 100644 --- a/docs/libnm-glib/html/NMDeviceAdsl.html +++ b/docs/libnm-glib/html/NMDeviceAdsl.html @@ -2,36 +2,28 @@ -NMDeviceAdsl +libnm-glib Reference Manual: NMDeviceAdsl - + - - - - - - - - - - + + + + + + +
@@ -39,40 +31,87 @@

NMDeviceAdsl

NMDeviceAdsl

- +
-
-

Synopsis

-
enum                NMDeviceAdslError;
-#define             NM_DEVICE_ADSL_ERROR
-GQuark              nm_device_adsl_error_quark          (void);
-#define             NM_DEVICE_ADSL_CARRIER
-                    NMDeviceAdsl;
-                    NMDeviceAdslClass;
-GObject *           nm_device_adsl_new                  (DBusGConnection *connection,
-                                                         const char *path);
-gboolean            nm_device_adsl_get_carrier          (NMDeviceAdsl *device);
-
+
+

Functions

+
++++ + + + + + + + + + + + + + + +
+GQuark + +nm_device_adsl_error_quark () +
+GObject * + +nm_device_adsl_new () +
+gboolean + +nm_device_adsl_get_carrier () +
-

Object Hierarchy

-
-  GObject
-   +----NMObject
-         +----NMDevice
-               +----NMDeviceAdsl
-
+

Properties

+
+++++ + + + + + +
gbooleancarrierRead
-

Implemented Interfaces

-

-NMDeviceAdsl implements - GInitable and GAsyncInitable.

+

Types and Values

+
++++ + + + + + + + + + + + + + + +
enumNMDeviceAdslError
#defineNM_DEVICE_ADSL_ERROR
#defineNM_DEVICE_ADSL_CARRIER
-

Properties

-
-  "carrier"                  gboolean              : Read
+
Object Hierarchy

+
    GObject
+    ╰── NMObject
+        ╰── NMDevice
+            ╰── NMDeviceAdsl
@@ -81,170 +120,149 @@ NMDeviceAdsl implements

-

Details

+

Functions

-

enum NMDeviceAdslError

-
typedef enum {
-	NM_DEVICE_ADSL_ERROR_UNKNOWN = 0,             /*< nick=UnknownError >*/
-	NM_DEVICE_ADSL_ERROR_NOT_ADSL_CONNECTION,     /*< nick=NotAdslConnection >*/
-	NM_DEVICE_ADSL_ERROR_INVALID_ADSL_CONNECTION, /*< nick=InvalidAdslConnection >*/
-} NMDeviceAdslError;
-
-
+

nm_device_adsl_error_quark ()

+
GQuark
+nm_device_adsl_error_quark (void);
+

Registers an error quark for NMDeviceAdsl if necessary.

+
+

Returns

+

the error quark used for NMDeviceAdsl errors.

+

+
+ +
+
+

nm_device_adsl_new ()

+
GObject *
+nm_device_adsl_new (DBusGConnection *connection,
+                    const char *path);
+

Creates a new NMDeviceAdsl.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + +

NM_DEVICE_ADSL_ERROR_UNKNOWN

unknown or unclassified error -

NM_DEVICE_ADSL_ERROR_NOT_ADSL_CONNECTION

the connection was not of ADSL type -

connection

the DBusGConnection

 

NM_DEVICE_ADSL_ERROR_INVALID_ADSL_CONNECTION

the ADSL connection was invalid -

path

the DBus object path of the device

 
-
-
-

NM_DEVICE_ADSL_ERROR

-
#define NM_DEVICE_ADSL_ERROR nm_device_adsl_error_quark ()
-
-

-

+
+

Returns

+

a new device.

+

[transfer full]

+
-

nm_device_adsl_error_quark ()

-
GQuark              nm_device_adsl_error_quark          (void);
-

-Registers an error quark for NMDeviceAdsl if necessary. -

-
+

nm_device_adsl_get_carrier ()

+
gboolean
+nm_device_adsl_get_carrier (NMDeviceAdsl *device);
+

Whether the device has carrier.

+
+

Parameters

+
--+++ - - + + +

Returns :

the error quark used for NMDeviceAdsl errors.

device

a NMDeviceAdsl

 
-
-
-

NM_DEVICE_ADSL_CARRIER

-
#define NM_DEVICE_ADSL_CARRIER "carrier"
-
-

-

+
+

Returns

+

TRUE if the device has carrier

+

-
-
-

NMDeviceAdsl

-
typedef struct _NMDeviceAdsl NMDeviceAdsl;
-

-

-
-
-

NMDeviceAdslClass

-
typedef struct {
-	NMDeviceClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMDeviceAdslClass;
-
-

-

-
+
+

Types and Values

-

nm_device_adsl_new ()

-
GObject *           nm_device_adsl_new                  (DBusGConnection *connection,
-                                                         const char *path);
-

-Creates a new NMDeviceAdsl. -

-
+

enum NMDeviceAdslError

+
+

Members

+
--+++ - - + + - - + + + - - + +

connection :

the DBusGConnection +

NM_DEVICE_ADSL_ERROR_UNKNOWN

 +

unknown or unclassified error

 

path :

the DBus object path of the device

NM_DEVICE_ADSL_ERROR_NOT_ADSL_CONNECTION

 +

the connection was not of ADSL type

+		 

Returns :

a new device. [transfer full] +

NM_DEVICE_ADSL_ERROR_INVALID_ADSL_CONNECTION

 +

the ADSL connection was invalid

 
+
-

nm_device_adsl_get_carrier ()

-
gboolean            nm_device_adsl_get_carrier          (NMDeviceAdsl *device);
+

NM_DEVICE_ADSL_ERROR

+
#define NM_DEVICE_ADSL_ERROR nm_device_adsl_error_quark ()
+
+

+

+
+
+
+

NM_DEVICE_ADSL_CARRIER

+
#define NM_DEVICE_ADSL_CARRIER "carrier"
+

-Whether the device has carrier.

-
---- - - - - - - - - - - -

device :

a NMDeviceAdsl -

Returns :

 -TRUE if the device has carrier

Property Details

-

The "carrier" property

-
  "carrier"                  gboolean              : Read
-

-Whether the device has carrier. -

+

The “carrier” property

+
  “carrier”                  gboolean
+

Carrier.

+

Flags: Read

Default value: FALSE

- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20
\ No newline at end of file diff --git a/docs/libnm-glib/html/NMDeviceBond.html b/docs/libnm-glib/html/NMDeviceBond.html index 00223fb2..d86a8f04 100644 --- a/docs/libnm-glib/html/NMDeviceBond.html +++ b/docs/libnm-glib/html/NMDeviceBond.html @@ -2,36 +2,28 @@ -NMDeviceBond +libnm-glib Reference Manual: NMDeviceBond - + - - - - - - - - - - + + + + + + +
@@ -39,46 +31,123 @@

NMDeviceBond

NMDeviceBond

- +
-
-

Synopsis

-
enum                NMDeviceBondError;
-#define             NM_DEVICE_BOND_ERROR
-GQuark              nm_device_bond_error_quark          (void);
-#define             NM_DEVICE_BOND_HW_ADDRESS
-#define             NM_DEVICE_BOND_CARRIER
-#define             NM_DEVICE_BOND_SLAVES
-                    NMDeviceBond;
-                    NMDeviceBondClass;
-GObject *           nm_device_bond_new                  (DBusGConnection *connection,
-                                                         const char *path);
-const char *        nm_device_bond_get_hw_address       (NMDeviceBond *device);
-gboolean            nm_device_bond_get_carrier          (NMDeviceBond *device);
-const GPtrArray *   nm_device_bond_get_slaves           (NMDeviceBond *device);
-
+
+

Functions

+
++++ + + + + + + + + + + + + + + + + + + + + + + +
+GQuark + +nm_device_bond_error_quark () +
+GObject * + +nm_device_bond_new () +
const char * + +nm_device_bond_get_hw_address () +
+gboolean + +nm_device_bond_get_carrier () +
const GPtrArray * + +nm_device_bond_get_slaves () +
-

Object Hierarchy

-
-  GObject
-   +----NMObject
-         +----NMDevice
-               +----NMDeviceBond
-
+

Properties

+
+++++ + + + + + + + + + + + + + + + + + +
gbooleancarrierRead
+gchar *hw-addressRead
+NMObjectArray *slavesRead
-

Implemented Interfaces

-

-NMDeviceBond implements - GInitable and GAsyncInitable.

+

Types and Values

+
++++ + + + + + + + + + + + + + + + + + + + + + + +
enumNMDeviceBondError
#defineNM_DEVICE_BOND_ERROR
#defineNM_DEVICE_BOND_HW_ADDRESS
#defineNM_DEVICE_BOND_CARRIER
#defineNM_DEVICE_BOND_SLAVES
-

Properties

-
-  "carrier"                  gboolean              : Read
-  "hw-address"               gchar*                : Read
-  "slaves"                   NMObjectArray*        : Read
+
Object Hierarchy

+
    GObject
+    ╰── NMObject
+        ╰── NMDevice
+            ╰── NMDeviceBond
@@ -87,265 +156,248 @@ NMDeviceBond implements

-

Details

+

Functions

-

enum NMDeviceBondError

-
typedef enum {
-	NM_DEVICE_BOND_ERROR_UNKNOWN = 0,             /*< nick=UnknownError >*/
-	NM_DEVICE_BOND_ERROR_NOT_BOND_CONNECTION,     /*< nick=NotBondConnection >*/
-	NM_DEVICE_BOND_ERROR_INVALID_BOND_CONNECTION, /*< nick=InvalidBondConnection >*/
-	NM_DEVICE_BOND_ERROR_INTERFACE_MISMATCH,      /*< nick=InterfaceMismatch >*/
-} NMDeviceBondError;
-
-
+

nm_device_bond_error_quark ()

+
GQuark
+nm_device_bond_error_quark (void);
+

Registers an error quark for NMDeviceBond if necessary.

+
+

Returns

+

the error quark used for NMDeviceBond errors.

+

+
+ +
+
+

nm_device_bond_new ()

+
GObject *
+nm_device_bond_new (DBusGConnection *connection,
+                    const char *path);
+

Creates a new NMDeviceBond.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + - - + + +

NM_DEVICE_BOND_ERROR_UNKNOWN

unknown or unclassified error -

NM_DEVICE_BOND_ERROR_NOT_BOND_CONNECTION

the connection was not of bond type -

NM_DEVICE_BOND_ERROR_INVALID_BOND_CONNECTION

the bond connection was invalid -

connection

the DBusGConnection

 

NM_DEVICE_BOND_ERROR_INTERFACE_MISMATCH

the interfaces of the connection and the device mismatched -

path

the DBus object path of the device

 
-
-
-

NM_DEVICE_BOND_ERROR

-
#define NM_DEVICE_BOND_ERROR nm_device_bond_error_quark ()
-
-

-

+
+

Returns

+

a new device.

+

[transfer full]

+
-

nm_device_bond_error_quark ()

-
GQuark              nm_device_bond_error_quark          (void);
-

-Registers an error quark for NMDeviceBond if necessary. -

-
+

nm_device_bond_get_hw_address ()

+
const char *
+nm_device_bond_get_hw_address (NMDeviceBond *device);
+

Gets the hardware (MAC) address of the NMDeviceBond

+
+

Parameters

+
--+++ - - + + +

Returns :

the error quark used for NMDeviceBond errors.

device

a NMDeviceBond

 
-
-
-

NM_DEVICE_BOND_HW_ADDRESS

-
#define NM_DEVICE_BOND_HW_ADDRESS  "hw-address"
-
-

-

+
+

Returns

+

the hardware address. This is the internal string used by the +device, and must not be modified.

+

-
-
-

NM_DEVICE_BOND_CARRIER

-
#define NM_DEVICE_BOND_CARRIER     "carrier"
-
-

-

-

NM_DEVICE_BOND_SLAVES

-
#define NM_DEVICE_BOND_SLAVES      "slaves"
-
-

-

+

nm_device_bond_get_carrier ()

+
gboolean
+nm_device_bond_get_carrier (NMDeviceBond *device);
+

Whether the device has carrier.

+
+

Parameters

+
+++++ + + + + + +

device

a NMDeviceBond

 
+
+
+

Returns

+

TRUE if the device has carrier

+

-
-
-

NMDeviceBond

-
typedef struct _NMDeviceBond NMDeviceBond;
-

-

-

NMDeviceBondClass

-
typedef struct {
-	NMDeviceClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMDeviceBondClass;
-
-

-

+

nm_device_bond_get_slaves ()

+
const GPtrArray *
+nm_device_bond_get_slaves (NMDeviceBond *device);
+

Gets the devices currently slaved to device +.

+
+

Parameters

+
+++++ + + + + + +

device

a NMDeviceBond

 
-
+
+

Returns

+

the GPtrArray containing +NMDevices that are slaves of device +. This is the internal +copy used by the device, and must not be modified.

+

[element-type NMClient.Device]

+
+

Since 0.9.6.4

+
+
+
+

Types and Values

-

nm_device_bond_new ()

-
GObject *           nm_device_bond_new                  (DBusGConnection *connection,
-                                                         const char *path);
-

-Creates a new NMDeviceBond. -

-
+

enum NMDeviceBondError

+
+

Members

+
--+++ - - + + + + + + + - - + + + - - + +

connection :

the DBusGConnection +

NM_DEVICE_BOND_ERROR_UNKNOWN

 +

unknown or unclassified error

+		 

NM_DEVICE_BOND_ERROR_NOT_BOND_CONNECTION

 +

the connection was not of bond type

 

path :

the DBus object path of the device

NM_DEVICE_BOND_ERROR_INVALID_BOND_CONNECTION

 +

the bond connection was invalid

+		 

Returns :

a new device. [transfer full] +

NM_DEVICE_BOND_ERROR_INTERFACE_MISMATCH

 +

the interfaces of the connection and the device mismatched

 
+
-

nm_device_bond_get_hw_address ()

-
const char *        nm_device_bond_get_hw_address       (NMDeviceBond *device);
+

NM_DEVICE_BOND_ERROR

+
#define NM_DEVICE_BOND_ERROR nm_device_bond_error_quark ()
+

-Gets the hardware (MAC) address of the NMDeviceBond

-
---- - - - - - - - - - - -

device :

a NMDeviceBond -

Returns :

the hardware address. This is the internal string used by the -device, and must not be modified.
-

nm_device_bond_get_carrier ()

-
gboolean            nm_device_bond_get_carrier          (NMDeviceBond *device);
+

NM_DEVICE_BOND_HW_ADDRESS

+
#define NM_DEVICE_BOND_HW_ADDRESS  "hw-address"
+

-Whether the device has carrier.

-
---- - - - - - - - - - - -

device :

a NMDeviceBond -

Returns :

 -TRUE if the device has carrier
-

nm_device_bond_get_slaves ()

-
const GPtrArray *   nm_device_bond_get_slaves           (NMDeviceBond *device);
+

NM_DEVICE_BOND_CARRIER

+
#define NM_DEVICE_BOND_CARRIER     "carrier"
+
+

+

+
+
+
+

NM_DEVICE_BOND_SLAVES

+
#define NM_DEVICE_BOND_SLAVES      "slaves"
+

-Gets the devices currently slaved to device.

-
---- - - - - - - - - - - -

device :

a NMDeviceBond -

Returns :

the GPtrArray containing -NMDevices that are slaves of device. This is the internal -copy used by the device, and must not be modified. [element-type NMClient.Device] -
-

Since 0.9.6.4

Property Details

-

The "carrier" property

-
  "carrier"                  gboolean              : Read
-

-Whether the device has carrier. -

+

The “carrier” property

+
  “carrier”                  gboolean
+

Carrier.

+

Flags: Read

Default value: FALSE

-

The "hw-address" property

-
  "hw-address"               gchar*                : Read
-

-The hardware (MAC) address of the device. -

+

The “hw-address” property

+
  “hw-address”               gchar *
+

Currently set hardware MAC address.

+

Flags: Read

Default value: NULL

-

The "slaves" property

-
  "slaves"                   NMObjectArray*        : Read
-

-The devices (NMDevice) slaved to the bond device. -

+

The “slaves” property

+
  “slaves”                   NMObjectArray *
+

Slaves.

+

Flags: Read

Since 0.9.8

- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20
\ No newline at end of file diff --git a/docs/libnm-glib/html/NMDeviceBridge.html b/docs/libnm-glib/html/NMDeviceBridge.html index a7f2df30..6ef3f5e4 100644 --- a/docs/libnm-glib/html/NMDeviceBridge.html +++ b/docs/libnm-glib/html/NMDeviceBridge.html @@ -2,36 +2,28 @@ -NMDeviceBridge +libnm-glib Reference Manual: NMDeviceBridge - + - - - - - - - - - - + + + + + + +
@@ -39,46 +31,123 @@

NMDeviceBridge

NMDeviceBridge

- +
-
-

Synopsis

-
enum                NMDeviceBridgeError;
-#define             NM_DEVICE_BRIDGE_ERROR
-GQuark              nm_device_bridge_error_quark        (void);
-#define             NM_DEVICE_BRIDGE_HW_ADDRESS
-#define             NM_DEVICE_BRIDGE_CARRIER
-#define             NM_DEVICE_BRIDGE_SLAVES
-                    NMDeviceBridge;
-                    NMDeviceBridgeClass;
-GObject *           nm_device_bridge_new                (DBusGConnection *connection,
-                                                         const char *path);
-const char *        nm_device_bridge_get_hw_address     (NMDeviceBridge *device);
-gboolean            nm_device_bridge_get_carrier        (NMDeviceBridge *device);
-const GPtrArray *   nm_device_bridge_get_slaves         (NMDeviceBridge *device);
-
+
+

Functions

+
++++ + + + + + + + + + + + + + + + + + + + + + + +
+GQuark + +nm_device_bridge_error_quark () +
+GObject * + +nm_device_bridge_new () +
const char * + +nm_device_bridge_get_hw_address () +
+gboolean + +nm_device_bridge_get_carrier () +
const GPtrArray * + +nm_device_bridge_get_slaves () +
-

Object Hierarchy

-
-  GObject
-   +----NMObject
-         +----NMDevice
-               +----NMDeviceBridge
-
+

Properties

+
+++++ + + + + + + + + + + + + + + + + + +
gbooleancarrierRead
+gchar *hw-addressRead
+NMObjectArray *slavesRead
-

Implemented Interfaces

-

-NMDeviceBridge implements - GInitable and GAsyncInitable.

+

Types and Values

+
++++ + + + + + + + + + + + + + + + + + + + + + + +
enumNMDeviceBridgeError
#defineNM_DEVICE_BRIDGE_ERROR
#defineNM_DEVICE_BRIDGE_HW_ADDRESS
#defineNM_DEVICE_BRIDGE_CARRIER
#defineNM_DEVICE_BRIDGE_SLAVES
-

Properties

-
-  "carrier"                  gboolean              : Read
-  "hw-address"               gchar*                : Read
-  "slaves"                   NMObjectArray*        : Read
+
Object Hierarchy

+
    GObject
+    ╰── NMObject
+        ╰── NMDevice
+            ╰── NMDeviceBridge
@@ -87,272 +156,255 @@ NMDeviceBridge implements

-

Details

+

Functions

-

enum NMDeviceBridgeError

-
typedef enum {
-	NM_DEVICE_BRIDGE_ERROR_UNKNOWN = 0,               /*< nick=UnknownError >*/
-	NM_DEVICE_BRIDGE_ERROR_NOT_BRIDGE_CONNECTION,     /*< nick=NotBridgeConnection >*/
-	NM_DEVICE_BRIDGE_ERROR_INVALID_BRIDGE_CONNECTION, /*< nick=InvalidBridgeConnection >*/
-	NM_DEVICE_BRIDGE_ERROR_INTERFACE_MISMATCH,        /*< nick=InterfaceMismatch >*/
-} NMDeviceBridgeError;
-
-
+

nm_device_bridge_error_quark ()

+
GQuark
+nm_device_bridge_error_quark (void);
+

Registers an error quark for NMDeviceBridge if necessary.

+
+

Returns

+

the error quark used for NMDeviceBridge errors.

+

+
+

Since 0.9.8

+ +
+
+

nm_device_bridge_new ()

+
GObject *
+nm_device_bridge_new (DBusGConnection *connection,
+                      const char *path);
+

Creates a new NMDeviceBridge.

+
+

Parameters

+
--+++ - - - - - - + + + - - - - - - + + +

NM_DEVICE_BRIDGE_ERROR_UNKNOWN

unknown or unclassified error -

NM_DEVICE_BRIDGE_ERROR_NOT_BRIDGE_CONNECTION

the connection was not of bridge type -

connection

the DBusGConnection

 

NM_DEVICE_BRIDGE_ERROR_INVALID_BRIDGE_CONNECTION

the bridge connection was invalid -

NM_DEVICE_BRIDGE_ERROR_INTERFACE_MISMATCH

the interfaces of the connection and the device mismatched -

path

the DBus object path of the device

 
-

Since 0.9.8

-
-
-

NM_DEVICE_BRIDGE_ERROR

-
#define NM_DEVICE_BRIDGE_ERROR nm_device_bridge_error_quark ()
-
-

-

+
+

Returns

+

a new device.

+

[transfer full]

+
+

Since 0.9.8

-

nm_device_bridge_error_quark ()

-
GQuark              nm_device_bridge_error_quark        (void);
-

-Registers an error quark for NMDeviceBridge if necessary. -

-
+

nm_device_bridge_get_hw_address ()

+
const char *
+nm_device_bridge_get_hw_address (NMDeviceBridge *device);
+

Gets the hardware (MAC) address of the NMDeviceBridge

+
+

Parameters

+
--+++ - - + + +

Returns :

the error quark used for NMDeviceBridge errors.

device

a NMDeviceBridge

 
+
+
+

Returns

+

the hardware address. This is the internal string used by the +device, and must not be modified.

+

+

Since 0.9.8

-

NM_DEVICE_BRIDGE_HW_ADDRESS

-
#define NM_DEVICE_BRIDGE_HW_ADDRESS  "hw-address"
-
-

-

+

nm_device_bridge_get_carrier ()

+
gboolean
+nm_device_bridge_get_carrier (NMDeviceBridge *device);
+

Whether the device has carrier.

+
+

Parameters

+
+++++ + + + + + +

device

a NMDeviceBridge

 
-
-
-

NM_DEVICE_BRIDGE_CARRIER

-
#define NM_DEVICE_BRIDGE_CARRIER     "carrier"
-
-

-

+
+

Returns

+

TRUE if the device has carrier

+

-
-
-

NM_DEVICE_BRIDGE_SLAVES

-
#define NM_DEVICE_BRIDGE_SLAVES      "slaves"
-
-

-

+

Since 0.9.8

-

NMDeviceBridge

-
typedef struct _NMDeviceBridge NMDeviceBridge;
-

-

+

nm_device_bridge_get_slaves ()

+
const GPtrArray *
+nm_device_bridge_get_slaves (NMDeviceBridge *device);
+

Gets the devices currently slaved to device +.

+
+

Parameters

+
+++++ + + + + + +

device

a NMDeviceBridge

 
-
-
-

NMDeviceBridgeClass

-
typedef struct {
-	NMDeviceClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMDeviceBridgeClass;
-
-

-

+
+

Returns

+

the GPtrArray containing +NMDevices that are slaves of device +. This is the internal +copy used by the device, and must not be modified.

+

[element-type NMClient.Device]

-
+

Since 0.9.8

+
+
+
+

Types and Values

-

nm_device_bridge_new ()

-
GObject *           nm_device_bridge_new                (DBusGConnection *connection,
-                                                         const char *path);
-

-Creates a new NMDeviceBridge. -

-
+

enum NMDeviceBridgeError

+
+

Members

+
--+++ - - + + + + + + + - - + + + - - + +

connection :

the DBusGConnection +

NM_DEVICE_BRIDGE_ERROR_UNKNOWN

 +

unknown or unclassified error

+		 

NM_DEVICE_BRIDGE_ERROR_NOT_BRIDGE_CONNECTION

 +

the connection was not of bridge type

 

path :

the DBus object path of the device

NM_DEVICE_BRIDGE_ERROR_INVALID_BRIDGE_CONNECTION

 +

the bridge connection was invalid

+		 

Returns :

a new device. [transfer full] +

NM_DEVICE_BRIDGE_ERROR_INTERFACE_MISMATCH

 +

the interfaces of the connection and the device mismatched

 
+

Since 0.9.8

-

nm_device_bridge_get_hw_address ()

-
const char *        nm_device_bridge_get_hw_address     (NMDeviceBridge *device);
+

NM_DEVICE_BRIDGE_ERROR

+
#define NM_DEVICE_BRIDGE_ERROR nm_device_bridge_error_quark ()
+

-Gets the hardware (MAC) address of the NMDeviceBridge

-
---- - - - - - - - - - - -

device :

a NMDeviceBridge -

Returns :

the hardware address. This is the internal string used by the -device, and must not be modified.
-

Since 0.9.8

-

nm_device_bridge_get_carrier ()

-
gboolean            nm_device_bridge_get_carrier        (NMDeviceBridge *device);
+

NM_DEVICE_BRIDGE_HW_ADDRESS

+
#define NM_DEVICE_BRIDGE_HW_ADDRESS  "hw-address"
+

-Whether the device has carrier.

-
---- - - - - - - - - - - -

device :

a NMDeviceBridge -

Returns :

 -TRUE if the device has carrier
-

Since 0.9.8

-

nm_device_bridge_get_slaves ()

-
const GPtrArray *   nm_device_bridge_get_slaves         (NMDeviceBridge *device);
+

NM_DEVICE_BRIDGE_CARRIER

+
#define NM_DEVICE_BRIDGE_CARRIER     "carrier"
+
+

+

+
+
+
+

NM_DEVICE_BRIDGE_SLAVES

+
#define NM_DEVICE_BRIDGE_SLAVES      "slaves"
+

-Gets the devices currently slaved to device.

-
---- - - - - - - - - - - -

device :

a NMDeviceBridge -

Returns :

the GPtrArray containing -NMDevices that are slaves of device. This is the internal -copy used by the device, and must not be modified. [element-type NMClient.Device] -
-

Since 0.9.8

Property Details

-

The "carrier" property

-
  "carrier"                  gboolean              : Read
-

-Whether the device has carrier. -

+

The “carrier” property

+
  “carrier”                  gboolean
+

Carrier.

+

Flags: Read

Default value: FALSE

Since 0.9.8

-

The "hw-address" property

-
  "hw-address"               gchar*                : Read
-

-The hardware (MAC) address of the device. -

+

The “hw-address” property

+
  “hw-address”               gchar *
+

Currently set hardware MAC address.

+

Flags: Read

Default value: NULL

Since 0.9.8

-

The "slaves" property

-
  "slaves"                   NMObjectArray*        : Read
-

-The devices (NMDevice) slaved to the bridge device. -

+

The “slaves” property

+
  “slaves”                   NMObjectArray *
+

Slaves.

+

Flags: Read

Since 0.9.8

- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20
\ No newline at end of file diff --git a/docs/libnm-glib/html/NMDeviceBt.html b/docs/libnm-glib/html/NMDeviceBt.html index e3a59fc7..e951a85a 100644 --- a/docs/libnm-glib/html/NMDeviceBt.html +++ b/docs/libnm-glib/html/NMDeviceBt.html @@ -2,36 +2,28 @@ -NMDeviceBt +libnm-glib Reference Manual: NMDeviceBt - + - - - - - - - - - - + + + + + + +
@@ -39,321 +31,382 @@

NMDeviceBt

NMDeviceBt

- +
-
-

Synopsis

-
enum                NMDeviceBtError;
-#define             NM_DEVICE_BT_ERROR
-GQuark              nm_device_bt_error_quark            (void);
-#define             NM_DEVICE_BT_HW_ADDRESS
-#define             NM_DEVICE_BT_NAME
-#define             NM_DEVICE_BT_CAPABILITIES
-                    NMDeviceBt;
-                    NMDeviceBtClass;
-GObject *           nm_device_bt_new                    (DBusGConnection *connection,
-                                                         const char *path);
-const char *        nm_device_bt_get_hw_address         (NMDeviceBt *device);
-const char *        nm_device_bt_get_name               (NMDeviceBt *device);
-NMBluetoothCapabilities nm_device_bt_get_capabilities   (NMDeviceBt *device);
-
-
-

Object Hierarchy

-
-  GObject
-   +----NMObject
-         +----NMDevice
-               +----NMDeviceBt
-
-
-
-

Implemented Interfaces

-

-NMDeviceBt implements - GInitable and GAsyncInitable.

-
-
-

Properties

-
-  "bt-capabilities"          guint                 : Read
-  "hw-address"               gchar*                : Read
-  "name"                     gchar*                : Read
-
-
-
-

Description

-

-

-
-
-

Details

-
-

enum NMDeviceBtError

-
typedef enum {
-	NM_DEVICE_BT_ERROR_UNKNOWN = 0,           /*< nick=UnknownError >*/
-	NM_DEVICE_BT_ERROR_NOT_BT_CONNECTION,     /*< nick=NotBtConnection >*/
-	NM_DEVICE_BT_ERROR_INVALID_BT_CONNECTION, /*< nick=InvalidBtConnection >*/
-	NM_DEVICE_BT_ERROR_INVALID_DEVICE_MAC,    /*< nick=InvalidDeviceMac >*/
-	NM_DEVICE_BT_ERROR_MAC_MISMATCH,          /*< nick=MacMismatch >*/
-	NM_DEVICE_BT_ERROR_MISSING_DEVICE_CAPS,   /*< nick=MissingDeviceCaps >*/
-} NMDeviceBtError;
-
-
+

Functions

+
--++ - - - - - - - - + - - + - - + - - +

NM_DEVICE_BT_ERROR_UNKNOWN

unknown or unclassified error + +GQuark

NM_DEVICE_BT_ERROR_NOT_BT_CONNECTION

the connection was not of bluetooth type + +nm_device_bt_error_quark ()

NM_DEVICE_BT_ERROR_INVALID_BT_CONNECTION

the bluetooth connection was invalid + +GObject * + +nm_device_bt_new ()

NM_DEVICE_BT_ERROR_INVALID_DEVICE_MAC

the device's MAC was invalid +const char * + +nm_device_bt_get_hw_address ()

NM_DEVICE_BT_ERROR_MAC_MISMATCH

the MACs of the connection and the device mismatched +const char * + +nm_device_bt_get_name ()

NM_DEVICE_BT_ERROR_MISSING_DEVICE_CAPS

the device missed required capabilities + +NMBluetoothCapabilities + +nm_device_bt_get_capabilities ()
-
-
-

NM_DEVICE_BT_ERROR

-
#define NM_DEVICE_BT_ERROR nm_device_bt_error_quark ()
-
-

-

+
+

Properties

+
+++++ + + + + + + + + + + + + + + + + + +
guintbt-capabilitiesRead
+gchar *hw-addressRead
+gchar *nameRead
-
-
-

nm_device_bt_error_quark ()

-
GQuark              nm_device_bt_error_quark            (void);
-

-Registers an error quark for NMDeviceBt if necessary. -

-
+
+

Types and Values

+
--++ - - - - + + + + + + + + + + + + + + + + + + + + + +

Returns :

the error quark used for NMDeviceBt errors.
enumNMDeviceBtError
#defineNM_DEVICE_BT_ERROR
#defineNM_DEVICE_BT_HW_ADDRESS
#defineNM_DEVICE_BT_NAME
#defineNM_DEVICE_BT_CAPABILITIES
-
-
-

NM_DEVICE_BT_HW_ADDRESS

-
#define NM_DEVICE_BT_HW_ADDRESS   "hw-address"
+

+
Object Hierarchy

+
    GObject
+    ╰── NMObject
+        ╰── NMDevice
+            ╰── NMDeviceBt
 

-

-

 

-

-

-
NM_DEVICE_BT_NAME

-
#define NM_DEVICE_BT_NAME         "name"
-

+

+
Description

 

 

 

-

+

+
Functions

 

-
NM_DEVICE_BT_CAPABILITIES

-
#define NM_DEVICE_BT_CAPABILITIES "bt-capabilities"
-

-

-

+
nm_device_bt_error_quark ()

+
GQuark
+nm_device_bt_error_quark (void);

+
Registers an error quark for NMDeviceBt if necessary.

+

+
Returns

+
 the error quark used for NMDeviceBt errors.

+

 

-

-

-
NMDeviceBt

-
typedef struct _NMDeviceBt NMDeviceBt;

-

-

 

 

 

-
NMDeviceBtClass

-
typedef struct {
-	NMDeviceClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMDeviceBtClass;
-

-

-

-

-

-

-
nm_device_bt_new ()

-
GObject *           nm_device_bt_new                    (DBusGConnection *connection,
-                                                         const char *path);

-

-Creates a new NMDeviceBt.
-

-

+
nm_device_bt_new ()

+
GObject *
+nm_device_bt_new (DBusGConnection *connection,
+                  const char *path);

+
Creates a new NMDeviceBt.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
-
-
-
-
+
+
+

 





 
 
 
connection :
the DBusGConnection
-
connection
the DBusGConnection
 
 

 
path :
the DBus object path of the device
Returns :
a new device. [transfer full]
-
path
the DBus object path of the device
 
 

 
 

 

+

+
Returns

+
 a new device. 

+
[transfer full]

+

+

 

 

-
nm_device_bt_get_hw_address ()

-
const char *        nm_device_bt_get_hw_address         (NMDeviceBt *device);

-

-Gets the hardware (MAC) address of the NMDeviceBt
-

-

+
nm_device_bt_get_hw_address ()

+
const char *
+nm_device_bt_get_hw_address (NMDeviceBt *device);

+
Gets the hardware (MAC) address of the NMDeviceBt

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
device :
a NMDeviceBt
-
Returns :
the hardware address. This is the internal string used by the
-device, and must not be modified.
device
a NMDeviceBt
 

 

 

+

+
Returns

+
 the hardware address. This is the internal string used by the
+device, and must not be modified.

+

+

+

 

 

-
nm_device_bt_get_name ()

-
const char *        nm_device_bt_get_name               (NMDeviceBt *device);

-

-Gets the name of the NMDeviceBt.
-

-

+
nm_device_bt_get_name ()

+
const char *
+nm_device_bt_get_name (NMDeviceBt *device);

+
Gets the name of the NMDeviceBt.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
device :
a NMDeviceBt
-
Returns :
the name of the device
device
a NMDeviceBt
 

 

 

+

+
Returns

+
 the name of the device

+

+

+

 

 

-
nm_device_bt_get_capabilities ()

-
NMBluetoothCapabilities nm_device_bt_get_capabilities   (NMDeviceBt *device);

-

-Returns the Bluetooth device's usable capabilities.
-

-

+
nm_device_bt_get_capabilities ()

+
NMBluetoothCapabilities
+nm_device_bt_get_capabilities (NMDeviceBt *device);

+
Returns the Bluetooth device's usable capabilities.

+

+
Parameters

+
--++++
+
+
+
+
+
+

 






device
a NMDeviceBt
 

+

+

+
Returns

+
 a combination of NMBluetoothCapabilities

+

+

+
+
+
+

Types and Values

+
+

enum NMDeviceBtError

+
+

Members

+
++++ - - + + + + + + + + + + + + + + + + + + + + + + - - + +

device :

a NMDeviceBt +

NM_DEVICE_BT_ERROR_UNKNOWN

 +

unknown or unclassified error

+		 

NM_DEVICE_BT_ERROR_NOT_BT_CONNECTION

 +

the connection was not of bluetooth type

+		 

NM_DEVICE_BT_ERROR_INVALID_BT_CONNECTION

 +

the bluetooth connection was invalid

+		 

NM_DEVICE_BT_ERROR_INVALID_DEVICE_MAC

 +

the device's MAC was invalid

+		 

NM_DEVICE_BT_ERROR_MAC_MISMATCH

 +

the MACs of the connection and the device mismatched

 

Returns :

a combination of NMBluetoothCapabilities +

NM_DEVICE_BT_ERROR_MISSING_DEVICE_CAPS

 +

the device missed required capabilities

 
-
-

Property Details

+
-

The "bt-capabilities" property

-
  "bt-capabilities"          guint                 : Read
+

NM_DEVICE_BT_ERROR

+
#define NM_DEVICE_BT_ERROR nm_device_bt_error_quark ()
+

-The device's bluetooth capabilities, a combination of NMBluetoothCapabilities.

-

Default value: 0

-

The "hw-address" property

-
  "hw-address"               gchar*                : Read
+

NM_DEVICE_BT_HW_ADDRESS

+
#define NM_DEVICE_BT_HW_ADDRESS   "hw-address"
+

-The hardware (MAC) address of the device.

-

Default value: NULL

-

The "name" property

-
  "name"                     gchar*                : Read
+

NM_DEVICE_BT_NAME

+
#define NM_DEVICE_BT_NAME         "name"
+
+

+

+
+
+
+

NM_DEVICE_BT_CAPABILITIES

+
#define NM_DEVICE_BT_CAPABILITIES "bt-capabilities"
+

-The name of the bluetooth device.

+
+
+
+

Property Details

+
+

The “bt-capabilities” property

+
  “bt-capabilities”          guint
+

Bluetooth capabilities.

+

Flags: Read

+

Default value: 0

+
+
+
+

The “hw-address” property

+
  “hw-address”               gchar *
+

Hardware MAC address.

+

Flags: Read

+

Default value: NULL

+
+
+
+

The “name” property

+
  “name”                     gchar *
+

Device name.

+

Flags: Read

Default value: NULL

- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20
\ No newline at end of file diff --git a/docs/libnm-glib/html/NMDeviceEthernet.html b/docs/libnm-glib/html/NMDeviceEthernet.html index 4dec91a2..98767b2e 100644 --- a/docs/libnm-glib/html/NMDeviceEthernet.html +++ b/docs/libnm-glib/html/NMDeviceEthernet.html @@ -2,36 +2,28 @@ -NMDeviceEthernet +libnm-glib Reference Manual: NMDeviceEthernet - + - - - - - - - - - - + + + + + + +
@@ -39,363 +31,437 @@

NMDeviceEthernet

NMDeviceEthernet

- +
-
-

Synopsis

-
enum                NMDeviceEthernetError;
-#define             NM_DEVICE_ETHERNET_ERROR
-GQuark              nm_device_ethernet_error_quark      (void);
-#define             NM_DEVICE_ETHERNET_HW_ADDRESS
-#define             NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS
-#define             NM_DEVICE_ETHERNET_SPEED
-#define             NM_DEVICE_ETHERNET_CARRIER
-                    NMDeviceEthernet;
-                    NMDeviceEthernetClass;
-GObject *           nm_device_ethernet_new              (DBusGConnection *connection,
-                                                         const char *path);
-const char *        nm_device_ethernet_get_hw_address   (NMDeviceEthernet *device);
-const char *        nm_device_ethernet_get_permanent_hw_address
-                                                        (NMDeviceEthernet *device);
-guint32             nm_device_ethernet_get_speed        (NMDeviceEthernet *device);
-gboolean            nm_device_ethernet_get_carrier      (NMDeviceEthernet *device);
-
-
-
-

Object Hierarchy

-
-  GObject
-   +----NMObject
-         +----NMDevice
-               +----NMDeviceEthernet
-
-
-
-

Implemented Interfaces

-

-NMDeviceEthernet implements - GInitable and GAsyncInitable.

-
-
-

Properties

-
-  "carrier"                  gboolean              : Read
-  "hw-address"               gchar*                : Read
-  "perm-hw-address"          gchar*                : Read
-  "speed"                    guint                 : Read
-
-
-

Description

-

-

-
-
-

Details

-
-

enum NMDeviceEthernetError

-
typedef enum {
-	NM_DEVICE_ETHERNET_ERROR_UNKNOWN = 0,                 /*< nick=UnknownError >*/
-	NM_DEVICE_ETHERNET_ERROR_NOT_ETHERNET_CONNECTION,     /*< nick=NotEthernetConnection >*/
-	NM_DEVICE_ETHERNET_ERROR_INVALID_ETHERNET_CONNECTION, /*< nick=InvalidEthernetConnection >*/
-	NM_DEVICE_ETHERNET_ERROR_INVALID_DEVICE_MAC,          /*< nick=InvalidDeviceMac >*/
-	NM_DEVICE_ETHERNET_ERROR_MAC_MISMATCH,                /*< nick=MacMismatch >*/
-} NMDeviceEthernetError;
-
-
+

Functions

+
--++ - - + - - + + + + + - - + - - + - - +

NM_DEVICE_ETHERNET_ERROR_UNKNOWN

unknown or unclassified error + +GQuark + +nm_device_ethernet_error_quark ()

NM_DEVICE_ETHERNET_ERROR_NOT_ETHERNET_CONNECTION

the connection was not of ethernet or PPPoE type + +GObject * + +nm_device_ethernet_new () +
const char * + +nm_device_ethernet_get_hw_address ()

NM_DEVICE_ETHERNET_ERROR_INVALID_ETHERNET_CONNECTION

the ethernet connection was invalid +const char * + +nm_device_ethernet_get_permanent_hw_address ()

NM_DEVICE_ETHERNET_ERROR_INVALID_DEVICE_MAC

the device's MAC was invalid + +guint32 + +nm_device_ethernet_get_speed ()

NM_DEVICE_ETHERNET_ERROR_MAC_MISMATCH

the MACs of the connection and the device mismatched + +gboolean + +nm_device_ethernet_get_carrier ()
-
-
-

NM_DEVICE_ETHERNET_ERROR

-
#define NM_DEVICE_ETHERNET_ERROR nm_device_ethernet_error_quark ()
-
-

-

-
-
-
-

nm_device_ethernet_error_quark ()

-
GQuark              nm_device_ethernet_error_quark      (void);
-

-Registers an error quark for NMDeviceEthernet if necessary. -

-
+
+

Properties

+
--+++ - - - - + + + + + + + + + + + + + + + + + + + + + +

Returns :

the error quark used for NMDeviceEthernet errors.
gbooleancarrierRead
+gchar *hw-addressRead
+gchar *perm-hw-addressRead
guintspeedRead
-
-
-

NM_DEVICE_ETHERNET_HW_ADDRESS

-
#define NM_DEVICE_ETHERNET_HW_ADDRESS  "hw-address"
-
-

-

-
-
-
-

NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS

-
#define NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS "perm-hw-address"
-
-

-

+
+

Types and Values

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + +
enumNMDeviceEthernetError
#defineNM_DEVICE_ETHERNET_ERROR
#defineNM_DEVICE_ETHERNET_HW_ADDRESS
#defineNM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS
#defineNM_DEVICE_ETHERNET_SPEED
#defineNM_DEVICE_ETHERNET_CARRIER
-
-
-

NM_DEVICE_ETHERNET_SPEED

-
#define NM_DEVICE_ETHERNET_SPEED       "speed"
+

+
Object Hierarchy

+
    GObject
+    ╰── NMObject
+        ╰── NMDevice
+            ╰── NMDeviceEthernet
 

-

-

 

-

-

-
NM_DEVICE_ETHERNET_CARRIER

-
#define NM_DEVICE_ETHERNET_CARRIER     "carrier"
-

+

+
Description

 

 

 

-

+

+
Functions

 

-
NMDeviceEthernet

-
typedef struct _NMDeviceEthernet NMDeviceEthernet;

-

-

+
nm_device_ethernet_error_quark ()

+
GQuark
+nm_device_ethernet_error_quark (void);

+
Registers an error quark for NMDeviceEthernet if necessary.

+

+
Returns

+
 the error quark used for NMDeviceEthernet errors.

+

 

-

-

-
NMDeviceEthernetClass

-
typedef struct {
-	NMDeviceClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMDeviceEthernetClass;
-

-

-

 

 

 

-
nm_device_ethernet_new ()

-
GObject *           nm_device_ethernet_new              (DBusGConnection *connection,
-                                                         const char *path);

-

-Creates a new NMDeviceEthernet.
-

-

+
nm_device_ethernet_new ()

+
GObject *
+nm_device_ethernet_new (DBusGConnection *connection,
+                        const char *path);

+
Creates a new NMDeviceEthernet.

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+

 





 
 
 
connection :
the DBusGConnection
-
path :
the DBus object path of the device
connection
the DBusGConnection
 
 

 
Returns :
a new device. [transfer full]
-
path
the DBus object path of the device
 
 

 
 

 

+

+
Returns

+
 a new device. 

+
[transfer full]

+

+

 

 

-
nm_device_ethernet_get_hw_address ()

-
const char *        nm_device_ethernet_get_hw_address   (NMDeviceEthernet *device);

-

-Gets the active hardware (MAC) address of the NMDeviceEthernet
-

-

+
nm_device_ethernet_get_hw_address ()

+
const char *
+nm_device_ethernet_get_hw_address (NMDeviceEthernet *device);

+
Gets the active hardware (MAC) address of the NMDeviceEthernet

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
device :
a NMDeviceEthernet
-
Returns :
the active hardware address. This is the internal string used by the
-device, and must not be modified.
device
a NMDeviceEthernet
 

 

 

+

+
Returns

+
 the active hardware address. This is the internal string used by the
+device, and must not be modified.

+

+

+

 

 

-
nm_device_ethernet_get_permanent_hw_address ()

-
const char *        nm_device_ethernet_get_permanent_hw_address
-                                                        (NMDeviceEthernet *device);

-

-Gets the permanent hardware (MAC) address of the NMDeviceEthernet
-

-

+
nm_device_ethernet_get_permanent_hw_address ()

+
const char *
+nm_device_ethernet_get_permanent_hw_address
+                               (NMDeviceEthernet *device);

+
Gets the permanent hardware (MAC) address of the NMDeviceEthernet

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
device :
a NMDeviceEthernet
-
Returns :
the permanent hardware address. This is the internal string used by the
-device, and must not be modified.
device
a NMDeviceEthernet
 

 

 

+

+
Returns

+
 the permanent hardware address. This is the internal string used by the
+device, and must not be modified.

+

+

+

 

 

-
nm_device_ethernet_get_speed ()

-
guint32             nm_device_ethernet_get_speed        (NMDeviceEthernet *device);

-

-Gets the speed of the NMDeviceEthernet.
-

-

+
nm_device_ethernet_get_speed ()

+
guint32
+nm_device_ethernet_get_speed (NMDeviceEthernet *device);

+
Gets the speed of the NMDeviceEthernet.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
device :
a NMDeviceEthernet
-
Returns :
the speed of the device
device
a NMDeviceEthernet
 

 

 

+

+
Returns

+
 the speed of the device

+

+

+
-

nm_device_ethernet_get_carrier ()

-
gboolean            nm_device_ethernet_get_carrier      (NMDeviceEthernet *device);
-

-Whether the device has carrier. -

-
+

nm_device_ethernet_get_carrier ()

+
gboolean
+nm_device_ethernet_get_carrier (NMDeviceEthernet *device);
+

Whether the device has carrier.

+
+

Parameters

+
+++++ + + + + + +

device

a NMDeviceEthernet

 
+
+
+

Returns

+

TRUE if the device has carrier

+

+
+
+
+
+

Types and Values

+
+

enum NMDeviceEthernetError

+
+

Members

+
--+++ - - + + - - + + + + + + + + + + + + + + + + + +

device :

a NMDeviceEthernet +

NM_DEVICE_ETHERNET_ERROR_UNKNOWN

 +

unknown or unclassified error

 

Returns :

 -TRUE if the device has carrier

NM_DEVICE_ETHERNET_ERROR_NOT_ETHERNET_CONNECTION

 +

the connection was not of ethernet or PPPoE type

+		 

NM_DEVICE_ETHERNET_ERROR_INVALID_ETHERNET_CONNECTION

 +

the ethernet connection was invalid

+		 

NM_DEVICE_ETHERNET_ERROR_INVALID_DEVICE_MAC

 +

the device's MAC was invalid

+		 

NM_DEVICE_ETHERNET_ERROR_MAC_MISMATCH

 +

the MACs of the connection and the device mismatched

+		 
-
-

Property Details

+
-

The "carrier" property

-
  "carrier"                  gboolean              : Read
+

NM_DEVICE_ETHERNET_ERROR

+
#define NM_DEVICE_ETHERNET_ERROR nm_device_ethernet_error_quark ()
+

-Whether the device has carrier.

-

Default value: FALSE

-

The "hw-address" property

-
  "hw-address"               gchar*                : Read
+

NM_DEVICE_ETHERNET_HW_ADDRESS

+
#define NM_DEVICE_ETHERNET_HW_ADDRESS  "hw-address"
+

-The active hardware (MAC) address of the device.

-

Default value: NULL

-

The "perm-hw-address" property

-
  "perm-hw-address"          gchar*                : Read
+

NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS

+
#define NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS "perm-hw-address"
+

-The permanent hardware (MAC) address of the device.

-

Default value: NULL

-

The "speed" property

-
  "speed"                    guint                 : Read
+

NM_DEVICE_ETHERNET_SPEED

+
#define NM_DEVICE_ETHERNET_SPEED       "speed"
+
+

+

+
+
+
+

NM_DEVICE_ETHERNET_CARRIER

+
#define NM_DEVICE_ETHERNET_CARRIER     "carrier"
+

-The speed of the device.

+
+
+
+

Property Details

+
+

The “carrier” property

+
  “carrier”                  gboolean
+

Carrier.

+

Flags: Read

+

Default value: FALSE

+
+
+
+

The “hw-address” property

+
  “hw-address”               gchar *
+

Currently set hardware MAC address.

+

Flags: Read

+

Default value: NULL

+
+
+
+

The “perm-hw-address” property

+
  “perm-hw-address”          gchar *
+

Permanent hardware MAC address.

+

Flags: Read

+

Default value: NULL

+
+
+
+

The “speed” property

+
  “speed”                    guint
+

Speed.

+

Flags: Read

Default value: 0

- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20
\ No newline at end of file diff --git a/docs/libnm-glib/html/NMDeviceInfiniband.html b/docs/libnm-glib/html/NMDeviceInfiniband.html index 89b30130..03743893 100644 --- a/docs/libnm-glib/html/NMDeviceInfiniband.html +++ b/docs/libnm-glib/html/NMDeviceInfiniband.html @@ -2,36 +2,28 @@ -NMDeviceInfiniband +libnm-glib Reference Manual: NMDeviceInfiniband - + - - - - - - - - - - + + + + + + +
@@ -39,270 +31,315 @@

NMDeviceInfiniband

NMDeviceInfiniband

- +
-
-

Synopsis

-
enum                NMDeviceInfinibandError;
-#define             NM_DEVICE_INFINIBAND_ERROR
-GQuark              nm_device_infiniband_error_quark    (void);
-#define             NM_DEVICE_INFINIBAND_HW_ADDRESS
-#define             NM_DEVICE_INFINIBAND_CARRIER
-                    NMDeviceInfiniband;
-                    NMDeviceInfinibandClass;
-GObject *           nm_device_infiniband_new            (DBusGConnection *connection,
-                                                         const char *path);
-const char *        nm_device_infiniband_get_hw_address (NMDeviceInfiniband *device);
-gboolean            nm_device_infiniband_get_carrier    (NMDeviceInfiniband *device);
-
-
-
-

Object Hierarchy

-
-  GObject
-   +----NMObject
-         +----NMDevice
-               +----NMDeviceInfiniband
-
-
-
-

Implemented Interfaces

-

-NMDeviceInfiniband implements - GInitable and GAsyncInitable.

-
-
-

Properties

-
-  "carrier"                  gboolean              : Read
-  "hw-address"               gchar*                : Read
-
-
-
-

Description

-

-

-
-

Details

-
-

enum NMDeviceInfinibandError

-
typedef enum {
-	NM_DEVICE_INFINIBAND_ERROR_UNKNOWN = 0,                   /*< nick=UnknownError >*/
-	NM_DEVICE_INFINIBAND_ERROR_NOT_INFINIBAND_CONNECTION,     /*< nick=NotInfinibandConnection >*/
-	NM_DEVICE_INFINIBAND_ERROR_INVALID_INFINIBAND_CONNECTION, /*< nick=InvalidInfinibandConnection >*/
-	NM_DEVICE_INFINIBAND_ERROR_INVALID_DEVICE_MAC,            /*< nick=InvalidDeviceMac >*/
-	NM_DEVICE_INFINIBAND_ERROR_MAC_MISMATCH,                  /*< nick=MacMismatch >*/
-} NMDeviceInfinibandError;
-
-
+

Functions

+
--++ - - - - - - - - + - - + - - +

NM_DEVICE_INFINIBAND_ERROR_UNKNOWN

unknown or unclassified error + +GQuark

NM_DEVICE_INFINIBAND_ERROR_NOT_INFINIBAND_CONNECTION

the connection was not of InfiniBand type + +nm_device_infiniband_error_quark ()

NM_DEVICE_INFINIBAND_ERROR_INVALID_INFINIBAND_CONNECTION

the InfiniBand connection was invalid + +GObject * + +nm_device_infiniband_new ()

NM_DEVICE_INFINIBAND_ERROR_INVALID_DEVICE_MAC

the device's MAC was invalid +const char * + +nm_device_infiniband_get_hw_address ()

NM_DEVICE_INFINIBAND_ERROR_MAC_MISMATCH

the MACs of the connection and the device mismatched + +gboolean + +nm_device_infiniband_get_carrier ()
-
-
-

NM_DEVICE_INFINIBAND_ERROR

-
#define NM_DEVICE_INFINIBAND_ERROR nm_device_infiniband_error_quark ()
-
-

-

+
+

Properties

+
+++++ + + + + + + + + + + + + +
gbooleancarrierRead
+gchar *hw-addressRead
-
-
-

nm_device_infiniband_error_quark ()

-
GQuark              nm_device_infiniband_error_quark    (void);
-

-Registers an error quark for NMDeviceInfiniband if necessary. -

-
+
+

Types and Values

+
--++ - - - - + + + + + + + + + + + + + + + + + +

Returns :

the error quark used for NMDeviceInfiniband errors.
enumNMDeviceInfinibandError
#defineNM_DEVICE_INFINIBAND_ERROR
#defineNM_DEVICE_INFINIBAND_HW_ADDRESS
#defineNM_DEVICE_INFINIBAND_CARRIER
-
-
-

NM_DEVICE_INFINIBAND_HW_ADDRESS

-
#define NM_DEVICE_INFINIBAND_HW_ADDRESS  "hw-address"
+

+
Object Hierarchy

+
    GObject
+    ╰── NMObject
+        ╰── NMDevice
+            ╰── NMDeviceInfiniband
 

-

-

 

-

-

-
NM_DEVICE_INFINIBAND_CARRIER

-
#define NM_DEVICE_INFINIBAND_CARRIER     "carrier"
-

+

+
Description

 

 

 

-

+

+
Functions

 

-
NMDeviceInfiniband

-
typedef struct _NMDeviceInfiniband NMDeviceInfiniband;

-

-

+
nm_device_infiniband_error_quark ()

+
GQuark
+nm_device_infiniband_error_quark (void);

+
Registers an error quark for NMDeviceInfiniband if necessary.

+

+
Returns

+
 the error quark used for NMDeviceInfiniband errors.

+

 

-

-

-
NMDeviceInfinibandClass

-
typedef struct {
-	NMDeviceClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMDeviceInfinibandClass;
-

-

-

 

 

 

-
nm_device_infiniband_new ()

-
GObject *           nm_device_infiniband_new            (DBusGConnection *connection,
-                                                         const char *path);

-

-Creates a new NMDeviceInfiniband.
-

-

+
nm_device_infiniband_new ()

+
GObject *
+nm_device_infiniband_new (DBusGConnection *connection,
+                          const char *path);

+
Creates a new NMDeviceInfiniband.

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+

 





 
 
 
connection :
the DBusGConnection
-
path :
the DBus object path of the device
connection
the DBusGConnection
 
 

 
Returns :
a new device. [transfer full]
-
path
the DBus object path of the device
 
 

 
 

 

+

+
Returns

+
 a new device. 

+
[transfer full]

+

+

 

 

-
nm_device_infiniband_get_hw_address ()

-
const char *        nm_device_infiniband_get_hw_address (NMDeviceInfiniband *device);

-

-Gets the hardware (MAC) address of the NMDeviceInfiniband
-

-

+
nm_device_infiniband_get_hw_address ()

+
const char *
+nm_device_infiniband_get_hw_address (NMDeviceInfiniband *device);

+
Gets the hardware (MAC) address of the NMDeviceInfiniband

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
device :
a NMDeviceInfiniband
-
Returns :
the hardware address. This is the internal string used by the
-device, and must not be modified.
device
a NMDeviceInfiniband
 

 

 

+

+
Returns

+
 the hardware address. This is the internal string used by the
+device, and must not be modified.

+

+

+

 

 

-
nm_device_infiniband_get_carrier ()

-
gboolean            nm_device_infiniband_get_carrier    (NMDeviceInfiniband *device);

-

-Whether the device has carrier.
-

-

+
nm_device_infiniband_get_carrier ()

+
gboolean
+nm_device_infiniband_get_carrier (NMDeviceInfiniband *device);

+
Whether the device has carrier.

+

+
Parameters

+
--++++
+
+
+
+
+
+

 






device
a NMDeviceInfiniband
 

+

+

+
Returns

+
 TRUE if the device has carrier

+

+

+

+
+
+

Types and Values

+
+

enum NMDeviceInfinibandError

+
+

Members

+
++++ - - + + + + + + + + + + + + + + + + + - - + + +

device :

a NMDeviceInfiniband +

NM_DEVICE_INFINIBAND_ERROR_UNKNOWN

 +

unknown or unclassified error

+		 

NM_DEVICE_INFINIBAND_ERROR_NOT_INFINIBAND_CONNECTION

 +

the connection was not of InfiniBand type

+		 

NM_DEVICE_INFINIBAND_ERROR_INVALID_INFINIBAND_CONNECTION

 +

the InfiniBand connection was invalid

+		 

NM_DEVICE_INFINIBAND_ERROR_INVALID_DEVICE_MAC

 +

the device's MAC was invalid

 

Returns :

 -TRUE if the device has carrier

NM_DEVICE_INFINIBAND_ERROR_MAC_MISMATCH

 +

the MACs of the connection and the device mismatched

+		 
-
-

Property Details

+
-

The "carrier" property

-
  "carrier"                  gboolean              : Read
+

NM_DEVICE_INFINIBAND_ERROR

+
#define NM_DEVICE_INFINIBAND_ERROR nm_device_infiniband_error_quark ()
+

-Whether the device has carrier.

-

Default value: FALSE

-

The "hw-address" property

-
  "hw-address"               gchar*                : Read
+

NM_DEVICE_INFINIBAND_HW_ADDRESS

+
#define NM_DEVICE_INFINIBAND_HW_ADDRESS  "hw-address"
+
+

+

+
+
+
+

NM_DEVICE_INFINIBAND_CARRIER

+
#define NM_DEVICE_INFINIBAND_CARRIER     "carrier"
+

-The hardware (MAC) address of the device.

+
+
+
+

Property Details

+
+

The “carrier” property

+
  “carrier”                  gboolean
+

Carrier.

+

Flags: Read

+

Default value: FALSE

+
+
+
+

The “hw-address” property

+
  “hw-address”               gchar *
+

Currently set hardware MAC address.

+

Flags: Read

Default value: NULL

- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20
\ No newline at end of file diff --git a/docs/libnm-glib/html/NMDeviceModem.html b/docs/libnm-glib/html/NMDeviceModem.html index d5fb1cdf..bf7038a8 100644 --- a/docs/libnm-glib/html/NMDeviceModem.html +++ b/docs/libnm-glib/html/NMDeviceModem.html @@ -2,36 +2,28 @@ -NMDeviceModem +libnm-glib Reference Manual: NMDeviceModem - + - - - - - - - - - - + + + + + + +
@@ -39,43 +31,98 @@

NMDeviceModem

NMDeviceModem

- +
-
-

Synopsis

-
enum                NMDeviceModemError;
-#define             NM_DEVICE_MODEM_ERROR
-GQuark              nm_device_modem_error_quark         (void);
-#define             NM_DEVICE_MODEM_MODEM_CAPABILITIES
-#define             NM_DEVICE_MODEM_CURRENT_CAPABILITIES
-                    NMDeviceModem;
-                    NMDeviceModemClass;
-NMDeviceModemCapabilities nm_device_modem_get_modem_capabilities
-                                                        (NMDeviceModem *self);
-NMDeviceModemCapabilities nm_device_modem_get_current_capabilities
-                                                        (NMDeviceModem *self);
-
+
+

Functions

+
++++ + + + + + + + + + + + + + + +
+GQuark + +nm_device_modem_error_quark () +
+NMDeviceModemCapabilities + +nm_device_modem_get_modem_capabilities () +
+NMDeviceModemCapabilities + +nm_device_modem_get_current_capabilities () +
-

Object Hierarchy

-
-  GObject
-   +----NMObject
-         +----NMDevice
-               +----NMDeviceModem
-
+

Properties

+
+++++ + + + + + + + + + + + + +
guintcurrent-capabilitiesRead
guintmodem-capabilitiesRead
-

Implemented Interfaces

-

-NMDeviceModem implements - GInitable and GAsyncInitable.

+

Types and Values

+
++++ + + + + + + + + + + + + + + + + + + +
enumNMDeviceModemError
#defineNM_DEVICE_MODEM_ERROR
#defineNM_DEVICE_MODEM_MODEM_CAPABILITIES
#defineNM_DEVICE_MODEM_CURRENT_CAPABILITIES
-

Properties

-
-  "current-capabilities"     guint                 : Read
-  "modem-capabilities"       guint                 : Read
+
Object Hierarchy

+
    GObject
+    ╰── NMObject
+        ╰── NMDevice
+            ╰── NMDeviceModem
@@ -84,45 +131,125 @@ NMDeviceModem implements

-

Details

+

Functions

+
+

nm_device_modem_error_quark ()

+
GQuark
+nm_device_modem_error_quark (void);
+

Registers an error quark for NMDeviceModem if necessary.

+
+

Returns

+

the error quark used for NMDeviceModem errors.

+

+
+
+
+
+

nm_device_modem_get_modem_capabilities ()

+
NMDeviceModemCapabilities
+nm_device_modem_get_modem_capabilities
+                               (NMDeviceModem *self);
+

Returns a bitfield of the generic access technology families the modem +supports. Not all capabilities are available concurrently however; some +may require a firmware reload or reinitialization.

+
+

Parameters

+
+++++ + + + + + +

self

a NMDeviceModem

 
+
+
+

Returns

+

the generic access technology families the modem supports

+

+
+
+
+
+

nm_device_modem_get_current_capabilities ()

+
NMDeviceModemCapabilities
+nm_device_modem_get_current_capabilities
+                               (NMDeviceModem *self);
+

Returns a bitfield of the generic access technology families the modem +supports without a firmware reload or reinitialization. This value +represents the network types the modem can immediately connect to.

+
+

Parameters

+
+++++ + + + + + +

self

a NMDeviceModem

 
+
+
+

Returns

+

the generic access technology families the modem supports without +a firmware reload or other reinitialization

+

+
+
+
+
+

Types and Values

enum NMDeviceModemError

-
typedef enum {
-	NM_DEVICE_MODEM_ERROR_UNKNOWN = 0,              /*< nick=UnknownError >*/
-	NM_DEVICE_MODEM_ERROR_NOT_MODEM_CONNECTION,     /*< nick=NotModemConnection >*/
-	NM_DEVICE_MODEM_ERROR_INVALID_MODEM_CONNECTION, /*< nick=InvalidModemConnection >*/
-	NM_DEVICE_MODEM_ERROR_MISSING_DEVICE_CAPS,      /*< nick=MissingDeviceCaps >*/
-} NMDeviceModemError;
-
-
+
+

Members

+
--+++ - - + + - - + + - - + + - - + +

NM_DEVICE_MODEM_ERROR_UNKNOWN

unknown or unclassified error +

NM_DEVICE_MODEM_ERROR_UNKNOWN

 +

unknown or unclassified error

 

NM_DEVICE_MODEM_ERROR_NOT_MODEM_CONNECTION

the connection was not of modem type +

NM_DEVICE_MODEM_ERROR_NOT_MODEM_CONNECTION

 +

the connection was not of modem type

 

NM_DEVICE_MODEM_ERROR_INVALID_MODEM_CONNECTION

the modem connection was invalid +

NM_DEVICE_MODEM_ERROR_INVALID_MODEM_CONNECTION

 +

the modem connection was invalid

 

NM_DEVICE_MODEM_ERROR_MISSING_DEVICE_CAPS

the device missed required capabilities +

NM_DEVICE_MODEM_ERROR_MISSING_DEVICE_CAPS

 +

the device missed required capabilities

 
+

NM_DEVICE_MODEM_ERROR

@@ -133,24 +260,6 @@ NMDeviceModem implements
-

nm_device_modem_error_quark ()

-
GQuark              nm_device_modem_error_quark         (void);
-

-Registers an error quark for NMDeviceModem if necessary. -

-
---- - - - - -

Returns :

the error quark used for NMDeviceModem errors.
-
-
-

NM_DEVICE_MODEM_MODEM_CAPABILITIES

#define NM_DEVICE_MODEM_MODEM_CAPABILITIES   "modem-capabilities"
@@ -165,116 +274,28 @@ Registers an error quark for -

NMDeviceModem

-
typedef struct _NMDeviceModem NMDeviceModem;
-

-

-
-
-
-

NMDeviceModemClass

-
typedef struct {
-	NMDeviceClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMDeviceModemClass;
-
-

-

-
-
-
-

nm_device_modem_get_modem_capabilities ()

-
NMDeviceModemCapabilities nm_device_modem_get_modem_capabilities
-                                                        (NMDeviceModem *self);
-

-Returns a bitfield of the generic access technology families the modem -supports. Not all capabilities are available concurrently however; some -may require a firmware reload or reinitialization. -

-
---- - - - - - - - - - - -

self :

a NMDeviceModem -

Returns :

the generic access technology families the modem supports
-
-
-
-

nm_device_modem_get_current_capabilities ()

-
NMDeviceModemCapabilities nm_device_modem_get_current_capabilities
-                                                        (NMDeviceModem *self);
-

-Returns a bitfield of the generic access technology families the modem -supports without a firmware reload or reinitialization. This value -represents the network types the modem can immediately connect to. -

-
---- - - - - - - - - - - -

self :

a NMDeviceModem -

Returns :

the generic access technology families the modem supports without -a firmware reload or other reinitialization
-

Property Details

-

The "current-capabilities" property

-
  "current-capabilities"     guint                 : Read
-

-The generic family of access technologies the modem currently supports -without a firmware reload or reinitialization. -

+

The “current-capabilities” property

+
  “current-capabilities”     guint
+

Current capabilities.

+

Flags: Read

Default value: 0

-

The "modem-capabilities" property

-
  "modem-capabilities"       guint                 : Read
-

-The generic family of access technologies the modem supports. Not all -capabilities are available at the same time however; some modems require -a firmware reload or other reinitialization to switch between eg -CDMA/EVDO and GSM/UMTS. -

+

The “modem-capabilities” property

+
  “modem-capabilities”       guint
+

Modem capabilities.

+

Flags: Read

Default value: 0

- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20
\ No newline at end of file diff --git a/docs/libnm-glib/html/NMDeviceOlpcMesh.html b/docs/libnm-glib/html/NMDeviceOlpcMesh.html index ca10adb6..8fc759f1 100644 --- a/docs/libnm-glib/html/NMDeviceOlpcMesh.html +++ b/docs/libnm-glib/html/NMDeviceOlpcMesh.html @@ -2,36 +2,28 @@ -NMDeviceOlpcMesh +libnm-glib Reference Manual: NMDeviceOlpcMesh - + - - - - - - - - - - + + + + + + +
@@ -39,47 +31,124 @@

NMDeviceOlpcMesh

NMDeviceOlpcMesh

- +
-
-

Synopsis

-
enum                NMDeviceOlpcMeshError;
-#define             NM_DEVICE_OLPC_MESH_ERROR
-GQuark              nm_device_olpc_mesh_error_quark     (void);
-#define             NM_DEVICE_OLPC_MESH_HW_ADDRESS
-#define             NM_DEVICE_OLPC_MESH_COMPANION
-#define             NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL
-                    NMDeviceOlpcMesh;
-                    NMDeviceOlpcMeshClass;
-GObject *           nm_device_olpc_mesh_new             (DBusGConnection *connection,
-                                                         const char *path);
-const char *        nm_device_olpc_mesh_get_hw_address  (NMDeviceOlpcMesh *device);
-NMDeviceWifi *      nm_device_olpc_mesh_get_companion   (NMDeviceOlpcMesh *device);
-guint32             nm_device_olpc_mesh_get_active_channel
-                                                        (NMDeviceOlpcMesh *device);
-
+
+

Functions

+
++++ + + + + + + + + + + + + + + + + + + + + + + +
+GQuark + +nm_device_olpc_mesh_error_quark () +
+GObject * + +nm_device_olpc_mesh_new () +
const char * + +nm_device_olpc_mesh_get_hw_address () +
+NMDeviceWifi * + +nm_device_olpc_mesh_get_companion () +
+guint32 + +nm_device_olpc_mesh_get_active_channel () +
-

Object Hierarchy

-
-  GObject
-   +----NMObject
-         +----NMDevice
-               +----NMDeviceOlpcMesh
-
+

Properties

+
+++++ + + + + + + + + + + + + + + + + + +
guintactive-channelRead
+NMDeviceWifi *companionRead
+gchar *hw-addressRead
-

Implemented Interfaces

-

-NMDeviceOlpcMesh implements - GInitable and GAsyncInitable.

+

Types and Values

+
++++ + + + + + + + + + + + + + + + + + + + + + + +
enumNMDeviceOlpcMeshError
#defineNM_DEVICE_OLPC_MESH_ERROR
#defineNM_DEVICE_OLPC_MESH_HW_ADDRESS
#defineNM_DEVICE_OLPC_MESH_COMPANION
#defineNM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL
-

Properties

-
-  "active-channel"           guint                 : Read
-  "companion"                NMDeviceWifi*         : Read
-  "hw-address"               gchar*                : Read
+
Object Hierarchy

+
    GObject
+    ╰── NMObject
+        ╰── NMDevice
+            ╰── NMDeviceOlpcMesh
@@ -88,255 +157,236 @@ NMDeviceOlpcMesh implements

-

Details

+

Functions

-

enum NMDeviceOlpcMeshError

-
typedef enum {
-	NM_DEVICE_OLPC_MESH_ERROR_UNKNOWN = 0,                  /*< nick=UnknownError >*/
-	NM_DEVICE_OLPC_MESH_ERROR_NOT_OLPC_MESH_CONNECTION,     /*< nick=NotOlpcMeshConnection >*/
-	NM_DEVICE_OLPC_MESH_ERROR_INVALID_OLPC_MESH_CONNECTION, /*< nick=InvalidOlpcMeshConnection >*/
-} NMDeviceOlpcMeshError;
-
-
+

nm_device_olpc_mesh_error_quark ()

+
GQuark
+nm_device_olpc_mesh_error_quark (void);
+

Registers an error quark for NMDeviceOlpcMesh if necessary.

+
+

Returns

+

the error quark used for NMDeviceOlpcMesh errors.

+

+
+ +
+
+

nm_device_olpc_mesh_new ()

+
GObject *
+nm_device_olpc_mesh_new (DBusGConnection *connection,
+                         const char *path);
+

Creates a new NMDeviceOlpcMesh.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + +

NM_DEVICE_OLPC_MESH_ERROR_UNKNOWN

unknown or unclassified error -

NM_DEVICE_OLPC_MESH_ERROR_NOT_OLPC_MESH_CONNECTION

the connection was not of Olpc Mesh type -

connection

the DBusGConnection

 

NM_DEVICE_OLPC_MESH_ERROR_INVALID_OLPC_MESH_CONNECTION

the Olpc Mesh connection was invalid -

path

the DBus object path of the device

 
-
-
-

NM_DEVICE_OLPC_MESH_ERROR

-
#define NM_DEVICE_OLPC_MESH_ERROR nm_device_olpc_mesh_error_quark ()
-
-

-

+
+

Returns

+

a new OlpcMesh device.

+

[transfer full]

+
-

nm_device_olpc_mesh_error_quark ()

-
GQuark              nm_device_olpc_mesh_error_quark     (void);
-

-Registers an error quark for NMDeviceOlpcMesh if necessary. -

-
+

nm_device_olpc_mesh_get_hw_address ()

+
const char *
+nm_device_olpc_mesh_get_hw_address (NMDeviceOlpcMesh *device);
+

Gets the hardware (MAC) address of the NMDeviceOlpcMesh

+
+

Parameters

+
--+++ - - + + +

Returns :

the error quark used for NMDeviceOlpcMesh errors.

device

a NMDeviceOlpcMesh

 
-
-
-

NM_DEVICE_OLPC_MESH_HW_ADDRESS

-
#define NM_DEVICE_OLPC_MESH_HW_ADDRESS     "hw-address"
-
-

-

+
+

Returns

+

the hardware address. This is the internal string used by the +device, and must not be modified.

+

-
-
-

NM_DEVICE_OLPC_MESH_COMPANION

-
#define NM_DEVICE_OLPC_MESH_COMPANION      "companion"
-
-

-

-

NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL

-
#define NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL "active-channel"
-
-

-

+

nm_device_olpc_mesh_get_companion ()

+
NMDeviceWifi *
+nm_device_olpc_mesh_get_companion (NMDeviceOlpcMesh *device);
+

Gets the companion device of the NMDeviceOlpcMesh.

+
+

Parameters

+
+++++ + + + + + +

device

a NMDeviceOlpcMesh

 
+
+
+

Returns

+

the companion of the device of NULL.

+

[transfer none]

-
-
-

NMDeviceOlpcMesh

-
typedef struct _NMDeviceOlpcMesh NMDeviceOlpcMesh;
-

-

-

NMDeviceOlpcMeshClass

-
typedef struct {
-	NMDeviceClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMDeviceOlpcMeshClass;
-
-

-

+

nm_device_olpc_mesh_get_active_channel ()

+
guint32
+nm_device_olpc_mesh_get_active_channel
+                               (NMDeviceOlpcMesh *device);
+

Returns the active channel of the NMDeviceOlpcMesh device.

+
+

Parameters

+
+++++ + + + + + +

device

a NMDeviceOlpcMesh

 
-
+
+

Returns

+

active channel of the device

+

+
+
+
+
+

Types and Values

-

nm_device_olpc_mesh_new ()

-
GObject *           nm_device_olpc_mesh_new             (DBusGConnection *connection,
-                                                         const char *path);
-

-Creates a new NMDeviceOlpcMesh. -

-
+

enum NMDeviceOlpcMeshError

+
+

Members

+
--+++ - - + + - - + + + - - + +

connection :

the DBusGConnection +

NM_DEVICE_OLPC_MESH_ERROR_UNKNOWN

 +

unknown or unclassified error

 

path :

the DBus object path of the device

NM_DEVICE_OLPC_MESH_ERROR_NOT_OLPC_MESH_CONNECTION

 +

the connection was not of Olpc Mesh type

+		 

Returns :

a new OlpcMesh device. [transfer full] +

NM_DEVICE_OLPC_MESH_ERROR_INVALID_OLPC_MESH_CONNECTION

 +

the Olpc Mesh connection was invalid

 
+
-

nm_device_olpc_mesh_get_hw_address ()

-
const char *        nm_device_olpc_mesh_get_hw_address  (NMDeviceOlpcMesh *device);
+

NM_DEVICE_OLPC_MESH_ERROR

+
#define NM_DEVICE_OLPC_MESH_ERROR nm_device_olpc_mesh_error_quark ()
+

-Gets the hardware (MAC) address of the NMDeviceOlpcMesh

-
---- - - - - - - - - - - -

device :

a NMDeviceOlpcMesh -

Returns :

the hardware address. This is the internal string used by the -device, and must not be modified.
-

nm_device_olpc_mesh_get_companion ()

-
NMDeviceWifi *      nm_device_olpc_mesh_get_companion   (NMDeviceOlpcMesh *device);
+

NM_DEVICE_OLPC_MESH_HW_ADDRESS

+
#define NM_DEVICE_OLPC_MESH_HW_ADDRESS     "hw-address"
+

-Gets the companion device of the NMDeviceOlpcMesh.

-
---- - - - - - - - - - - -

device :

a NMDeviceOlpcMesh -

Returns :

the companion of the device of NULL. [transfer none] -
-

nm_device_olpc_mesh_get_active_channel ()

-
guint32             nm_device_olpc_mesh_get_active_channel
-                                                        (NMDeviceOlpcMesh *device);
+

NM_DEVICE_OLPC_MESH_COMPANION

+
#define NM_DEVICE_OLPC_MESH_COMPANION      "companion"
+
+

+

+
+
+
+

NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL

+
#define NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL "active-channel"
+

-Returns the active channel of the NMDeviceOlpcMesh device.

-
---- - - - - - - - - - - -

device :

a NMDeviceOlpcMesh -

Returns :

active channel of the device

Property Details

-

The "active-channel" property

-
  "active-channel"           guint                 : Read
-

-The device's active channel. -

+

The “active-channel” property

+
  “active-channel”           guint
+

Active channel.

+

Flags: Read

Default value: 0

-

The "companion" property

-
  "companion"                NMDeviceWifi*         : Read
-

-The companion device. -

+

The “companion” property

+
  “companion”                NMDeviceWifi *
+

Companion device.

+

Flags: Read

-

The "hw-address" property

-
  "hw-address"               gchar*                : Read
-

-The hardware (MAC) address of the device. -

+

The “hw-address” property

+
  “hw-address”               gchar *
+

Hardware MAC address.

+

Flags: Read

Default value: NULL

- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20
\ No newline at end of file diff --git a/docs/libnm-glib/html/NMDeviceVlan.html b/docs/libnm-glib/html/NMDeviceVlan.html index 7ca398c1..b7952355 100644 --- a/docs/libnm-glib/html/NMDeviceVlan.html +++ b/docs/libnm-glib/html/NMDeviceVlan.html @@ -2,36 +2,28 @@ -NMDeviceVlan +libnm-glib Reference Manual: NMDeviceVlan - + - - - - - - - - - - + + + + + + +
@@ -39,306 +31,368 @@

NMDeviceVlan

NMDeviceVlan

- +
-
-

Synopsis

-
enum                NMDeviceVlanError;
-#define             NM_DEVICE_VLAN_ERROR
-GQuark              nm_device_vlan_error_quark          (void);
-#define             NM_DEVICE_VLAN_HW_ADDRESS
-#define             NM_DEVICE_VLAN_CARRIER
-#define             NM_DEVICE_VLAN_VLAN_ID
-                    NMDeviceVlan;
-                    NMDeviceVlanClass;
-GObject *           nm_device_vlan_new                  (DBusGConnection *connection,
-                                                         const char *path);
-const char *        nm_device_vlan_get_hw_address       (NMDeviceVlan *device);
-gboolean            nm_device_vlan_get_carrier          (NMDeviceVlan *device);
-guint               nm_device_vlan_get_vlan_id          (NMDeviceVlan *device);
-
-
-
-

Object Hierarchy

-
-  GObject
-   +----NMObject
-         +----NMDevice
-               +----NMDeviceVlan
-
-
-
-

Implemented Interfaces

-

-NMDeviceVlan implements - GInitable and GAsyncInitable.

-
-
-

Properties

-
-  "carrier"                  gboolean              : Read
-  "hw-address"               gchar*                : Read
-  "vlan-id"                  guint                 : Read
-
-
-
-

Description

-

-

-
-

Details

-
-

enum NMDeviceVlanError

-
typedef enum {
-	NM_DEVICE_VLAN_ERROR_UNKNOWN = 0,             /*< nick=UnknownError >*/
-	NM_DEVICE_VLAN_ERROR_NOT_VLAN_CONNECTION,     /*< nick=NotVlanConnection >*/
-	NM_DEVICE_VLAN_ERROR_INVALID_VLAN_CONNECTION, /*< nick=InvalidVlanConnection >*/
-	NM_DEVICE_VLAN_ERROR_ID_MISMATCH,             /*< nick=IdMismatch >*/
-	NM_DEVICE_VLAN_ERROR_INTERFACE_MISMATCH,      /*< nick=InterfaceMismatch >*/
-} NMDeviceVlanError;
-
-
+

Functions

+
--++ - - + - - + - - + - - + - - +

NM_DEVICE_VLAN_ERROR_UNKNOWN

unknown or unclassified error + +GQuark + +nm_device_vlan_error_quark ()

NM_DEVICE_VLAN_ERROR_NOT_VLAN_CONNECTION

the connection was not of VLAN type + +GObject * + +nm_device_vlan_new ()

NM_DEVICE_VLAN_ERROR_INVALID_VLAN_CONNECTION

the VLAN connection was invalid +const char * + +nm_device_vlan_get_hw_address ()

NM_DEVICE_VLAN_ERROR_ID_MISMATCH

the VLAN identifiers of the connection and the device mismatched + +gboolean + +nm_device_vlan_get_carrier ()

NM_DEVICE_VLAN_ERROR_INTERFACE_MISMATCH

the interfaces of the connection and the device mismatched + +guint + +nm_device_vlan_get_vlan_id ()
-
-
-

NM_DEVICE_VLAN_ERROR

-
#define NM_DEVICE_VLAN_ERROR nm_device_vlan_error_quark ()
-
-

-

-
-
-
-

nm_device_vlan_error_quark ()

-
GQuark              nm_device_vlan_error_quark          (void);
-

-Registers an error quark for NMDeviceVlan if necessary. -

-
+
+

Properties

+
--+++ - - - - + + + + + + + + + + + + + + + + +

Returns :

the error quark used for NMDeviceVlan errors.
gbooleancarrierRead
+gchar *hw-addressRead
guintvlan-idRead
-
-
-

NM_DEVICE_VLAN_HW_ADDRESS

-
#define NM_DEVICE_VLAN_HW_ADDRESS  "hw-address"
-
-

-

+
+

Types and Values

+
++++ + + + + + + + + + + + + + + + + + + + + + + +
enumNMDeviceVlanError
#defineNM_DEVICE_VLAN_ERROR
#defineNM_DEVICE_VLAN_HW_ADDRESS
#defineNM_DEVICE_VLAN_CARRIER
#defineNM_DEVICE_VLAN_VLAN_ID
-
-
-

NM_DEVICE_VLAN_CARRIER

-
#define NM_DEVICE_VLAN_CARRIER     "carrier"
+

+
Object Hierarchy

+
    GObject
+    ╰── NMObject
+        ╰── NMDevice
+            ╰── NMDeviceVlan
 

-

-

 

-

-

-
NM_DEVICE_VLAN_VLAN_ID

-
#define NM_DEVICE_VLAN_VLAN_ID     "vlan-id"
-

+

+
Description

 

 

 

-

+

+
Functions

 

-
NMDeviceVlan

-
typedef struct _NMDeviceVlan NMDeviceVlan;

-

-

+
nm_device_vlan_error_quark ()

+
GQuark
+nm_device_vlan_error_quark (void);

+
Registers an error quark for NMDeviceVlan if necessary.

+

+
Returns

+
 the error quark used for NMDeviceVlan errors.

+

 

-

-

-
NMDeviceVlanClass

-
typedef struct {
-	NMDeviceClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMDeviceVlanClass;
-

-

-

 

 

 

-
nm_device_vlan_new ()

-
GObject *           nm_device_vlan_new                  (DBusGConnection *connection,
-                                                         const char *path);

-

-Creates a new NMDeviceVlan.
-

-

+
nm_device_vlan_new ()

+
GObject *
+nm_device_vlan_new (DBusGConnection *connection,
+                    const char *path);

+
Creates a new NMDeviceVlan.

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+

 





 
 
 
connection :
the DBusGConnection
-
path :
the DBus object path of the device
connection
the DBusGConnection
 
 

 
Returns :
a new device. [transfer full]
-
path
the DBus object path of the device
 
 

 
 

 

+

+
Returns

+
 a new device. 

+
[transfer full]

+

+

 

 

-
nm_device_vlan_get_hw_address ()

-
const char *        nm_device_vlan_get_hw_address       (NMDeviceVlan *device);

-

-Gets the hardware (MAC) address of the NMDeviceVlan
-

-

+
nm_device_vlan_get_hw_address ()

+
const char *
+nm_device_vlan_get_hw_address (NMDeviceVlan *device);

+
Gets the hardware (MAC) address of the NMDeviceVlan

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
device :
a NMDeviceVlan
-
Returns :
the hardware address. This is the internal string used by the
-device, and must not be modified.
device
a NMDeviceVlan
 

 

 

+

+
Returns

+
 the hardware address. This is the internal string used by the
+device, and must not be modified.

+

+

+

 

 

-
nm_device_vlan_get_carrier ()

-
gboolean            nm_device_vlan_get_carrier          (NMDeviceVlan *device);

-

-Whether the device has carrier.
-

-

+
nm_device_vlan_get_carrier ()

+
gboolean
+nm_device_vlan_get_carrier (NMDeviceVlan *device);

+
Whether the device has carrier.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
device :
a NMDeviceVlan
-
Returns :

-TRUE if the device has carrier
device
a NMDeviceVlan
 

 

 

+

+
Returns

+
 TRUE if the device has carrier

+

+

+

 

 

-
nm_device_vlan_get_vlan_id ()

-
guint               nm_device_vlan_get_vlan_id          (NMDeviceVlan *device);

-

+
nm_device_vlan_get_vlan_id ()

+
guint
+nm_device_vlan_get_vlan_id (NMDeviceVlan *device);

+

+
Parameters

+
--++++
+
+
+
+
+
+

 






device
a NMDeviceVlan
 

+

+

+
Returns

+
 the device's VLAN ID

+

+

+
+
+
+

Types and Values

+
+

enum NMDeviceVlanError

+
+

Members

+
++++ - - + + + + + + + + + + + + + + + + + - - + + +

device :

a NMDeviceVlan +

NM_DEVICE_VLAN_ERROR_UNKNOWN

 +

unknown or unclassified error

+		 

NM_DEVICE_VLAN_ERROR_NOT_VLAN_CONNECTION

 +

the connection was not of VLAN type

+		 

NM_DEVICE_VLAN_ERROR_INVALID_VLAN_CONNECTION

 +

the VLAN connection was invalid

+		 

NM_DEVICE_VLAN_ERROR_ID_MISMATCH

 +

the VLAN identifiers of the connection and the device mismatched

 

Returns :

the device's VLAN ID

NM_DEVICE_VLAN_ERROR_INTERFACE_MISMATCH

 +

the interfaces of the connection and the device mismatched

+		 
-
-

Property Details

+
-

The "carrier" property

-
  "carrier"                  gboolean              : Read
+

NM_DEVICE_VLAN_ERROR

+
#define NM_DEVICE_VLAN_ERROR nm_device_vlan_error_quark ()
+

-Whether the device has carrier.

-

Default value: FALSE

-

The "hw-address" property

-
  "hw-address"               gchar*                : Read
+

NM_DEVICE_VLAN_HW_ADDRESS

+
#define NM_DEVICE_VLAN_HW_ADDRESS  "hw-address"
+

-The hardware (MAC) address of the device.

-

Default value: NULL

-

The "vlan-id" property

-
  "vlan-id"                  guint                 : Read
+

NM_DEVICE_VLAN_CARRIER

+
#define NM_DEVICE_VLAN_CARRIER     "carrier"
+
+

+

+
+
+
+

NM_DEVICE_VLAN_VLAN_ID

+
#define NM_DEVICE_VLAN_VLAN_ID     "vlan-id"
+

-The device's VLAN ID.

+
+
+
+

Property Details

+
+

The “carrier” property

+
  “carrier”                  gboolean
+

Carrier.

+

Flags: Read

+

Default value: FALSE

+
+
+
+

The “hw-address” property

+
  “hw-address”               gchar *
+

Currently set hardware MAC address.

+

Flags: Read

+

Default value: NULL

+
+
+
+

The “vlan-id” property

+
  “vlan-id”                  guint
+

VLAN ID.

+

Flags: Read

Allowed values: <= 4095

Default value: 0

@@ -346,6 +400,6 @@ The device's VLAN ID.
- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20
\ No newline at end of file diff --git a/docs/libnm-glib/html/NMDeviceWifi.html b/docs/libnm-glib/html/NMDeviceWifi.html index 1fcd9f27..61d0228b 100644 --- a/docs/libnm-glib/html/NMDeviceWifi.html +++ b/docs/libnm-glib/html/NMDeviceWifi.html @@ -2,38 +2,29 @@ -NMDeviceWifi +libnm-glib Reference Manual: NMDeviceWifi - + - - - - - - - - - - + + + + + + +
@@ -41,659 +32,762 @@

NMDeviceWifi

NMDeviceWifi

- +
-
-

Synopsis

-
enum                NMDeviceWifiError;
-#define             NM_DEVICE_WIFI_ERROR
-GQuark              nm_device_wifi_error_quark          (void);
-#define             NM_DEVICE_WIFI_HW_ADDRESS
-#define             NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS
-#define             NM_DEVICE_WIFI_MODE
-#define             NM_DEVICE_WIFI_BITRATE
-#define             NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT
-#define             NM_DEVICE_WIFI_CAPABILITIES
-                    NMDeviceWifi;
-                    NMDeviceWifiClass;
-GObject *           nm_device_wifi_new                  (DBusGConnection *connection,
-                                                         const char *path);
-const char *        nm_device_wifi_get_hw_address       (NMDeviceWifi *device);
-const char *        nm_device_wifi_get_permanent_hw_address
-                                                        (NMDeviceWifi *device);
-NM80211Mode         nm_device_wifi_get_mode             (NMDeviceWifi *device);
-guint32             nm_device_wifi_get_bitrate          (NMDeviceWifi *device);
-NMDeviceWifiCapabilities nm_device_wifi_get_capabilities
-                                                        (NMDeviceWifi *device);
-NMAccessPoint *     nm_device_wifi_get_active_access_point
-                                                        (NMDeviceWifi *device);
-NMAccessPoint *     nm_device_wifi_get_access_point_by_path
-                                                        (NMDeviceWifi *device,
-                                                         const char *path);
-const GPtrArray *   nm_device_wifi_get_access_points    (NMDeviceWifi *device);
-void                (*NMDeviceWifiRequestScanFn)        (NMDeviceWifi *device,
-                                                         GError *error,
-                                                         gpointer user_data);
-void                nm_device_wifi_request_scan_simple  (NMDeviceWifi *device,
-                                                         NMDeviceWifiRequestScanFn callback,
-                                                         gpointer user_data);
-
-
-
-

Object Hierarchy

-
-  GObject
-   +----NMObject
-         +----NMDevice
-               +----NMDeviceWifi
-
-
-
-

Implemented Interfaces

-

-NMDeviceWifi implements - GInitable and GAsyncInitable.

-
-
-

Properties

-
-  "active-access-point"      NMAccessPoint*        : Read
-  "bitrate"                  guint                 : Read
-  "hw-address"               gchar*                : Read
-  "mode"                     guint                 : Read
-  "perm-hw-address"          gchar*                : Read
-  "wireless-capabilities"    guint                 : Read
-
-
-
-

Signals

-
-  "access-point-added"                             : Run First
-  "access-point-removed"                           : Run First
-
-
-

Description

-

-

-
-
-

Details

-
-

enum NMDeviceWifiError

-
typedef enum {
-	NM_DEVICE_WIFI_ERROR_UNKNOWN = 0,             /*< nick=UnknownError >*/
-	NM_DEVICE_WIFI_ERROR_NOT_WIFI_CONNECTION,     /*< nick=NotWifiConnection >*/
-	NM_DEVICE_WIFI_ERROR_INVALID_WIFI_CONNECTION, /*< nick=InvalidWifiConnection >*/
-	NM_DEVICE_WIFI_ERROR_INVALID_DEVICE_MAC,      /*< nick=InvalidDeviceMac >*/
-	NM_DEVICE_WIFI_ERROR_MAC_MISMATCH,            /*< nick=MacMismatch >*/
-	NM_DEVICE_WIFI_ERROR_MISSING_DEVICE_WPA_CAPS, /*< nick=MissingDeviceWpaCaps >*/
-	NM_DEVICE_WIFI_ERROR_MISSING_DEVICE_RSN_CAPS, /*< nick=MissingDeviceRsnCaps >*/
-} NMDeviceWifiError;
-
-
+

Functions

+
--++ - - + + + + + + + + + + + + + + + + + + + + + - - + - - + - - + - - + - - + - - +

NM_DEVICE_WIFI_ERROR_UNKNOWN

unknown or unclassified error + +GQuark + +nm_device_wifi_error_quark () +
+GObject * + +nm_device_wifi_new () +
const char * + +nm_device_wifi_get_hw_address () +
const char * + +nm_device_wifi_get_permanent_hw_address () +
+NM80211Mode + +nm_device_wifi_get_mode () +
+guint32 + +nm_device_wifi_get_bitrate ()

NM_DEVICE_WIFI_ERROR_NOT_WIFI_CONNECTION

the connection was not of Wi-Fi type + +NMDeviceWifiCapabilities + +nm_device_wifi_get_capabilities ()

NM_DEVICE_WIFI_ERROR_INVALID_WIFI_CONNECTION

the Wi-Fi connection was invalid + +NMAccessPoint * + +nm_device_wifi_get_active_access_point ()

NM_DEVICE_WIFI_ERROR_INVALID_DEVICE_MAC

the device's MAC was invalid + +NMAccessPoint * + +nm_device_wifi_get_access_point_by_path ()

NM_DEVICE_WIFI_ERROR_MAC_MISMATCH

the MACs of the connection and the device mismatched +const GPtrArray * + +nm_device_wifi_get_access_points ()

NM_DEVICE_WIFI_ERROR_MISSING_DEVICE_WPA_CAPS

the device missed WPA capabilities -required by the connection + +void + +(*NMDeviceWifiRequestScanFn) ()

NM_DEVICE_WIFI_ERROR_MISSING_DEVICE_RSN_CAPS

the device missed RSN capabilities -required by the connection + +void + +nm_device_wifi_request_scan_simple ()
-
-
-

NM_DEVICE_WIFI_ERROR

-
#define NM_DEVICE_WIFI_ERROR nm_device_wifi_error_quark ()
-
-

-

+
+

Properties

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+NMAccessPoint *active-access-pointRead
guintbitrateRead
+gchar *hw-addressRead
guintmodeRead
+gchar *perm-hw-addressRead
guintwireless-capabilitiesRead
-
-
-

nm_device_wifi_error_quark ()

-
GQuark              nm_device_wifi_error_quark          (void);
-

-Registers an error quark for NMDeviceWifi if necessary. -

-
+
+

Signals

+
--+++ - - - - + + + + + + + + + + + +

Returns :

the error quark used for NMDeviceWifi errors.
voidaccess-point-addedRun First
voidaccess-point-removedRun First
-
-
-

NM_DEVICE_WIFI_HW_ADDRESS

-
#define NM_DEVICE_WIFI_HW_ADDRESS          "hw-address"
-
-

-

+
+

Types and Values

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
enumNMDeviceWifiError
#defineNM_DEVICE_WIFI_ERROR
#defineNM_DEVICE_WIFI_HW_ADDRESS
#defineNM_DEVICE_WIFI_PERMANENT_HW_ADDRESS
#defineNM_DEVICE_WIFI_MODE
#defineNM_DEVICE_WIFI_BITRATE
#defineNM_DEVICE_WIFI_ACTIVE_ACCESS_POINT
#defineNM_DEVICE_WIFI_CAPABILITIES
-
-
-

NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS

-
#define NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS "perm-hw-address"
+

+
Object Hierarchy

+
    GObject
+    ╰── NMObject
+        ╰── NMDevice
+            ╰── NMDeviceWifi
 

-

-

 

-

-

-
NM_DEVICE_WIFI_MODE

-
#define NM_DEVICE_WIFI_MODE                "mode"
-

+

+
Description

 

 

 

-

+

+
Functions

 

-
NM_DEVICE_WIFI_BITRATE

-
#define NM_DEVICE_WIFI_BITRATE             "bitrate"
-

-

-

+
nm_device_wifi_error_quark ()

+
GQuark
+nm_device_wifi_error_quark (void);

+
Registers an error quark for NMDeviceWifi if necessary.

+

+
Returns

+
 the error quark used for NMDeviceWifi errors.

+

+

 

 

 

-
NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT

-
#define NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT "active-access-point"
-

-

-

+
nm_device_wifi_new ()

+
GObject *
+nm_device_wifi_new (DBusGConnection *connection,
+                    const char *path);

+
Creates a new NMDeviceWifi.

+

+
Parameters

+

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+





connection
the DBusGConnection
 
path
the DBus object path of the device
 

+

+

+
Returns

+
 a new WiFi device. 

+
[transfer full]

+

 

 

 

-
NM_DEVICE_WIFI_CAPABILITIES

-
#define NM_DEVICE_WIFI_CAPABILITIES        "wireless-capabilities"
-

-

-

+
nm_device_wifi_get_hw_address ()

+
const char *
+nm_device_wifi_get_hw_address (NMDeviceWifi *device);

+
Gets the actual hardware (MAC) address of the NMDeviceWifi

+

+
Parameters

+

+++++
+
+
+
+
+
+





device
a NMDeviceWifi
 

+

+

+
Returns

+
 the actual hardware address. This is the internal string used by the
+device, and must not be modified.

+

+

 

 

 

-
NMDeviceWifi

-
typedef struct _NMDeviceWifi NMDeviceWifi;

-

-

+
nm_device_wifi_get_permanent_hw_address ()

+
const char *
+nm_device_wifi_get_permanent_hw_address
+                               (NMDeviceWifi *device);

+
Gets the permanent hardware (MAC) address of the NMDeviceWifi

+

+
Parameters

+

+++++
+
+
+
+
+
+





device
a NMDeviceWifi
 

+

+

+
Returns

+
 the permanent hardware address. This is the internal string used by the
+device, and must not be modified.

+

+

 

 

 

-
NMDeviceWifiClass

-
typedef struct {
-	NMDeviceClass parent;
-
-	/* Signals */
-	void (*access_point_added) (NMDeviceWifi *device, NMAccessPoint *ap);
-	void (*access_point_removed) (NMDeviceWifi *device, NMAccessPoint *ap);
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMDeviceWifiClass;
-

-

-

+
nm_device_wifi_get_mode ()

+
NM80211Mode
+nm_device_wifi_get_mode (NMDeviceWifi *device);

+
Gets the NMDeviceWifi mode.

+

+
Parameters

+

+++++
+
+
+
+
+
+





device
a NMDeviceWifi
 

+

+

+
Returns

+
 the mode

+

+

 

 

 

-
nm_device_wifi_new ()

-
GObject *           nm_device_wifi_new                  (DBusGConnection *connection,
-                                                         const char *path);

-

-Creates a new NMDeviceWifi.
-

-

+
nm_device_wifi_get_bitrate ()

+
guint32
+nm_device_wifi_get_bitrate (NMDeviceWifi *device);

+
Gets the bit rate of the NMDeviceWifi.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
connection :
the DBusGConnection
-
path :
the DBus object path of the device
Returns :
a new WiFi device. [transfer full]
-
device
a NMDeviceWifi
 

 

 

+

+
Returns

+
 the bit rate

+

+

+

 

 

-
nm_device_wifi_get_hw_address ()

-
const char *        nm_device_wifi_get_hw_address       (NMDeviceWifi *device);

-

-Gets the actual hardware (MAC) address of the NMDeviceWifi
-

-

+
nm_device_wifi_get_capabilities ()

+
NMDeviceWifiCapabilities
+nm_device_wifi_get_capabilities (NMDeviceWifi *device);

+
Gets the WIFI capabilities of the NMDeviceWifi.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
device :
a NMDeviceWifi
-
Returns :
the actual hardware address. This is the internal string used by the
-device, and must not be modified.
device
a NMDeviceWifi
 

 

 

+

+
Returns

+
 the capabilities

+

+

+

 

 

-
nm_device_wifi_get_permanent_hw_address ()

-
const char *        nm_device_wifi_get_permanent_hw_address
-                                                        (NMDeviceWifi *device);

-

-Gets the permanent hardware (MAC) address of the NMDeviceWifi
-

-

+
nm_device_wifi_get_active_access_point ()

+
NMAccessPoint *
+nm_device_wifi_get_active_access_point
+                               (NMDeviceWifi *device);

+
Gets the active NMAccessPoint.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
device :
a NMDeviceWifi
-
Returns :
the permanent hardware address. This is the internal string used by the
-device, and must not be modified.
device
a NMDeviceWifi
 

 

 

+

+
Returns

+
 the access point or NULL if none is active. 

+
[transfer none]

+

+
-

nm_device_wifi_get_mode ()

-
NM80211Mode         nm_device_wifi_get_mode             (NMDeviceWifi *device);
-

-Gets the NMDeviceWifi mode. -

-
+

nm_device_wifi_get_access_point_by_path ()

+
NMAccessPoint *
+nm_device_wifi_get_access_point_by_path
+                               (NMDeviceWifi *device,
+                                const char *path);
+

Gets a NMAccessPoint by path.

+
+

Parameters

+
--+++ - - + + + - - + + +

device :

a NMDeviceWifi -

device

a NMDeviceWifi

 

Returns :

the mode

path

the object path of the access point

 
+
+

Returns

+

the access point or NULL if none is found.

+

[transfer none]

+
+
-

nm_device_wifi_get_bitrate ()

-
guint32             nm_device_wifi_get_bitrate          (NMDeviceWifi *device);
-

-Gets the bit rate of the NMDeviceWifi. -

-
+

nm_device_wifi_get_access_points ()

+
const GPtrArray *
+nm_device_wifi_get_access_points (NMDeviceWifi *device);
+

Gets all the scanned access points of the NMDeviceWifi.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

device :

a NMDeviceWifi -

Returns :

the bit rate

device

a NMDeviceWifi

 
+
+

Returns

+

a GPtrArray containing all the +scanned NMAccessPoints. +The returned array is owned by the client and should not be modified.

+

[element-type NMClient.AccessPoint]

+
+
-

nm_device_wifi_get_capabilities ()

-
NMDeviceWifiCapabilities nm_device_wifi_get_capabilities
-                                                        (NMDeviceWifi *device);
+

NMDeviceWifiRequestScanFn ()

+
void
+(*NMDeviceWifiRequestScanFn) (NMDeviceWifi *device,
+                              GError *error,
+                              gpointer user_data);

-Gets the WIFI capabilities of the NMDeviceWifi.

-
+ +
+
+

nm_device_wifi_request_scan_simple ()

+
void
+nm_device_wifi_request_scan_simple (NMDeviceWifi *device,
+                                    NMDeviceWifiRequestScanFn callback,
+                                    gpointer user_data);
+

Request NM to scan for access points on the NMDeviceWifi. This function only +instructs NM to perform scanning. Use nm_device_wifi_get_access_points() +to get available access points.

+
+

Parameters

+
--+++ - - + + + - - + + + + + + + +

device :

a NMDeviceWifi -

device

a NMDeviceWifi

 

Returns :

the capabilities

callback

the function to call when the call is done.

[scope async][allow-none]

user_data

user data to pass to the callback function.

[closure]
-
+

Since 0.9.8

+
+
+
+

Types and Values

-

nm_device_wifi_get_active_access_point ()

-
NMAccessPoint *     nm_device_wifi_get_active_access_point
-                                                        (NMDeviceWifi *device);
-

-Gets the active NMAccessPoint. -

-
+

enum NMDeviceWifiError

+
+

Members

+
--+++ - - + + - - + + - -

device :

a NMDeviceWifi +

NM_DEVICE_WIFI_ERROR_UNKNOWN

 +

unknown or unclassified error

 

Returns :

the access point or NULL if none is active. [transfer none] +

NM_DEVICE_WIFI_ERROR_NOT_WIFI_CONNECTION

 +

the connection was not of Wi-Fi type

 
-
-
-
-

nm_device_wifi_get_access_point_by_path ()

-
NMAccessPoint *     nm_device_wifi_get_access_point_by_path
-                                                        (NMDeviceWifi *device,
-                                                         const char *path);
-

-Gets a NMAccessPoint by path. -

-
---- - - - + + - - + + + - - + + - -

device :

a NMDeviceWifi +

NM_DEVICE_WIFI_ERROR_INVALID_WIFI_CONNECTION

 +

the Wi-Fi connection was invalid

 

path :

the object path of the access point

NM_DEVICE_WIFI_ERROR_INVALID_DEVICE_MAC

 +

the device's MAC was invalid

+		 

Returns :

the access point or NULL if none is found. [transfer none] +

NM_DEVICE_WIFI_ERROR_MAC_MISMATCH

 +

the MACs of the connection and the device mismatched

 
-
-
-
-

nm_device_wifi_get_access_points ()

-
const GPtrArray *   nm_device_wifi_get_access_points    (NMDeviceWifi *device);
-

-Gets all the scanned access points of the NMDeviceWifi. -

-
---- - - - + + - - + +

device :

a NMDeviceWifi +

NM_DEVICE_WIFI_ERROR_MISSING_DEVICE_WPA_CAPS

 +

the device missed WPA capabilities +required by the connection

 

Returns :

a GPtrArray containing all the -scanned NMAccessPoints. -The returned array is owned by the client and should not be modified. [element-type NMClient.AccessPoint] +

NM_DEVICE_WIFI_ERROR_MISSING_DEVICE_RSN_CAPS

 +

the device missed RSN capabilities +required by the connection

 
+
-

NMDeviceWifiRequestScanFn ()

-
void                (*NMDeviceWifiRequestScanFn)        (NMDeviceWifi *device,
-                                                         GError *error,
-                                                         gpointer user_data);
+

NM_DEVICE_WIFI_ERROR

+
#define NM_DEVICE_WIFI_ERROR nm_device_wifi_error_quark ()
+

-

nm_device_wifi_request_scan_simple ()

-
void                nm_device_wifi_request_scan_simple  (NMDeviceWifi *device,
-                                                         NMDeviceWifiRequestScanFn callback,
-                                                         gpointer user_data);
+

NM_DEVICE_WIFI_HW_ADDRESS

+
#define NM_DEVICE_WIFI_HW_ADDRESS          "hw-address"
+

-Request NM to scan for access points on the NMDeviceWifi. This function only -instructs NM to perform scanning. Use nm_device_wifi_get_access_points() -to get available access points.

-
---- - - - - - - - - - - - - - - -

device :

a NMDeviceWifi -

callback :

the function to call when the call is done. [scope async][allow-none] -

user_data :

user data to pass to the callback function. [closure] -
-

Since 0.9.8

+
+
+

NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS

+
#define NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS "perm-hw-address"
+
+

+

-
-

Property Details

+
-

The "active-access-point" property

-
  "active-access-point"      NMAccessPoint*        : Read
+

NM_DEVICE_WIFI_MODE

+
#define NM_DEVICE_WIFI_MODE                "mode"
+

-The active NMAccessPoint of the device.

-

The "bitrate" property

-
  "bitrate"                  guint                 : Read
+

NM_DEVICE_WIFI_BITRATE

+
#define NM_DEVICE_WIFI_BITRATE             "bitrate"
+

-The bit rate of the device.

-

Default value: 0

-

The "hw-address" property

-
  "hw-address"               gchar*                : Read
+

NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT

+
#define NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT "active-access-point"
+

-The hardware (MAC) address of the device.

-

Default value: NULL

-

The "mode" property

-
  "mode"                     guint                 : Read
+

NM_DEVICE_WIFI_CAPABILITIES

+
#define NM_DEVICE_WIFI_CAPABILITIES        "wireless-capabilities"
+

-The mode of the device.

+
+
+
+

Property Details

+
+

The “active-access-point” property

+
  “active-access-point”      NMAccessPoint *
+

Active Access Point.

+

Flags: Read

+
+
+
+

The “bitrate” property

+
  “bitrate”                  guint
+

Bit Rate.

+

Flags: Read

+

Default value: 0

+
+
+
+

The “hw-address” property

+
  “hw-address”               gchar *
+

Currently set hardware MAC address.

+

Flags: Read

+

Default value: NULL

+
+
+
+

The “mode” property

+
  “mode”                     guint
+

Mode.

+

Flags: Read

Allowed values: <= 3

Default value: 2

-

The "perm-hw-address" property

-
  "perm-hw-address"          gchar*                : Read
-

-The hardware (MAC) address of the device. -

+

The “perm-hw-address” property

+
  “perm-hw-address”          gchar *
+

Permanent hardware MAC address.

+

Flags: Read

Default value: NULL

-

The "wireless-capabilities" property

-
  "wireless-capabilities"    guint                 : Read
-

-The wireless capabilities of the device. -

+

The “wireless-capabilities” property

+
  “wireless-capabilities”    guint
+

Wireless Capabilities.

+

Flags: Read

Default value: 0

Signal Details

-

The "access-point-added" signal

-
void                user_function                      (NMDeviceWifi *device,
-                                                        GObject      *ap,
-                                                        gpointer      user_data)      : Run First
-

-Notifies that a NMAccessPoint is added to the wifi device. -

-
---- - - - - - - - - - - - - - - -

device :

the wifi device that received the signal

ap :

the new access point

user_data :

user data set when the signal handler was connected.
+

The “access-point-added” signal

+
void
+user_function (NMDeviceWifi *device,
+               GObject      *ap,
+               gpointer      user_data)
+

Flags: Run First

-

The "access-point-removed" signal

-
void                user_function                      (NMDeviceWifi *device,
-                                                        GObject      *ap,
-                                                        gpointer      user_data)      : Run First
-

-Notifies that a NMAccessPoint is removed from the wifi device. -

-
---- - - - - - - - - - - - - - - -

device :

the wifi device that received the signal

ap :

the removed access point

user_data :

user data set when the signal handler was connected.
+

The “access-point-removed” signal

+
void
+user_function (NMDeviceWifi *device,
+               GObject      *ap,
+               gpointer      user_data)
+

Flags: Run First

- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20
\ No newline at end of file diff --git a/docs/libnm-glib/html/NMDeviceWimax.html b/docs/libnm-glib/html/NMDeviceWimax.html index 5cd1c4de..c496a2c6 100644 --- a/docs/libnm-glib/html/NMDeviceWimax.html +++ b/docs/libnm-glib/html/NMDeviceWimax.html @@ -2,38 +2,29 @@ -NMDeviceWimax +libnm-glib Reference Manual: NMDeviceWimax - + - - - - - - - - - - + + + + + + +
@@ -41,643 +32,745 @@

NMDeviceWimax

NMDeviceWimax

- +
-
-

Synopsis

-
enum                NMDeviceWimaxError;
-#define             NM_DEVICE_WIMAX_ERROR
-GQuark              nm_device_wimax_error_quark         (void);
-#define             NM_DEVICE_WIMAX_HW_ADDRESS
-#define             NM_DEVICE_WIMAX_ACTIVE_NSP
-#define             NM_DEVICE_WIMAX_CENTER_FREQUENCY
-#define             NM_DEVICE_WIMAX_RSSI
-#define             NM_DEVICE_WIMAX_CINR
-#define             NM_DEVICE_WIMAX_TX_POWER
-#define             NM_DEVICE_WIMAX_BSID
-                    NMDeviceWimax;
-                    NMDeviceWimaxClass;
-GObject *           nm_device_wimax_new                 (DBusGConnection *connection,
-                                                         const char *path);
-const char *        nm_device_wimax_get_hw_address      (NMDeviceWimax *wimax);
-NMWimaxNsp *        nm_device_wimax_get_active_nsp      (NMDeviceWimax *wimax);
-NMWimaxNsp *        nm_device_wimax_get_nsp_by_path     (NMDeviceWimax *wimax,
-                                                         const char *path);
-const GPtrArray *   nm_device_wimax_get_nsps            (NMDeviceWimax *wimax);
-guint               nm_device_wimax_get_center_frequency
-                                                        (NMDeviceWimax *self);
-gint                nm_device_wimax_get_rssi            (NMDeviceWimax *self);
-gint                nm_device_wimax_get_cinr            (NMDeviceWimax *self);
-gint                nm_device_wimax_get_tx_power        (NMDeviceWimax *self);
-const char *        nm_device_wimax_get_bsid            (NMDeviceWimax *self);
-
-
-
-

Object Hierarchy

-
-  GObject
-   +----NMObject
-         +----NMDevice
-               +----NMDeviceWimax
-
-
-
-

Implemented Interfaces

-

-NMDeviceWimax implements - GInitable and GAsyncInitable.

-
-
-

Properties

-
-  "active-nsp"               NMWimaxNsp*           : Read
-  "bsid"                     gchar*                : Read
-  "center-frequency"         guint                 : Read
-  "cinr"                     gint                  : Read
-  "hw-address"               gchar*                : Read
-  "rssi"                     gint                  : Read
-  "tx-power"                 gint                  : Read
-
-
-

Signals

-
-  "nsp-added"                                      : Run First
-  "nsp-removed"                                    : Run First
-
-
-
-

Description

-

-

-
-
-

Details

-
-

enum NMDeviceWimaxError

-
typedef enum {
-	NM_DEVICE_WIMAX_ERROR_UNKNOWN = 0,              /*< nick=UnknownError >*/
-	NM_DEVICE_WIMAX_ERROR_NOT_WIMAX_CONNECTION,     /*< nick=NotWimaxConnection >*/
-	NM_DEVICE_WIMAX_ERROR_INVALID_WIMAX_CONNECTION, /*< nick=InvalidWimaxConnection >*/
-	NM_DEVICE_WIMAX_ERROR_INVALID_DEVICE_MAC,       /*< nick=InvalidDeviceMac >*/
-	NM_DEVICE_WIMAX_ERROR_MAC_MISMATCH,             /*< nick=MacMismatch >*/
-} NMDeviceWimaxError;
-
-
+

Functions

+
--++ - - + - - + - - + - - + - - + - -

NM_DEVICE_WIMAX_ERROR_UNKNOWN

unknown or unclassified error + +GQuark + +nm_device_wimax_error_quark ()

NM_DEVICE_WIMAX_ERROR_NOT_WIMAX_CONNECTION

the connection was not of WiMax type + +GObject * + +nm_device_wimax_new ()

NM_DEVICE_WIMAX_ERROR_INVALID_WIMAX_CONNECTION

the WiMax connection was invalid +const char * + +nm_device_wimax_get_hw_address ()

NM_DEVICE_WIMAX_ERROR_INVALID_DEVICE_MAC

the device's MAC was invalid + +NMWimaxNsp * + +nm_device_wimax_get_active_nsp ()

NM_DEVICE_WIMAX_ERROR_MAC_MISMATCH

the MACs of the connection and the device mismatched + +NMWimaxNsp * + +nm_device_wimax_get_nsp_by_path ()
-
-
-
-

NM_DEVICE_WIMAX_ERROR

-
#define NM_DEVICE_WIMAX_ERROR nm_device_wimax_error_quark ()
-
-

-

-
-
-
-

nm_device_wimax_error_quark ()

-
GQuark              nm_device_wimax_error_quark         (void);
-

-Registers an error quark for NMDeviceWimax if necessary. -

-
---- - - - - -

Returns :

the error quark used for NMDeviceWimax errors.
-
-
-
-

NM_DEVICE_WIMAX_HW_ADDRESS

-
#define NM_DEVICE_WIMAX_HW_ADDRESS       "hw-address"
-
-

-

-
-
-
-

NM_DEVICE_WIMAX_ACTIVE_NSP

-
#define NM_DEVICE_WIMAX_ACTIVE_NSP       "active-nsp"
-
-

-

-
-
-
-

NM_DEVICE_WIMAX_CENTER_FREQUENCY

-
#define NM_DEVICE_WIMAX_CENTER_FREQUENCY "center-frequency"
-
-

-

-
-
-
-

NM_DEVICE_WIMAX_RSSI

-
#define NM_DEVICE_WIMAX_RSSI             "rssi"
-
-

-

-
-
-
-

NM_DEVICE_WIMAX_CINR

-
#define NM_DEVICE_WIMAX_CINR             "cinr"
-
-

-

-
-
-
-

NM_DEVICE_WIMAX_TX_POWER

-
#define NM_DEVICE_WIMAX_TX_POWER         "tx-power"
-
-

-

-
-
-
-

NM_DEVICE_WIMAX_BSID

-
#define NM_DEVICE_WIMAX_BSID             "bsid"
-
-

-

-
-
-
-

NMDeviceWimax

-
typedef struct _NMDeviceWimax NMDeviceWimax;
-

-

-
-
-
-

NMDeviceWimaxClass

-
typedef struct {
-	NMDeviceClass parent;
-
-	/* Signals */
-	void (*nsp_added)   (NMDeviceWimax *self, NMWimaxNsp *nsp);
-	void (*nsp_removed) (NMDeviceWimax *self, NMWimaxNsp *nsp);
-} NMDeviceWimaxClass;
-
-

-

-
-
-
-

nm_device_wimax_new ()

-
GObject *           nm_device_wimax_new                 (DBusGConnection *connection,
-                                                         const char *path);
-

-Creates a new NMDeviceWimax. -

-
---- - - - + - - + + - - + + + + + + + + + + + + +

connection :

the DBusGConnection +const GPtrArray * + +nm_device_wimax_get_nsps ()

path :

the D-Bus object path of the WiMAX device +guint + +nm_device_wimax_get_center_frequency () +

Returns :

a new WiMAX device. [transfer full] + +gint + +nm_device_wimax_get_rssi () +
+gint + +nm_device_wimax_get_cinr () +
+gint + +nm_device_wimax_get_tx_power () +
const char * + +nm_device_wimax_get_bsid ()
-
-
-

nm_device_wimax_get_hw_address ()

-
const char *        nm_device_wimax_get_hw_address      (NMDeviceWimax *wimax);
-

-Gets the hardware (MAC) address of the NMDeviceWimax -

-
+
+

Properties

+
--+++ - - + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + +

wimax :

a NMDeviceWimax - +NMWimaxNsp *active-nspRead
+gchar *bsidRead
guintcenter-frequencyRead
gintcinrRead
+gchar *hw-addressRead

Returns :

the hardware address. This is the internal string used by the -device, and must not be modified.gintrssiRead
ginttx-powerRead
-
-
-

nm_device_wimax_get_active_nsp ()

-
NMWimaxNsp *        nm_device_wimax_get_active_nsp      (NMDeviceWimax *wimax);
-

-Gets the active NMWimaxNsp. -

-
+
+

Signals

+
--+++ - - + + + - - + + +

wimax :

a NMDeviceWimax -voidnsp-addedRun First

Returns :

the access point or NULL if none is active. [transfer full] -voidnsp-removedRun First
-
-
-

nm_device_wimax_get_nsp_by_path ()

-
NMWimaxNsp *        nm_device_wimax_get_nsp_by_path     (NMDeviceWimax *wimax,
-                                                         const char *path);
-

-Gets a NMWimaxNsp by path. -

-
+
+

Types and Values

+
--++ - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + +

wimax :

a NMDeviceWimax -enumNMDeviceWimaxError

path :

the object path of the NSP#defineNM_DEVICE_WIMAX_ERROR

Returns :

the access point or NULL if none is found. [transfer none] -#defineNM_DEVICE_WIMAX_HW_ADDRESS
#defineNM_DEVICE_WIMAX_ACTIVE_NSP
#defineNM_DEVICE_WIMAX_CENTER_FREQUENCY
#defineNM_DEVICE_WIMAX_RSSI
#defineNM_DEVICE_WIMAX_CINR
#defineNM_DEVICE_WIMAX_TX_POWER
#defineNM_DEVICE_WIMAX_BSID
-
-
-

nm_device_wimax_get_nsps ()

-
const GPtrArray *   nm_device_wimax_get_nsps            (NMDeviceWimax *wimax);
+
+

Object Hierarchy

+
    GObject
+    ╰── NMObject
+        ╰── NMDevice
+            ╰── NMDeviceWimax
+
+
+
+

Description

-Gets all the scanned NSPs of the NMDeviceWimax.

-
+ +
+

Functions

+
+

nm_device_wimax_error_quark ()

+
GQuark
+nm_device_wimax_error_quark (void);
+

Registers an error quark for NMDeviceWimax if necessary.

+
+

Returns

+

the error quark used for NMDeviceWimax errors.

+

+
+
+
+
+

nm_device_wimax_new ()

+
GObject *
+nm_device_wimax_new (DBusGConnection *connection,
+                     const char *path);
+

Creates a new NMDeviceWimax.

+
+

Parameters

+
--+++ - - + + + - - + + +

wimax :

a NMDeviceWimax -

connection

the DBusGConnection

 

Returns :

a GPtrArray containing -all the scanned NMWimaxNsps. -The returned array is owned by the client and should not be modified. [element-type NMClient.WimaxNsp] -

path

the D-Bus object path of the WiMAX device

 
+
+

Returns

+

a new WiMAX device.

+

[transfer full]

+
+
-

nm_device_wimax_get_center_frequency ()

-
guint               nm_device_wimax_get_center_frequency
-                                                        (NMDeviceWimax *self);
-

-Gets the center frequency (in KHz) of the radio channel the device is using -to communicate with the network when connected. Has no meaning when the -device is not connected. -

-
+

nm_device_wimax_get_hw_address ()

+
const char *
+nm_device_wimax_get_hw_address (NMDeviceWimax *wimax);
+

Gets the hardware (MAC) address of the NMDeviceWimax

+
+

Parameters

+
+++++ + + + + + +

wimax

a NMDeviceWimax

 
+
+
+

Returns

+

the hardware address. This is the internal string used by the +device, and must not be modified.

+

+
+
+
+
+

nm_device_wimax_get_active_nsp ()

+
NMWimaxNsp *
+nm_device_wimax_get_active_nsp (NMDeviceWimax *wimax);
+

Gets the active NMWimaxNsp.

+
+

Parameters

+
--++++ + + + + + +

wimax

a NMDeviceWimax

 
+
+
+

Returns

+

the access point or NULL if none is active.

+

[transfer full]

+
+
+
+
+

nm_device_wimax_get_nsp_by_path ()

+
NMWimaxNsp *
+nm_device_wimax_get_nsp_by_path (NMDeviceWimax *wimax,
+                                 const char *path);
+

Gets a NMWimaxNsp by path.

+
+

Parameters

+
++++ - - + + + - - + + +

self :

a NMDeviceWimax -

wimax

a NMDeviceWimax

 

Returns :

the center frequency in KHz, or 0

path

the object path of the NSP

 
+
+

Returns

+

the access point or NULL if none is found.

+

[transfer none]

+
+
-

nm_device_wimax_get_rssi ()

-
gint                nm_device_wimax_get_rssi            (NMDeviceWimax *self);
-

-Gets the RSSI of the current radio link in dBm. This value indicates how +

nm_device_wimax_get_nsps ()

+
const GPtrArray *
+nm_device_wimax_get_nsps (NMDeviceWimax *wimax);
+

Gets all the scanned NSPs of the NMDeviceWimax.

+
+

Parameters

+
+++++ + + + + + +

wimax

a NMDeviceWimax

 
+
+
+

Returns

+

a GPtrArray containing +all the scanned NMWimaxNsps. +The returned array is owned by the client and should not be modified.

+

[element-type NMClient.WimaxNsp]

+
+
+
+
+

nm_device_wimax_get_center_frequency ()

+
guint
+nm_device_wimax_get_center_frequency (NMDeviceWimax *self);
+

Gets the center frequency (in KHz) of the radio channel the device is using +to communicate with the network when connected. Has no meaning when the +device is not connected.

+
+

Parameters

+
+++++ + + + + + +

self

a NMDeviceWimax

 
+
+
+

Returns

+

the center frequency in KHz, or 0

+

+
+
+
+
+

nm_device_wimax_get_rssi ()

+
gint
+nm_device_wimax_get_rssi (NMDeviceWimax *self);
+

Gets the RSSI of the current radio link in dBm. This value indicates how strong the raw received RF signal from the base station is, but does not indicate the overall quality of the radio link. Has no meaning when the -device is not connected. -

-
+device is not connected.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

self :

a NMDeviceWimax -

Returns :

the RSSI in dBm, or 0

self

a NMDeviceWimax

 
+
+

Returns

+

the RSSI in dBm, or 0

+

+
+
-

nm_device_wimax_get_cinr ()

-
gint                nm_device_wimax_get_cinr            (NMDeviceWimax *self);
-

-Gets the CINR (Carrier to Interference + Noise Ratio) of the current radio +

nm_device_wimax_get_cinr ()

+
gint
+nm_device_wimax_get_cinr (NMDeviceWimax *self);
+

Gets the CINR (Carrier to Interference + Noise Ratio) of the current radio link in dB. CINR is a more accurate measure of radio link quality. Has no -meaning when the device is not connected. -

-
+meaning when the device is not connected.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

self :

a NMDeviceWimax -

Returns :

the CINR in dB, or 0

self

a NMDeviceWimax

 
+
+

Returns

+

the CINR in dB, or 0

+

+
+
-

nm_device_wimax_get_tx_power ()

-
gint                nm_device_wimax_get_tx_power        (NMDeviceWimax *self);
-

-Average power of the last burst transmitted by the device, in units of +

nm_device_wimax_get_tx_power ()

+
gint
+nm_device_wimax_get_tx_power (NMDeviceWimax *self);
+

Average power of the last burst transmitted by the device, in units of 0.5 dBm. i.e. a TxPower of -11 represents an actual device TX power of --5.5 dBm. Has no meaning when the device is not connected. -

-
+-5.5 dBm. Has no meaning when the device is not connected.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

self :

a NMDeviceWimax -

Returns :

the TX power in dBm, or 0

self

a NMDeviceWimax

 
+
+

Returns

+

the TX power in dBm, or 0

+

+
+
-

nm_device_wimax_get_bsid ()

-
const char *        nm_device_wimax_get_bsid            (NMDeviceWimax *self);
-

-Gets the ID of the serving Base Station when the device is connected. -

-
+

nm_device_wimax_get_bsid ()

+
const char *
+nm_device_wimax_get_bsid (NMDeviceWimax *self);
+

Gets the ID of the serving Base Station when the device is connected.

+
+

Parameters

+
+++++ + + + + + +

self

a NMDeviceWimax

 
+
+
+

Returns

+

the ID of the serving Base Station, or NULL

+

+
+
+
+
+

Types and Values

+
+

enum NMDeviceWimaxError

+
+

Members

+
--+++ - - + + - - + + + + + + + + + + + + + + + + +

self :

a NMDeviceWimax +

NM_DEVICE_WIMAX_ERROR_UNKNOWN

 +

unknown or unclassified error

 

Returns :

the ID of the serving Base Station, or NULL +

NM_DEVICE_WIMAX_ERROR_NOT_WIMAX_CONNECTION

 +

the connection was not of WiMax type

 

NM_DEVICE_WIMAX_ERROR_INVALID_WIMAX_CONNECTION

 +

the WiMax connection was invalid

+		 

NM_DEVICE_WIMAX_ERROR_INVALID_DEVICE_MAC

 +

the device's MAC was invalid

+		 

NM_DEVICE_WIMAX_ERROR_MAC_MISMATCH

 +

the MACs of the connection and the device mismatched

+		 
-
-

Property Details

+
-

The "active-nsp" property

-
  "active-nsp"               NMWimaxNsp*           : Read
+

NM_DEVICE_WIMAX_ERROR

+
#define NM_DEVICE_WIMAX_ERROR nm_device_wimax_error_quark ()
+

-The active NMWimaxNsp of the device.

-

The "bsid" property

-
  "bsid"                     gchar*                : Read
+

NM_DEVICE_WIMAX_HW_ADDRESS

+
#define NM_DEVICE_WIMAX_HW_ADDRESS       "hw-address"
+

-The ID of the serving base station as received from the network. Has -no meaning when the device is not connected.

-

Default value: NULL

-

The "center-frequency" property

-
  "center-frequency"         guint                 : Read
+

NM_DEVICE_WIMAX_ACTIVE_NSP

+
#define NM_DEVICE_WIMAX_ACTIVE_NSP       "active-nsp"
+

-The center frequency (in KHz) of the radio channel the device is using to -communicate with the network when connected. Has no meaning when the -device is not connected.

-

Default value: 0

-

The "cinr" property

-
  "cinr"                     gint                  : Read
+

NM_DEVICE_WIMAX_CENTER_FREQUENCY

+
#define NM_DEVICE_WIMAX_CENTER_FREQUENCY "center-frequency"
+

-CINR (Carrier to Interference + Noise Ratio) of the current radio link -in dB. CINR is a more accurate measure of radio link quality. Has no -meaning when the device is not connected.

-

Default value: 0

-

The "hw-address" property

-
  "hw-address"               gchar*                : Read
+

NM_DEVICE_WIMAX_RSSI

+
#define NM_DEVICE_WIMAX_RSSI             "rssi"
+

-The hardware (MAC) address of the device.

-

Default value: NULL

-

The "rssi" property

-
  "rssi"                     gint                  : Read
+

NM_DEVICE_WIMAX_CINR

+
#define NM_DEVICE_WIMAX_CINR             "cinr"
+

-RSSI of the current radio link in dBm. This value indicates how strong -the raw received RF signal from the base station is, but does not -indicate the overall quality of the radio link. Has no meaning when the -device is not connected.

-

Default value: 0

-

The "tx-power" property

-
  "tx-power"                 gint                  : Read
+

NM_DEVICE_WIMAX_TX_POWER

+
#define NM_DEVICE_WIMAX_TX_POWER         "tx-power"
+
+

+

+
+
+
+

NM_DEVICE_WIMAX_BSID

+
#define NM_DEVICE_WIMAX_BSID             "bsid"
+

-Average power of the last burst transmitted by the device, in units of -0.5 dBm. i.e. a TxPower of -11 represents an actual device TX power of --5.5 dBm. Has no meaning when the device is not connected.

+
+
+
+

Property Details

+
+

The “active-nsp” property

+
  “active-nsp”               NMWimaxNsp *
+

Active NSP.

+

Flags: Read

+
+
+
+

The “bsid” property

+
  “bsid”                     gchar *
+

BSID.

+

Flags: Read

+

Default value: NULL

+
+
+
+

The “center-frequency” property

+
  “center-frequency”         guint
+

Center frequency.

+

Flags: Read

+

Default value: 0

+
+
+
+

The “cinr” property

+
  “cinr”                     gint
+

CINR.

+

Flags: Read

+

Default value: 0

+
+
+
+

The “hw-address” property

+
  “hw-address”               gchar *
+

Hardware MAC address.

+

Flags: Read

+

Default value: NULL

+
+
+
+

The “rssi” property

+
  “rssi”                     gint
+

RSSI.

+

Flags: Read

+

Default value: 0

+
+
+
+

The “tx-power” property

+
  “tx-power”                 gint
+

TX Power.

+

Flags: Read

Default value: 0

Signal Details

-

The "nsp-added" signal

-
void                user_function                      (NMDeviceWimax *self,
-                                                        GObject       *nsp,
-                                                        gpointer       user_data)      : Run First
-

-Notifies that a NMWimaxNsp is added to the wimax device. -

-
---- - - - - - - - - - - - - - - -

self :

the wimax device that received the signal

nsp :

the new NSP

user_data :

user data set when the signal handler was connected.
+

The “nsp-added” signal

+
void
+user_function (NMDeviceWimax *self,
+               GObject       *nsp,
+               gpointer       user_data)
+

Flags: Run First

-

The "nsp-removed" signal

-
void                user_function                      (NMDeviceWimax *self,
-                                                        GObject       *nsp,
-                                                        gpointer       user_data)      : Run First
-

-Notifies that a NMWimaxNsp is removed from the wimax device. -

-
---- - - - - - - - - - - - - - - -

self :

the wimax device that received the signal

nsp :

the removed NSP

user_data :

user data set when the signal handler was connected.
+

The “nsp-removed” signal

+
void
+user_function (NMDeviceWimax *self,
+               GObject       *nsp,
+               gpointer       user_data)
+

Flags: Run First

- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20
\ No newline at end of file diff --git a/docs/libnm-glib/html/NMIP4Config.html b/docs/libnm-glib/html/NMIP4Config.html index 7aa6f67d..4c5fbe76 100644 --- a/docs/libnm-glib/html/NMIP4Config.html +++ b/docs/libnm-glib/html/NMIP4Config.html @@ -2,36 +2,28 @@ -NMIP4Config +libnm-glib Reference Manual: NMIP4Config - + - - - - - - - - - - + + + + + + +
@@ -39,334 +31,405 @@

NMIP4Config

NMIP4Config

- +
-
-

Synopsis

-
                    NMIP4Config;
-                    NMIP4ConfigClass;
-#define             NM_IP4_CONFIG_ADDRESSES
-#define             NM_IP4_CONFIG_NAMESERVERS
-#define             NM_IP4_CONFIG_DOMAINS
-#define             NM_IP4_CONFIG_ROUTES
-#define             NM_IP4_CONFIG_WINS_SERVERS
-GObject *           nm_ip4_config_new                   (DBusGConnection *connection,
-                                                         const char *object_path);
-const GSList *      nm_ip4_config_get_addresses         (NMIP4Config *config);
-const GArray *      nm_ip4_config_get_nameservers       (NMIP4Config *config);
-const GPtrArray *   nm_ip4_config_get_domains           (NMIP4Config *config);
-const GSList *      nm_ip4_config_get_routes            (NMIP4Config *config);
-const GArray *      nm_ip4_config_get_wins_servers      (NMIP4Config *config);
-
-
-
-

Object Hierarchy

-
-  GObject
-   +----NMObject
-         +----NMIP4Config
-
-
-
-

Implemented Interfaces

-

-NMIP4Config implements - GInitable and GAsyncInitable.

-
-

Properties

-
-  "addresses"                gpointer              : Read
-  "domains"                  NMStringArray*        : Read
-  "nameservers"              NMUintArray*          : Read
-  "routes"                   gpointer              : Read
-  "wins-servers"             NMUintArray*          : Read
-
-
-
-

Description

-

-

-
-
-

Details

-
-

NMIP4Config

-
typedef struct _NMIP4Config NMIP4Config;
-

-

-
-
-
-

NMIP4ConfigClass

-
typedef struct {
-	NMObjectClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMIP4ConfigClass;
-
-

-

-
-
-
-

NM_IP4_CONFIG_ADDRESSES

-
#define NM_IP4_CONFIG_ADDRESSES "addresses"
-
-

-

-
-
-
-

NM_IP4_CONFIG_NAMESERVERS

-
#define NM_IP4_CONFIG_NAMESERVERS "nameservers"
-
-

-

-
-
-
-

NM_IP4_CONFIG_DOMAINS

-
#define NM_IP4_CONFIG_DOMAINS "domains"
-
-

-

-
-
-
-

NM_IP4_CONFIG_ROUTES

-
#define NM_IP4_CONFIG_ROUTES "routes"
-
-

-

-
-
-
-

NM_IP4_CONFIG_WINS_SERVERS

-
#define NM_IP4_CONFIG_WINS_SERVERS "wins-servers"
-
-

-

-
-
-
-

nm_ip4_config_new ()

-
GObject *           nm_ip4_config_new                   (DBusGConnection *connection,
-                                                         const char *object_path);
-

-Creates a new NMIP4Config. -

-
+

Functions

+
--++ - - + - - + + - - + - -

connection :

the DBusGConnection + +GObject * + +nm_ip4_config_new ()

object_path :

the DBus object path of the deviceconst GSList * + +nm_ip4_config_get_addresses () +

Returns :

a new IP4 configuration. [transfer full] +const GArray * + +nm_ip4_config_get_nameservers ()
-
-
-
-

nm_ip4_config_get_addresses ()

-
const GSList *      nm_ip4_config_get_addresses         (NMIP4Config *config);
-

-Gets the IP4 addresses (containing the address, prefix, and gateway). -

-
---- - - - + + + + + - - +

config :

a NMIP4Config +const GPtrArray * + +nm_ip4_config_get_domains () +
const GSList * + +nm_ip4_config_get_routes ()

Returns :

the GSList containing NMIP4Addresses. -This is the internal copy used by the configuration and must not be modified. [element-type NetworkManager.IP4Address] +const GArray * + +nm_ip4_config_get_wins_servers ()
-
-
-

nm_ip4_config_get_nameservers ()

-
const GArray *      nm_ip4_config_get_nameservers       (NMIP4Config *config);
-

-Gets the domain name servers (DNS). -

-
+
+

Properties

+
--+++ - - + + + - - + + + + + + + + + + + + + + + + + +

config :

a NMIP4Config -gpointeraddressesRead

Returns :

the GArray containing guint32s. This is the internal copy used by the -configuration and must not be modified. [element-type guint32] - +NMStringArray *domainsRead
+NMUintArray *nameserversRead
gpointerroutesRead
+NMUintArray *wins-serversRead
-
-
-

nm_ip4_config_get_domains ()

-
const GPtrArray *   nm_ip4_config_get_domains           (NMIP4Config *config);
-

-Gets the domain names. -

-
+
+

Types and Values

+
--++ - - + + - - + + + + + + + + + + + + + +

config :

a NMIP4Config -#defineNM_IP4_CONFIG_ADDRESSES

Returns :

the GPtrArray containing domains as strings. This is the -internal copy used by the configuration, and must not be modified. [element-type utf8] -#defineNM_IP4_CONFIG_NAMESERVERS
#defineNM_IP4_CONFIG_DOMAINS
#defineNM_IP4_CONFIG_ROUTES
#defineNM_IP4_CONFIG_WINS_SERVERS
-
-
-

nm_ip4_config_get_routes ()

-
const GSList *      nm_ip4_config_get_routes            (NMIP4Config *config);
+
+

Object Hierarchy

+
    GObject
+    ╰── NMObject
+        ╰── NMIP4Config
+
+
+
+

Description

-Gets the routes.

-
+ +
+

Functions

+
+

nm_ip4_config_new ()

+
GObject *
+nm_ip4_config_new (DBusGConnection *connection,
+                   const char *object_path);
+

Creates a new NMIP4Config.

+
+

Parameters

+
--+++ - - + + + - - + + +

config :

a NMIP4Config -

connection

the DBusGConnection

 

Returns :

the GSList containing -NMIP4Routes. This is the internal copy used by the configuration, -and must not be modified. [element-type NetworkManager.IP4Route] -

object_path

the DBus object path of the device

 
+
+

Returns

+

a new IP4 configuration.

+

[transfer full]

+
+
-

nm_ip4_config_get_wins_servers ()

-
const GArray *      nm_ip4_config_get_wins_servers      (NMIP4Config *config);
-

-Gets the Windows Internet Name Service servers (WINS). -

-
+

nm_ip4_config_get_addresses ()

+
const GSList *
+nm_ip4_config_get_addresses (NMIP4Config *config);
+

Gets the IP4 addresses (containing the address, prefix, and gateway).

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + + +

config :

a NMIP4Config -

Returns :

the GArray containing guint32s. -This is the internal copy used by the configuration and must not be modified. [element-type guint32] -

config

a NMIP4Config

 
+
+
+

Returns

+

the GSList containing NMIP4Addresses. +This is the internal copy used by the configuration and must not be modified.

+

[element-type NetworkManager.IP4Address]

+
+
+
+
+

nm_ip4_config_get_nameservers ()

+
const GArray *
+nm_ip4_config_get_nameservers (NMIP4Config *config);
+

Gets the domain name servers (DNS).

+
+

Parameters

+
+++++ + + + + + +

config

a NMIP4Config

 
+
+
+

Returns

+

the GArray containing guint32s. This is the internal copy used by the +configuration and must not be modified.

+

[element-type guint32]

+
+
+
+
+

nm_ip4_config_get_domains ()

+
const GPtrArray *
+nm_ip4_config_get_domains (NMIP4Config *config);
+

Gets the domain names.

+
+

Parameters

+
+++++ + + + + + +

config

a NMIP4Config

 
+
+
+

Returns

+

the GPtrArray containing domains as strings. This is the +internal copy used by the configuration, and must not be modified.

+

[element-type utf8]

+
+
+
+
+

nm_ip4_config_get_routes ()

+
const GSList *
+nm_ip4_config_get_routes (NMIP4Config *config);
+

Gets the routes.

+
+

Parameters

+
+++++ + + + + +

config

a NMIP4Config

 
+
+

Returns

+

the GSList containing +NMIP4Routes. This is the internal copy used by the configuration, +and must not be modified.

+

[element-type NetworkManager.IP4Route]

+
+
+
+
+

nm_ip4_config_get_wins_servers ()

+
const GArray *
+nm_ip4_config_get_wins_servers (NMIP4Config *config);
+

Gets the Windows Internet Name Service servers (WINS).

+
+

Parameters

+
+++++ + + + + + +

config

a NMIP4Config

 
+
+
+

Returns

+

the GArray containing guint32s. +This is the internal copy used by the configuration and must not be modified.

+

[element-type guint32]

+
+
-

Property Details

+

Types and Values

-

The "addresses" property

-
  "addresses"                gpointer              : Read
+

NM_IP4_CONFIG_ADDRESSES

+
#define NM_IP4_CONFIG_ADDRESSES "addresses"
+

-The GPtrArray containing NMSettingIP4Addresses of the configuration.

-

The "domains" property

-
  "domains"                  NMStringArray*        : Read
+

NM_IP4_CONFIG_NAMESERVERS

+
#define NM_IP4_CONFIG_NAMESERVERS "nameservers"
+

-The GPtrArray containing domain strings of the configuration.

-

The "nameservers" property

-
  "nameservers"              NMUintArray*          : Read
+

NM_IP4_CONFIG_DOMAINS

+
#define NM_IP4_CONFIG_DOMAINS "domains"
+

-The GArray containing name servers (guint32es) of the configuration.

-

The "routes" property

-
  "routes"                   gpointer              : Read
+

NM_IP4_CONFIG_ROUTES

+
#define NM_IP4_CONFIG_ROUTES "routes"
+

-The GPtrArray containing NMSettingIP4Routes of the configuration.

-

The "wins-servers" property

-
  "wins-servers"             NMUintArray*          : Read
+

NM_IP4_CONFIG_WINS_SERVERS

+
#define NM_IP4_CONFIG_WINS_SERVERS "wins-servers"
+

-The GArray containing WINS servers (guint32es) of the configuration.

+
+

Property Details

+
+

The “addresses” property

+
  “addresses”                gpointer
+

Addresses.

+

Flags: Read

+
+
+
+

The “domains” property

+
  “domains”                  NMStringArray *
+

Domains.

+

Flags: Read

+
+
+
+

The “nameservers” property

+
  “nameservers”              NMUintArray *
+

Nameservers.

+

Flags: Read

+
+
+
+

The “routes” property

+
  “routes”                   gpointer
+

Routes.

+

Flags: Read

+
+
+
+

The “wins-servers” property

+
  “wins-servers”             NMUintArray *
+

WINS Servers.

+

Flags: Read

+
+
- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20 \ No newline at end of file diff --git a/docs/libnm-glib/html/NMIP6Config.html b/docs/libnm-glib/html/NMIP6Config.html index 67518a3d..4d918c54 100644 --- a/docs/libnm-glib/html/NMIP6Config.html +++ b/docs/libnm-glib/html/NMIP6Config.html @@ -2,36 +2,28 @@ -NMIP6Config +libnm-glib Reference Manual: NMIP6Config - + - - - - - - - - - - + + + + + + +
@@ -39,294 +31,349 @@

NMIP6Config

NMIP6Config

- +
-
-

Synopsis

-
                    NMIP6Config;
-                    NMIP6ConfigClass;
-#define             NM_IP6_CONFIG_ADDRESSES
-#define             NM_IP6_CONFIG_NAMESERVERS
-#define             NM_IP6_CONFIG_DOMAINS
-#define             NM_IP6_CONFIG_ROUTES
-GObject *           nm_ip6_config_new                   (DBusGConnection *connection,
-                                                         const char *object_path);
-const GSList *      nm_ip6_config_get_addresses         (NMIP6Config *config);
-const GSList *      nm_ip6_config_get_nameservers       (NMIP6Config *config);
-const GPtrArray *   nm_ip6_config_get_domains           (NMIP6Config *config);
-const GSList *      nm_ip6_config_get_routes            (NMIP6Config *config);
-
-
-
-

Object Hierarchy

-
-  GObject
-   +----NMObject
-         +----NMIP6Config
-
-
-
-

Implemented Interfaces

-

-NMIP6Config implements - GInitable and GAsyncInitable.

-
-

Properties

-
-  "addresses"                NMIP6AddressObjectArray*  : Read
-  "domains"                  NMStringArray*        : Read
-  "nameservers"              NMIP6AddressArray*    : Read
-  "routes"                   NMIP6RouteObjectArray*  : Read
-
-
-
-

Description

-

-

-
-
-

Details

-
-

NMIP6Config

-
typedef struct _NMIP6Config NMIP6Config;
-

-

-
-
-
-

NMIP6ConfigClass

-
typedef struct {
-	NMObjectClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMIP6ConfigClass;
-
-

-

-
-
-
-

NM_IP6_CONFIG_ADDRESSES

-
#define NM_IP6_CONFIG_ADDRESSES "addresses"
-
-

-

-
-
-
-

NM_IP6_CONFIG_NAMESERVERS

-
#define NM_IP6_CONFIG_NAMESERVERS "nameservers"
-
-

-

-
-
-
-

NM_IP6_CONFIG_DOMAINS

-
#define NM_IP6_CONFIG_DOMAINS "domains"
-
-

-

-
-
-
-

NM_IP6_CONFIG_ROUTES

-
#define NM_IP6_CONFIG_ROUTES "routes"
-
-

-

-
-
-
-

nm_ip6_config_new ()

-
GObject *           nm_ip6_config_new                   (DBusGConnection *connection,
-                                                         const char *object_path);
-

-Creates a new NMIP6Config. -

-
+

Functions

+
--++ - - + - - + + - - + - -

connection :

the DBusGConnection + +GObject * + +nm_ip6_config_new ()

object_path :

the DBus object path of the deviceconst GSList * + +nm_ip6_config_get_addresses () +

Returns :

a new IP6 configuration. [transfer full] +const GSList * + +nm_ip6_config_get_nameservers ()
-
-
-
-

nm_ip6_config_get_addresses ()

-
const GSList *      nm_ip6_config_get_addresses         (NMIP6Config *config);
-

-Gets the IP6 addresses (containing the address, prefix, and gateway). -

-
---- - - - + - - +

config :

a NMIP6Config +const GPtrArray * + +nm_ip6_config_get_domains ()

Returns :

the GSList containing -NMIP6Addresses. This is the internal copy used by the configuration -and must not be modified. [element-type NetworkManager.IP6Address] +const GSList * + +nm_ip6_config_get_routes ()
-
-
-

nm_ip6_config_get_nameservers ()

-
const GSList *      nm_ip6_config_get_nameservers       (NMIP6Config *config);
-

-Gets the domain name servers (DNS). -

-
+
+

Properties

+
--+++ - - + + + - - + + + + + + + + + + + + +

config :

a NMIP6Config - +NMIP6AddressObjectArray *addressesRead

Returns :

a GSList containing elements of type 'struct in6_addr' which -contain the addresses of nameservers of the configuration. This is the -internal copy used by the configuration and must not be modified. +NMStringArray *domainsRead
+NMIP6AddressArray *nameserversRead
+NMIP6RouteObjectArray *routesRead
-
-
-

nm_ip6_config_get_domains ()

-
const GPtrArray *   nm_ip6_config_get_domains           (NMIP6Config *config);
-

-Gets the domain names. -

-
+
+

Types and Values

+
--++ - - + + - - + + + + + + + + + +

config :

a NMIP6Config -#defineNM_IP6_CONFIG_ADDRESSES

Returns :

the GPtrArray containing domains as strings. -This is the internal copy used by the configuration, and must not be modified. [element-type utf8] -#defineNM_IP6_CONFIG_NAMESERVERS
#defineNM_IP6_CONFIG_DOMAINS
#defineNM_IP6_CONFIG_ROUTES
-
-
-

nm_ip6_config_get_routes ()

-
const GSList *      nm_ip6_config_get_routes            (NMIP6Config *config);
+
+

Object Hierarchy

+
    GObject
+    ╰── NMObject
+        ╰── NMIP6Config
+
+
+
+

Description

-Gets the routes.

-
+ +
+

Functions

+
+

nm_ip6_config_new ()

+
GObject *
+nm_ip6_config_new (DBusGConnection *connection,
+                   const char *object_path);
+

Creates a new NMIP6Config.

+
+

Parameters

+
--+++ - - + + + - - + + +

config :

a NMIP6Config -

connection

the DBusGConnection

 

Returns :

the GSList containing -NMIP6Routes. This is the internal copy used by the configuration, -and must not be modified. [element-type NetworkManager.IP6Route] -

object_path

the DBus object path of the device

 
+
+

Returns

+

a new IP6 configuration.

+

[transfer full]

+
+
+
+
+

nm_ip6_config_get_addresses ()

+
const GSList *
+nm_ip6_config_get_addresses (NMIP6Config *config);
+

Gets the IP6 addresses (containing the address, prefix, and gateway).

+
+

Parameters

+
+++++ + + + + + +

config

a NMIP6Config

 
+
+
+

Returns

+

the GSList containing +NMIP6Addresses. This is the internal copy used by the configuration +and must not be modified.

+

[element-type NetworkManager.IP6Address]

+
+
+
+
+

nm_ip6_config_get_nameservers ()

+
const GSList *
+nm_ip6_config_get_nameservers (NMIP6Config *config);
+

Gets the domain name servers (DNS).

+
+

Parameters

+
+++++ + + + + + +

config

a NMIP6Config

 
+
+
+

Returns

+

a GSList containing elements of type 'struct in6_addr' which +contain the addresses of nameservers of the configuration. This is the +internal copy used by the configuration and must not be modified.

+

+
+
+
+
+

nm_ip6_config_get_domains ()

+
const GPtrArray *
+nm_ip6_config_get_domains (NMIP6Config *config);
+

Gets the domain names.

+
+

Parameters

+
+++++ + + + + + +

config

a NMIP6Config

 
+
+
+

Returns

+

the GPtrArray containing domains as strings. +This is the internal copy used by the configuration, and must not be modified.

+

[element-type utf8]

+
+
+
+
+

nm_ip6_config_get_routes ()

+
const GSList *
+nm_ip6_config_get_routes (NMIP6Config *config);
+

Gets the routes.

+
+

Parameters

+
+++++ + + + + + +

config

a NMIP6Config

 
+
+
+

Returns

+

the GSList containing +NMIP6Routes. This is the internal copy used by the configuration, +and must not be modified.

+

[element-type NetworkManager.IP6Route]

+
+
-

Property Details

+

Types and Values

-

The "addresses" property

-
  "addresses"                NMIP6AddressObjectArray*  : Read
+

NM_IP6_CONFIG_ADDRESSES

+
#define NM_IP6_CONFIG_ADDRESSES "addresses"
+

-The GPtrArray containing the IPv6 addresses; use -nm_utils_ip6_addresses_from_gvalue() to return a GSList of -NMSettingIP6Address objects that is more usable than the raw data.

-

The "domains" property

-
  "domains"                  NMStringArray*        : Read
+

NM_IP6_CONFIG_NAMESERVERS

+
#define NM_IP6_CONFIG_NAMESERVERS "nameservers"
+

-The GPtrArray containing domain strings of the configuration.

-

The "nameservers" property

-
  "nameservers"              NMIP6AddressArray*    : Read
+

NM_IP6_CONFIG_DOMAINS

+
#define NM_IP6_CONFIG_DOMAINS "domains"
+

-The GPtrArray containing elements of type 'struct ip6_addr' which -contain the addresses of nameservers of the configuration.

-

The "routes" property

-
  "routes"                   NMIP6RouteObjectArray*  : Read
+

NM_IP6_CONFIG_ROUTES

+
#define NM_IP6_CONFIG_ROUTES "routes"
+

-The GPtrArray containing the IPv6 routes; use -nm_utils_ip6_routes_from_gvalue() to return a GSList of -NMSettingIP6Address objects that is more usable than the raw data.

+
+

Property Details

+
+

The “addresses” property

+
  “addresses”                NMIP6AddressObjectArray *
+

Addresses.

+

Flags: Read

+
+
+
+

The “domains” property

+
  “domains”                  NMStringArray *
+

Domains.

+

Flags: Read

+
+
+
+

The “nameservers” property

+
  “nameservers”              NMIP6AddressArray *
+

Nameservers.

+

Flags: Read

+
+
+
+

The “routes” property

+
  “routes”                   NMIP6RouteObjectArray *
+

Routes.

+

Flags: Read

+
+
- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20 \ No newline at end of file diff --git a/docs/libnm-glib/html/NMObject.html b/docs/libnm-glib/html/NMObject.html index 99b05001..6d3c8a09 100644 --- a/docs/libnm-glib/html/NMObject.html +++ b/docs/libnm-glib/html/NMObject.html @@ -2,38 +2,29 @@ -NMObject +libnm-glib Reference Manual: NMObject - + - - - - - - - - - - + + + + + + +
@@ -41,281 +32,286 @@

NMObject

NMObject

- +
-
-

Synopsis

-
enum                NMObjectError;
-#define             NM_OBJECT_ERROR
-GQuark              nm_object_error_quark               (void);
-#define             NM_OBJECT_DBUS_CONNECTION
-#define             NM_OBJECT_DBUS_PATH
-                    NMObject;
-                    NMObjectClass;
-DBusGConnection *   nm_object_get_connection            (NMObject *object);
-const char *        nm_object_get_path                  (NMObject *object);
-
-
-
-

Object Hierarchy

-
-  GObject
-   +----NMObject
-         +----NMClient
-         +----NMDevice
-         +----NMWimaxNsp
-         +----NMAccessPoint
-         +----NMIP4Config
-         +----NMIP6Config
-         +----NMActiveConnection
-         +----NMDHCP4Config
-         +----NMDHCP6Config
-
-
-

Implemented Interfaces

-

-NMObject implements - GInitable and GAsyncInitable.

+

Functions

+
++++ + + + + + + + + + + + + + + +
+GQuark + +nm_object_error_quark () +
+DBusGConnection * + +nm_object_get_connection () +
const char * + +nm_object_get_path () +

Properties

-
-  "dbus-connection"          DBusGConnection*      : Read / Write / Construct Only
-  "dbus-path"                gchar*                : Read / Write / Construct Only
-
+
+++++ + + + + + + + + + + + + +
+DBusGConnection *dbus-connectionRead / Write / Construct Only
+gchar *dbus-pathRead / Write / Construct Only

Signals

-
-  "object-creation-failed"                         : Run First
-
-
-
-

Description

-

-

+
+++++ + + + + + +
voidobject-creation-failedRun First
-

Details

-
-

enum NMObjectError

-
typedef enum {
-	NM_OBJECT_ERROR_UNKNOWN = 0,
-	NM_OBJECT_ERROR_OBJECT_CREATION_FAILURE,
-} NMObjectError;
-
-

-Describes errors that may result from operations involving a NMObject. -

-
+

Types and Values

+
--++ - - + + - - + + + + + + + + + +

NM_OBJECT_ERROR_UNKNOWN

unknown or unclassified error -enumNMObjectError

NM_OBJECT_ERROR_OBJECT_CREATION_FAILURE

an error ocured while creating an NMObject -#defineNM_OBJECT_ERROR
#defineNM_OBJECT_DBUS_CONNECTION
#defineNM_OBJECT_DBUS_PATH
-
-
-

NM_OBJECT_ERROR

-
#define NM_OBJECT_ERROR nm_object_error_quark ()
+

+
Object Hierarchy

+
    GObject
+    ╰── NMObject
+        ├── NMClient
+        ├── NMDevice
+        ├── NMWimaxNsp
+        ├── NMAccessPoint
+        ├── NMIP4Config
+        ├── NMIP6Config
+        ├── NMActiveConnection
+        ├── NMDHCP4Config
+        ╰── NMDHCP6Config
 

+

+

+
Description

 

 

 

+

+
Functions

+

+
nm_object_error_quark ()

+
GQuark
+nm_object_error_quark (void);

+
Registers an error quark for NMObject if necessary.

+

+
Returns

+
 the error quark used for NMObject errors.

+

+

+

 

 

-
nm_object_error_quark ()

-
GQuark              nm_object_error_quark               (void);

-

-Registers an error quark for NMObject if necessary.
-

-

+
nm_object_get_connection ()

+
DBusGConnection *
+nm_object_get_connection (NMObject *object);

+
Gets the NMObject's DBusGConnection.

+

+
Parameters

+
--+++
-
-
+
+
+

 





 
 
Returns :
the error quark used for NMObject errors.
object
a NMObject
 
 

 

 

-

-

-
NM_OBJECT_DBUS_CONNECTION

-
#define NM_OBJECT_DBUS_CONNECTION "dbus-connection"
-

-

-

+

+
Returns

+
 the connection. 

+
[transfer none]

 

-

-

-
NM_OBJECT_DBUS_PATH

-
#define NM_OBJECT_DBUS_PATH "dbus-path"
-

-

-

 

 

 

-
NMObject

-
typedef struct _NMObject NMObject;

-

-

+
nm_object_get_path ()

+
const char *
+nm_object_get_path (NMObject *object);

+
Gets the DBus path of the NMObject.

+

+
Parameters

+

+++++
+
+
+
+
+
+





object
a NMObject
 

 

-

-

-
NMObjectClass

-
typedef struct {
-	GObjectClass parent;
-
-	/* Signals */
-	/* The "object-creation-failed" signal is PRIVATE for libnm-glib and
-	 * is not meant for any external usage.  It indicates that an error
-	 * occured during creation of an object.
-	 */
-	void (*object_creation_failed) (NMObject *master_object,
-	                                GError *error,
-	                                char *failed_path);
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMObjectClass;
-

-

-

+

+
Returns

+
 the object's path. This is the internal string used by the
+device, and must not be modified.

+

 

-

+

+

+

+
Types and Values

 

-
nm_object_get_connection ()

-
DBusGConnection *   nm_object_get_connection            (NMObject *object);

-

-Gets the NMObject's DBusGConnection.
-

-

+
enum NMObjectError

+
Describes errors that may result from operations involving a NMObject.

+

+
Members

+
--+++
-
-
+
+
-
-
+
+

 





 
 
 
object :
a NMObject
+
NM_OBJECT_ERROR_UNKNOWN

+
unknown or unclassified error

 		 
 

 
Returns :
the connection. [transfer none]
+
NM_OBJECT_ERROR_OBJECT_CREATION_FAILURE

+
an error ocured while creating an NMObject

 		 
 

 
 

 

+

 

 

-
nm_object_get_path ()

-
const char *        nm_object_get_path                  (NMObject *object);

+
NM_OBJECT_ERROR

+
#define NM_OBJECT_ERROR nm_object_error_quark ()
+

+

+

+

+

+

+
NM_OBJECT_DBUS_CONNECTION

+
#define NM_OBJECT_DBUS_CONNECTION "dbus-connection"
+

+

+

+

+

+

+
NM_OBJECT_DBUS_PATH

+
#define NM_OBJECT_DBUS_PATH "dbus-path"
+

 

-Gets the DBus path of the NMObject.
 

-

----
-
-
-
-
-
-
-
-
-
-
-




object :
a NMObject
-
Returns :
the object's path. This is the internal string used by the
-device, and must not be modified.

 

 

 

 
Property Details

 

-
The "dbus-connection" property

-
  "dbus-connection"          DBusGConnection*      : Read / Write / Construct Only

+
The “dbus-connection” property

+
  “dbus-connection”          DBusGConnection *

 
Connection.

+
Flags: Read / Write / Construct Only

 

 

 

-
The "dbus-path" property

-
  "dbus-path"                gchar*                : Read / Write / Construct Only

+
The “dbus-path” property

+
  “dbus-path”                gchar *

 
DBus Object Path.

+
Flags: Read / Write / Construct Only

 
Default value: NULL

 

 

 

 
Signal Details

 

-
The "object-creation-failed" signal

-
void                user_function                      (NMObject *master_object,
-                                                        gpointer  error,
-                                                        gpointer  failed_path,
-                                                        gpointer  user_data)          : Run First

-

-Indicates that an error occured while creating an NMObject object
-during property handling of master_object.
-

-

-Note: Be aware that the signal is private for libnm-glib's internal
-      use.
-

-

----
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-




master_object :
the object that received the signal
error :
the error that occured while creating object
failed_path :
object path of the failed object
user_data :
user data set when the signal handler was connected.

+
The “object-creation-failed” signal

+
void
+user_function (NMObject *master_object,
+               gpointer  error,
+               gpointer  failed_path,
+               gpointer  user_data)

+
Flags: Run First

 

 

 

 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.20
\ No newline at end of file diff --git a/docs/libnm-glib/html/NMRemoteConnection.html b/docs/libnm-glib/html/NMRemoteConnection.html index 127b665b..36b650d5 100644 --- a/docs/libnm-glib/html/NMRemoteConnection.html +++ b/docs/libnm-glib/html/NMRemoteConnection.html @@ -2,38 +2,29 @@ -NMRemoteConnection +libnm-glib Reference Manual: NMRemoteConnection - + - - - - - - - - - - + + + + + + +
@@ -41,467 +32,511 @@

NMRemoteConnection

NMRemoteConnection

- +
-
-

Synopsis

-
#define             NM_REMOTE_CONNECTION_UPDATED
-#define             NM_REMOTE_CONNECTION_REMOVED
-                    NMRemoteConnection;
-                    NMRemoteConnectionClass;
-void                (*NMRemoteConnectionCommitFunc)     (NMRemoteConnection *connection,
-                                                         GError *error,
-                                                         gpointer user_data);
-void                (*NMRemoteConnectionDeleteFunc)     (NMRemoteConnection *connection,
-                                                         GError *error,
-                                                         gpointer user_data);
-void                (*NMRemoteConnectionGetSecretsFunc) (NMRemoteConnection *connection,
-                                                         GHashTable *secrets,
-                                                         GError *error,
-                                                         gpointer user_data);
-NMRemoteConnection * nm_remote_connection_new           (DBusGConnection *bus,
-                                                         const char *path);
-void                nm_remote_connection_commit_changes (NMRemoteConnection *connection,
-                                                         NMRemoteConnectionCommitFunc callback,
-                                                         gpointer user_data);
-void                nm_remote_connection_delete         (NMRemoteConnection *connection,
-                                                         NMRemoteConnectionDeleteFunc callback,
-                                                         gpointer user_data);
-void                nm_remote_connection_get_secrets    (NMRemoteConnection *connection,
-                                                         const char *setting_name,
-                                                         NMRemoteConnectionGetSecretsFunc callback,
-                                                         gpointer user_data);
-
-
-
-

Object Hierarchy

-
-  GObject
-   +----NMConnection
-         +----NMRemoteConnection
-
-
-

Implemented Interfaces

-

-NMRemoteConnection implements - GInitable and GAsyncInitable.

+

Functions

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+void + +(*NMRemoteConnectionCommitFunc) () +
+void + +(*NMRemoteConnectionDeleteFunc) () +
+void + +(*NMRemoteConnectionGetSecretsFunc) () +
+NMRemoteConnection * + +nm_remote_connection_new () +
+void + +nm_remote_connection_commit_changes () +
+void + +nm_remote_connection_delete () +
+void + +nm_remote_connection_get_secrets () +

Properties

-
-  "bus"                      DBusGConnection*      : Write / Construct Only
-  "dbus-connection"          DBusGConnection*      : Write / Construct Only
-  "dbus-path"                gchar*                : Write / Construct Only
-
+
+++++ + + + + + + + + + + + + + + + + + +
+DBusGConnection *busWrite / Construct Only
+DBusGConnection *dbus-connectionWrite / Construct Only
+gchar *dbus-pathWrite / Construct Only

Signals

-
-  "removed"                                        : Run First
-  "updated"                                        : Run First
-  "visible"                                        : Run First
-
+
+++++ + + + + + + + + + + + + + + + + + +
voidremovedRun First
voidupdatedRun First
voidvisibleRun First
-

Description

-

-

+

Types and Values

+
++++ + + + + + + + + + + +
#defineNM_REMOTE_CONNECTION_UPDATED
#defineNM_REMOTE_CONNECTION_REMOVED
-

Details

-
-

NM_REMOTE_CONNECTION_UPDATED

-
#define NM_REMOTE_CONNECTION_UPDATED         "updated"
-
-

-

-
-
-
-

NM_REMOTE_CONNECTION_REMOVED

-
#define NM_REMOTE_CONNECTION_REMOVED         "removed"
+
Object Hierarchy

+
    GObject
+    ╰── NMConnection
+        ╰── NMRemoteConnection
 

-

-

-
-
-
-

NMRemoteConnection

-
typedef struct _NMRemoteConnection NMRemoteConnection;
-

-

-
-
-

NMRemoteConnectionClass

-
typedef struct {
-	NMConnectionClass parent_class;
-
-	/* Signals */
-	void (*updated) (NMRemoteConnection *connection,
-	                 GHashTable *new_settings);
-
-	void (*removed) (NMRemoteConnection *connection);
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMRemoteConnectionClass;
-
+
+

Description

-
+
+

Functions

-

NMRemoteConnectionCommitFunc ()

-
void                (*NMRemoteConnectionCommitFunc)     (NMRemoteConnection *connection,
-                                                         GError *error,
-                                                         gpointer user_data);
-

-Called when NetworkManager has committed outstanding changes to a connection -to backing storage as a result of nm_remote_connection_commit_changes(). -

-
+

NMRemoteConnectionCommitFunc ()

+
void
+(*NMRemoteConnectionCommitFunc) (NMRemoteConnection *connection,
+                                 GError *error,
+                                 gpointer user_data);
+

Called when NetworkManager has committed outstanding changes to a connection +to backing storage as a result of nm_remote_connection_commit_changes().

+
+

Parameters

+
--+++ - - + + + - - + + + - - + + +

connection :

the connection for which updates are to be committed

connection

the connection for which updates are to be committed

 

error :

on failure, a descriptive error

error

on failure, a descriptive error

 

user_data :

user data passed to nm_remote_connection_commit_changes() -

user_data

user data passed to nm_remote_connection_commit_changes()

 
+
-

NMRemoteConnectionDeleteFunc ()

-
void                (*NMRemoteConnectionDeleteFunc)     (NMRemoteConnection *connection,
-                                                         GError *error,
-                                                         gpointer user_data);
-

-Called when NetworkManager has deleted a connection as a result of -nm_remote_connection_delete(). -

-
+

NMRemoteConnectionDeleteFunc ()

+
void
+(*NMRemoteConnectionDeleteFunc) (NMRemoteConnection *connection,
+                                 GError *error,
+                                 gpointer user_data);
+

Called when NetworkManager has deleted a connection as a result of +nm_remote_connection_delete().

+
+

Parameters

+
--+++ - - + + + - - + + + - - + + +

connection :

the connection to be deleted

connection

the connection to be deleted

 

error :

on failure, a descriptive error

error

on failure, a descriptive error

 

user_data :

user data passed to nm_remote_connection_delete() -

user_data

user data passed to nm_remote_connection_delete()

 
+
-

NMRemoteConnectionGetSecretsFunc ()

-
void                (*NMRemoteConnectionGetSecretsFunc) (NMRemoteConnection *connection,
-                                                         GHashTable *secrets,
-                                                         GError *error,
-                                                         gpointer user_data);
-

-Called when NetworkManager returns secrets in response to a request for -secrets via nm_remote_connection_get_secrets(). -

-
+

NMRemoteConnectionGetSecretsFunc ()

+
void
+(*NMRemoteConnectionGetSecretsFunc) (NMRemoteConnection *connection,
+                                     GHashTable *secrets,
+                                     GError *error,
+                                     gpointer user_data);
+

Called when NetworkManager returns secrets in response to a request for +secrets via nm_remote_connection_get_secrets().

+
+

Parameters

+
--+++ - - + + + - - + +containing that property's value.

+ - - + + + - - + + +

connection :

the connection for which secrets were requested

connection

the connection for which secrets were requested

 

secrets :

on success, a hash table of +

secrets

on success, a hash table of hash tables, with each inner hash mapping a setting property to a GValue -containing that property's value. [element-type utf8 GLib.HashTable] -

[element-type utf8 GLib.HashTable]

error :

on failure, a descriptive error

error

on failure, a descriptive error

 

user_data :

user data passed to nm_remote_connection_get_secrets() -

user_data

user data passed to nm_remote_connection_get_secrets()

 
+
-

nm_remote_connection_new ()

-
NMRemoteConnection * nm_remote_connection_new           (DBusGConnection *bus,
-                                                         const char *path);
-

-Creates a new object representing the remote connection. -

-
+

nm_remote_connection_new ()

+
NMRemoteConnection *
+nm_remote_connection_new (DBusGConnection *bus,
+                          const char *path);
+

Creates a new object representing the remote connection.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + +

bus :

a valid and connected D-Bus connection

path :

the D-Bus path of the connection as exported by the settings service

bus

a valid and connected D-Bus connection

 

Returns :

the new remote connection object on success, or NULL on failure

path

the D-Bus path of the connection as exported by the settings service

 
+
+

Returns

+

the new remote connection object on success, or NULL on failure

+

+
+
-

nm_remote_connection_commit_changes ()

-
void                nm_remote_connection_commit_changes (NMRemoteConnection *connection,
-                                                         NMRemoteConnectionCommitFunc callback,
-                                                         gpointer user_data);
-

-Save any local changes to the settings and properties of this connection and -save them in the settings service. -

-
+

nm_remote_connection_commit_changes ()

+
void
+nm_remote_connection_commit_changes (NMRemoteConnection *connection,
+                                     NMRemoteConnectionCommitFunc callback,
+                                     gpointer user_data);
+

Save any local changes to the settings and properties of this connection and +save them in the settings service.

+
+

Parameters

+
--+++ - - + + + - - + + + - - + + +

connection :

the NMRemoteConnection -

connection

the NMRemoteConnection

 

callback :

a function to be called when the -commit completes. [scope async][allow-none] -

callback

a function to be called when the +commit completes.

[scope async][allow-none]

user_data :

caller-specific data to be passed to callback. [closure] -

user_data

caller-specific data to be passed to callback +.

[closure]
+
-

nm_remote_connection_delete ()

-
void                nm_remote_connection_delete         (NMRemoteConnection *connection,
-                                                         NMRemoteConnectionDeleteFunc callback,
-                                                         gpointer user_data);
-

-Delete the connection. -

-
+

nm_remote_connection_delete ()

+
void
+nm_remote_connection_delete (NMRemoteConnection *connection,
+                             NMRemoteConnectionDeleteFunc callback,
+                             gpointer user_data);
+

Delete the connection.

+
+

Parameters

+
--+++ - - + + + - - + + + - - + + +

connection :

the NMRemoteConnection -

connection

the NMRemoteConnection

 

callback :

a function to be called when the delete completes. [scope async][allow-none] -

callback

a function to be called when the delete completes.

[scope async][allow-none]

user_data :

caller-specific data to be passed to callback. [closure] -

user_data

caller-specific data to be passed to callback +.

[closure]
+
-

nm_remote_connection_get_secrets ()

-
void                nm_remote_connection_get_secrets    (NMRemoteConnection *connection,
-                                                         const char *setting_name,
-                                                         NMRemoteConnectionGetSecretsFunc callback,
-                                                         gpointer user_data);
-

-Request the connection's secrets. -

-
+

nm_remote_connection_get_secrets ()

+
void
+nm_remote_connection_get_secrets (NMRemoteConnection *connection,
+                                  const char *setting_name,
+                                  NMRemoteConnectionGetSecretsFunc callback,
+                                  gpointer user_data);
+

Request the connection's secrets.

+
+

Parameters

+
--+++ - - + + + - - + + + - - + + + - - + + +

connection :

the NMRemoteConnection -

connection

the NMRemoteConnection

 

setting_name :

the NMSetting object name to get secrets for

setting_name

the NMSetting object name to get secrets for

 

callback :

a function to be called when the update completes; -must not be NULL. [scope async] -

callback

a function to be called when the update completes; +must not be NULL.

[scope async]

user_data :

caller-specific data to be passed to callback. [closure] -

user_data

caller-specific data to be passed to callback +.

[closure]
+ +
+

Types and Values

+
+

NM_REMOTE_CONNECTION_UPDATED

+
#define NM_REMOTE_CONNECTION_UPDATED         "updated"
+
+

+

+
+
+
+

NM_REMOTE_CONNECTION_REMOVED

+
#define NM_REMOTE_CONNECTION_REMOVED         "removed"
+
+

+

+
+

Property Details

-

The "bus" property

-
  "bus"                      DBusGConnection*      : Write / Construct Only
+

The “bus” property

+
  “bus”                      DBusGConnection *

DBusGConnection.

+

Flags: Write / Construct Only

-

The "dbus-connection" property

-
  "dbus-connection"          DBusGConnection*      : Write / Construct Only
+

The “dbus-connection” property

+
  “dbus-connection”          DBusGConnection *

DBusGConnection.

+

Flags: Write / Construct Only

-

The "dbus-path" property

-
  "dbus-path"                gchar*                : Write / Construct Only
+

The “dbus-path” property

+
  “dbus-path”                gchar *

DBus Object Path.

+

Flags: Write / Construct Only

Default value: NULL

Signal Details

-

The "removed" signal

-
void                user_function                      (NMRemoteConnection *connection,
-                                                        gpointer            user_data)       : Run First
-

-This signal is emitted when a connection is either deleted or becomes -invisible to the current user. -

-
---- - - - - - - - - - - -

connection :

a NMConnection -

user_data :

user data set when the signal handler was connected.
+

The “removed” signal

+
void
+user_function (NMRemoteConnection *connection,
+               gpointer            user_data)
+

Flags: Run First

-

The "updated" signal

-
void                user_function                      (NMRemoteConnection *connection,
-                                                        gpointer            user_data)       : Run First
-

-This signal is emitted when a connection changes, and it is -still visible to the user. -

-
---- - - - - - - - - - - -

connection :

a NMConnection -

user_data :

user data set when the signal handler was connected.
+

The “updated” signal

+
void
+user_function (NMRemoteConnection *connection,
+               gpointer            user_data)
+

Flags: Run First

-

The "visible" signal

-
void                user_function                      (NMRemoteConnection *nmremoteconnection,
-                                                        gboolean            arg1,
-                                                        gpointer            user_data)               : Run First
-

-

-
---- - - - - - - - - - - -

nmremoteconnection :

the object which received the signal.

user_data :

user data set when the signal handler was connected.
+

The “visible” signal

+
void
+user_function (NMRemoteConnection *nmremoteconnection,
+               gboolean            arg1,
+               gpointer            user_data)
+

Flags: Run First

- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20 \ No newline at end of file diff --git a/docs/libnm-glib/html/NMRemoteSettings.html b/docs/libnm-glib/html/NMRemoteSettings.html index aeaf748e..be81004e 100644 --- a/docs/libnm-glib/html/NMRemoteSettings.html +++ b/docs/libnm-glib/html/NMRemoteSettings.html @@ -2,38 +2,29 @@ -NMRemoteSettings +libnm-glib Reference Manual: NMRemoteSettings - + - - - - - - - - - - + + + + + + +
@@ -41,620 +32,725 @@

NMRemoteSettings

NMRemoteSettings

- +
-
-

Synopsis

-
enum                NMRemoteSettingsError;
-#define             NM_REMOTE_SETTINGS_ERROR
-GQuark              nm_remote_settings_error_quark      (void);
-#define             NM_REMOTE_SETTINGS_BUS
-#define             NM_REMOTE_SETTINGS_SERVICE_RUNNING
-#define             NM_REMOTE_SETTINGS_HOSTNAME
-#define             NM_REMOTE_SETTINGS_CAN_MODIFY
-#define             NM_REMOTE_SETTINGS_NEW_CONNECTION
-#define             NM_REMOTE_SETTINGS_CONNECTIONS_READ
-void                (*NMRemoteSettingsAddConnectionFunc)
-                                                        (NMRemoteSettings *settings,
-                                                         NMRemoteConnection *connection,
-                                                         GError *error,
-                                                         gpointer user_data);
-void                (*NMRemoteSettingsSaveHostnameFunc) (NMRemoteSettings *settings,
-                                                         GError *error,
-                                                         gpointer user_data);
-struct              NMRemoteSettings;
-struct              NMRemoteSettingsClass;
-NMRemoteSettings *  nm_remote_settings_new              (DBusGConnection *bus);
-void                nm_remote_settings_new_async        (DBusGConnection *bus,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
-NMRemoteSettings *  nm_remote_settings_new_finish       (GAsyncResult *result,
-                                                         GError **error);
-GSList *            nm_remote_settings_list_connections (NMRemoteSettings *settings);
-NMRemoteConnection * nm_remote_settings_get_connection_by_path
-                                                        (NMRemoteSettings *settings,
-                                                         const char *path);
-NMRemoteConnection * nm_remote_settings_get_connection_by_uuid
-                                                        (NMRemoteSettings *settings,
-                                                         const char *uuid);
-gboolean            nm_remote_settings_add_connection   (NMRemoteSettings *settings,
-                                                         NMConnection *connection,
-                                                         NMRemoteSettingsAddConnectionFunc callback,
-                                                         gpointer user_data);
-gboolean            nm_remote_settings_save_hostname    (NMRemoteSettings *settings,
-                                                         const char *hostname,
-                                                         NMRemoteSettingsSaveHostnameFunc callback,
-                                                         gpointer user_data);
-
-
-
-

Object Hierarchy

-
-  GObject
-   +----NMRemoteSettings
-
-
-
-

Implemented Interfaces

-

-NMRemoteSettings implements - GInitable and GAsyncInitable.

-
-
-

Properties

-
-  "bus"                      DBusGConnection*      : Read / Write / Construct Only
-  "can-modify"               gboolean              : Read
-  "hostname"                 gchar*                : Read
-  "service-running"          gboolean              : Read
-
-
-

Signals

-
-  "connections-read"                               : Run First
-  "new-connection"                                 : Run First
-
-
-
-

Description

-

-

-
-
-

Details

-
-

enum NMRemoteSettingsError

-
typedef enum {
-	NM_REMOTE_SETTINGS_ERROR_UNKNOWN = 0,            /*< nick=UnknownError >*/
-	NM_REMOTE_SETTINGS_ERROR_CONNECTION_REMOVED,     /*< nick=ConnectionRemoved >*/
-	NM_REMOTE_SETTINGS_ERROR_CONNECTION_UNAVAILABLE, /*< nick=ConnectionUnavailable >*/
-} NMRemoteSettingsError;
-
-

-Describes errors that may result from operations involving a NMRemoteSettings. -

-
+

Functions

+
--++ - - + - - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

NM_REMOTE_SETTINGS_ERROR_UNKNOWN

unknown or unclassified error + +GQuark + +nm_remote_settings_error_quark ()

NM_REMOTE_SETTINGS_ERROR_CONNECTION_REMOVED

the NMRemoteConnection object - was removed before it was completely initialized + +void + +(*NMRemoteSettingsAddConnectionFunc) ()

NM_REMOTE_SETTINGS_ERROR_CONNECTION_UNAVAILABLE

the NMRemoteConnection object - is not visible or otherwise unreadable + +void + +(*NMRemoteSettingsSaveHostnameFunc) () +
+NMRemoteSettings * + +nm_remote_settings_new () +
+void + +nm_remote_settings_new_async () +
+NMRemoteSettings * + +nm_remote_settings_new_finish () +
+GSList * + +nm_remote_settings_list_connections () +
+NMRemoteConnection * + +nm_remote_settings_get_connection_by_path () +
+NMRemoteConnection * + +nm_remote_settings_get_connection_by_uuid () +
+gboolean + +nm_remote_settings_add_connection () +
+gboolean + +nm_remote_settings_save_hostname ()
-
-
-

NM_REMOTE_SETTINGS_ERROR

-
#define NM_REMOTE_SETTINGS_ERROR nm_remote_settings_error_quark ()
-
-

-

+
+

Properties

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +
+DBusGConnection *busRead / Write / Construct Only
gbooleancan-modifyRead
+gchar *hostnameRead
gbooleanservice-runningRead
-
-
-

nm_remote_settings_error_quark ()

-
GQuark              nm_remote_settings_error_quark      (void);
-

-Registers an error quark for NMRemoteSettings if necessary. -

-
+
+

Signals

+
--+++ - - - - + + + + + + + + + + + +

Returns :

the error quark used for NMRemoteSettings errors.
voidconnections-readRun First
voidnew-connectionRun First
-
-
-

NM_REMOTE_SETTINGS_BUS

-
#define NM_REMOTE_SETTINGS_BUS             "bus"
-
-

-

+
+

Types and Values

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
enumNMRemoteSettingsError
#defineNM_REMOTE_SETTINGS_ERROR
#defineNM_REMOTE_SETTINGS_BUS
#defineNM_REMOTE_SETTINGS_SERVICE_RUNNING
#defineNM_REMOTE_SETTINGS_HOSTNAME
#defineNM_REMOTE_SETTINGS_CAN_MODIFY
#defineNM_REMOTE_SETTINGS_NEW_CONNECTION
#defineNM_REMOTE_SETTINGS_CONNECTIONS_READ
-
-
-

NM_REMOTE_SETTINGS_SERVICE_RUNNING

-
#define NM_REMOTE_SETTINGS_SERVICE_RUNNING "service-running"
+

+
Object Hierarchy

+
    GObject
+    ╰── NMRemoteSettings
 

-

-

 

-

-

-
NM_REMOTE_SETTINGS_HOSTNAME

-
#define NM_REMOTE_SETTINGS_HOSTNAME        "hostname"
-

+

+
Description

 

 

 

-

+

+
Functions

 

-
NM_REMOTE_SETTINGS_CAN_MODIFY

-
#define NM_REMOTE_SETTINGS_CAN_MODIFY      "can-modify"
-

-

-

+
nm_remote_settings_error_quark ()

+
GQuark
+nm_remote_settings_error_quark (void);

+
Registers an error quark for NMRemoteSettings if necessary.

+

+
Returns

+
 the error quark used for NMRemoteSettings errors.

+

 

-

-

-
NM_REMOTE_SETTINGS_NEW_CONNECTION

-
#define NM_REMOTE_SETTINGS_NEW_CONNECTION    "new-connection"
-

-

-

 

 

 

-
NM_REMOTE_SETTINGS_CONNECTIONS_READ

-
#define NM_REMOTE_SETTINGS_CONNECTIONS_READ  "connections-read"
-

+
NMRemoteSettingsAddConnectionFunc ()

+
void
+(*NMRemoteSettingsAddConnectionFunc) (NMRemoteSettings *settings,
+                                      NMRemoteConnection *connection,
+                                      GError *error,
+                                      gpointer user_data);

 

 

 

 

 

-
NMRemoteSettingsAddConnectionFunc ()

-
void                (*NMRemoteSettingsAddConnectionFunc)
-                                                        (NMRemoteSettings *settings,
-                                                         NMRemoteConnection *connection,
-                                                         GError *error,
-                                                         gpointer user_data);

+
NMRemoteSettingsSaveHostnameFunc ()

+
void
+(*NMRemoteSettingsSaveHostnameFunc) (NMRemoteSettings *settings,
+                                     GError *error,
+                                     gpointer user_data);

 

 

 

 

 

-
NMRemoteSettingsSaveHostnameFunc ()

-
void                (*NMRemoteSettingsSaveHostnameFunc) (NMRemoteSettings *settings,
-                                                         GError *error,
-                                                         gpointer user_data);

-

-

+
nm_remote_settings_new ()

+
NMRemoteSettings *
+nm_remote_settings_new (DBusGConnection *bus);

+
Creates a new object representing the remote settings service.

+
Note that this will do blocking D-Bus calls to initialize the
+settings object. You can use nm_remote_settings_new_async() if you
+want to avoid that.

+

+
Parameters

+

+++++
+
+
+
+
+
+





bus
 a valid and connected D-Bus connection. 
[allow-none]

 

-

-

-
struct NMRemoteSettings

-
struct NMRemoteSettings;

-

-

+

+
Returns

+
 the new remote settings object on success, or NULL on failure

+

 

-

-

-
struct NMRemoteSettingsClass

-
struct NMRemoteSettingsClass {
-	GObjectClass parent;
-
-	/* Signals */
-	void (*new_connection) (NMRemoteSettings *settings,
-	                        NMRemoteConnection *connection);
-
-	void (*connections_read) (NMRemoteSettings *settings);
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-};
-

-

-

 

 

 

-
nm_remote_settings_new ()

-
NMRemoteSettings *  nm_remote_settings_new              (DBusGConnection *bus);

-

-Creates a new object representing the remote settings service.
-

-

-Note that this will do blocking D-Bus calls to initialize the
-settings object. You can use nm_remote_settings_new_async() if you
-want to avoid that.
-

-

+
nm_remote_settings_new_async ()

+
void
+nm_remote_settings_new_async (DBusGConnection *bus,
+                              GCancellable *cancellable,
+                              GAsyncReadyCallback callback,
+                              gpointer user_data);

+
Creates a new object representing the remote settings service and
+begins asynchronously initializing it. callback
+ will be called
+when it is done; use nm_remote_settings_new_finish() to get the
+result.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+

 





 
 
 
bus :
a valid and connected D-Bus connection. [allow-none]
-
bus
 a valid and connected D-Bus connection. 
[allow-none]
 

 
Returns :
the new remote settings object on success, or NULL on failure
cancellable
a GCancellable, or NULL
 
callback
callback to call when the settings object is created
 
user_data
data for callback
+
 
 

 
 

 

+

 

 

-
nm_remote_settings_new_async ()

-
void                nm_remote_settings_new_async        (DBusGConnection *bus,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);

-

-Creates a new object representing the remote settings service and
-begins asynchronously initializing it. callback will be called
-when it is done; use nm_remote_settings_new_finish() to get the
-result.
-

-

+
nm_remote_settings_new_finish ()

+
NMRemoteSettings *
+nm_remote_settings_new_finish (GAsyncResult *result,
+                               GError **error);

+
Gets the result of an nm_remote_settings_new_async() call.

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+

 





 
 
 
bus :
a valid and connected D-Bus connection. [allow-none]
-
cancellable :
a GCancellable, or NULL
-
result
a GAsyncResult
 
 

 
callback :
callback to call when the settings object is created
user_data :
data for callback
-
error
location for a GError, or NULL
 
 

 
 

 

+

+
Returns

+
 a new NMRemoteSettings object, or NULL on error

+

+

+

 

 

-
nm_remote_settings_new_finish ()

-
NMRemoteSettings *  nm_remote_settings_new_finish       (GAsyncResult *result,
-                                                         GError **error);

-

-Gets the result of an nm_remote_settings_new_async() call.
-

-

+
nm_remote_settings_list_connections ()

+
GSList *
+nm_remote_settings_list_connections (NMRemoteSettings *settings);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
result :
a GAsyncResult
-
error :
location for a GError, or NULL
-
Returns :
a new NMRemoteSettings object, or NULL on error
settings
the NMRemoteSettings
 

 

 

+

+
Returns

+
 a
+list containing all connections provided by the remote settings service.
+Each element of the returned list is a NMRemoteConnection instance, which is
+owned by the NMRemoteSettings object and should not be freed by the caller.
+The returned list is, however, owned by the caller and should be freed
+using g_slist_free() when no longer required. 

+
[transfer container][element-type NMClient.RemoteConnection]

+

+

 

 

-
nm_remote_settings_list_connections ()

-
GSList *            nm_remote_settings_list_connections (NMRemoteSettings *settings);

-

+
nm_remote_settings_get_connection_by_path ()

+
NMRemoteConnection *
+nm_remote_settings_get_connection_by_path
+                               (NMRemoteSettings *settings,
+                                const char *path);

+
Returns the NMRemoteConnection representing the connection at path
+.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
settings :
the NMRemoteSettings
-
settings
the NMRemoteSettings
 
 

 
Returns :
a
-list containing all connections provided by the remote settings service.
-Each element of the returned list is a NMRemoteConnection instance, which is
-owned by the NMRemoteSettings object and should not be freed by the caller.
-The returned list is, however, owned by the caller and should be freed
-using g_slist_free() when no longer required. [transfer container][element-type NMClient.RemoteConnection]
-
path
the D-Bus object path of the remote connection
 
 

 
 

 

+

+
Returns

+
 the remote connection object on success, or NULL if the object was
+not known. 

+
[transfer none]

+

+

 

 

-
nm_remote_settings_get_connection_by_path ()

-
NMRemoteConnection * nm_remote_settings_get_connection_by_path
-                                                        (NMRemoteSettings *settings,
-                                                         const char *path);

-

-Returns the NMRemoteConnection representing the connection at path.
-

-

+
nm_remote_settings_get_connection_by_uuid ()

+
NMRemoteConnection *
+nm_remote_settings_get_connection_by_uuid
+                               (NMRemoteSettings *settings,
+                                const char *uuid);

+
Returns the NMRemoteConnection identified by uuid
+.

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+

 





 
 
 
settings :
the NMRemoteSettings
-
path :
the D-Bus object path of the remote connection
settings
the NMRemoteSettings
 
 

 
Returns :
the remote connection object on success, or NULL if the object was
-not known. [transfer none]
-
uuid
the UUID of the remote connection
 
 

 
 

 

+

+
Returns

+
 the remote connection object on success, or NULL if the object was
+not known. 

+
[transfer none]

+

+

 

 

-
nm_remote_settings_get_connection_by_uuid ()

-
NMRemoteConnection * nm_remote_settings_get_connection_by_uuid
-                                                        (NMRemoteSettings *settings,
-                                                         const char *uuid);

-

-Returns the NMRemoteConnection identified by uuid.
-

-

+
nm_remote_settings_add_connection ()

+
gboolean
+nm_remote_settings_add_connection (NMRemoteSettings *settings,
+                                   NMConnection *connection,
+                                   NMRemoteSettingsAddConnectionFunc callback,
+                                   gpointer user_data);

+
Requests that the remote settings service add the given settings to a new
+connection.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
+
+
+
+
+

 





 
 
 
settings :
the NMRemoteSettings
-
settings
the NMRemoteSettings
 
 

 
uuid :
the UUID of the remote connection
connection
the connection to add. Note that this object's settings will be
+added, not the object itself
 
 

 
Returns :
the remote connection object on success, or NULL if the object was
-not known. [transfer none]
-
callback
 callback to be called when the add operation completes. 
[scope async]
user_data
 caller-specific data passed to callback
+. 
[closure]
 

 
 

 

+

+
Returns

+
 TRUE if the request was successful, FALSE if it failed

+

+

+
-

nm_remote_settings_add_connection ()

-
gboolean            nm_remote_settings_add_connection   (NMRemoteSettings *settings,
-                                                         NMConnection *connection,
-                                                         NMRemoteSettingsAddConnectionFunc callback,
-                                                         gpointer user_data);
-

-Requests that the remote settings service add the given settings to a new -connection. -

-
+

nm_remote_settings_save_hostname ()

+
gboolean
+nm_remote_settings_save_hostname (NMRemoteSettings *settings,
+                                  const char *hostname,
+                                  NMRemoteSettingsSaveHostnameFunc callback,
+                                  gpointer user_data);
+

Requests that the machine's persistent hostname be set to the specified value +or cleared.

+
+

Parameters

+
--+++ - - + + + - - + + + - - + + + - - - - - - + + +

settings :

the NMRemoteSettings -

settings

the NMRemoteSettings

 

connection :

the connection to add. Note that this object's settings will be -added, not the object itself

hostname

the new persistent hostname to set, or NULL to clear any existing +persistent hostname

 

callback :

callback to be called when the add operation completes. [scope async] -

callback

callback to be called when the +hostname operation completes.

[scope async][allow-none]

user_data :

caller-specific data passed to callback. [closure] -

Returns :

TRUE if the request was successful, FALSE if it failed

user_data

caller-specific data passed to callback +.

[closure]
-
+
+

Returns

+

TRUE if the request was successful, FALSE if it failed

+

+
+
+
+
+

Types and Values

-

nm_remote_settings_save_hostname ()

-
gboolean            nm_remote_settings_save_hostname    (NMRemoteSettings *settings,
-                                                         const char *hostname,
-                                                         NMRemoteSettingsSaveHostnameFunc callback,
-                                                         gpointer user_data);
-

-Requests that the machine's persistent hostname be set to the specified value -or cleared. -

-
+

enum NMRemoteSettingsError

+

Describes errors that may result from operations involving a NMRemoteSettings.

+
+

Members

+
--+++ - - + + - - - - - - + + - - + - - - - +

settings :

the NMRemoteSettings +

NM_REMOTE_SETTINGS_ERROR_UNKNOWN

 +

unknown or unclassified error

 

hostname :

the new persistent hostname to set, or NULL to clear any existing -persistent hostname

callback :

callback to be called when the -hostname operation completes. [scope async][allow-none] +

NM_REMOTE_SETTINGS_ERROR_CONNECTION_REMOVED

 +

the NMRemoteConnection object + was removed before it was completely initialized

 

user_data :

caller-specific data passed to callback. [closure] +

NM_REMOTE_SETTINGS_ERROR_CONNECTION_UNAVAILABLE

 +

the NMRemoteConnection object + is not visible or otherwise unreadable

Returns :

TRUE if the request was successful, FALSE if it failed 
+
+
+

NM_REMOTE_SETTINGS_ERROR

+
#define NM_REMOTE_SETTINGS_ERROR nm_remote_settings_error_quark ()
+
+

+

+
+
+
+

NM_REMOTE_SETTINGS_BUS

+
#define NM_REMOTE_SETTINGS_BUS             "bus"
+
+

+

+
+
+
+

NM_REMOTE_SETTINGS_SERVICE_RUNNING

+
#define NM_REMOTE_SETTINGS_SERVICE_RUNNING "service-running"
+
+

+

+
+
+
+

NM_REMOTE_SETTINGS_HOSTNAME

+
#define NM_REMOTE_SETTINGS_HOSTNAME        "hostname"
+
+

+

+
+
+
+

NM_REMOTE_SETTINGS_CAN_MODIFY

+
#define NM_REMOTE_SETTINGS_CAN_MODIFY      "can-modify"
+
+

+

+
+
+
+

NM_REMOTE_SETTINGS_NEW_CONNECTION

+
#define NM_REMOTE_SETTINGS_NEW_CONNECTION    "new-connection"
+
+

+

+
+
+
+

NM_REMOTE_SETTINGS_CONNECTIONS_READ

+
#define NM_REMOTE_SETTINGS_CONNECTIONS_READ  "connections-read"
+
+

+

+
+

Property Details

-

The "bus" property

-
  "bus"                      DBusGConnection*      : Read / Write / Construct Only
+

The “bus” property

+
  “bus”                      DBusGConnection *

DBusGConnection.

+

Flags: Read / Write / Construct Only

-

The "can-modify" property

-
  "can-modify"               gboolean              : Read
+

The “can-modify” property

+
  “can-modify”               gboolean

Can modify anything (hostname, connections, etc).

+

Flags: Read

Default value: FALSE

-

The "hostname" property

-
  "hostname"                 gchar*                : Read
+

The “hostname” property

+
  “hostname”                 gchar *

Persistent hostname.

+

Flags: Read

Default value: NULL

-

The "service-running" property

-
  "service-running"          gboolean              : Read
+

The “service-running” property

+
  “service-running”          gboolean

Is service running.

+

Flags: Read

Default value: FALSE

Signal Details

-

The "connections-read" signal

-
void                user_function                      (NMRemoteSettings *nmremotesettings,
-                                                        gpointer          user_data)             : Run First
-

-

-
---- - - - - - - - - - - -

nmremotesettings :

the object which received the signal.

user_data :

user data set when the signal handler was connected.
+

The “connections-read” signal

+
void
+user_function (NMRemoteSettings *nmremotesettings,
+               gpointer          user_data)
+

Flags: Run First

-

The "new-connection" signal

-
void                user_function                      (NMRemoteSettings *nmremotesettings,
-                                                        GObject          *arg1,
-                                                        gpointer          user_data)             : Run First
-

-

-
---- - - - - - - - - - - -

nmremotesettings :

the object which received the signal.

user_data :

user data set when the signal handler was connected.
+

The “new-connection” signal

+
void
+user_function (NMRemoteSettings *nmremotesettings,
+               GObject          *arg1,
+               gpointer          user_data)
+

Flags: Run First

- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20 \ No newline at end of file diff --git a/docs/libnm-glib/html/NMSecretAgent.html b/docs/libnm-glib/html/NMSecretAgent.html index 671cd029..94bc4e1f 100644 --- a/docs/libnm-glib/html/NMSecretAgent.html +++ b/docs/libnm-glib/html/NMSecretAgent.html @@ -2,36 +2,29 @@ -NMSecretAgent +libnm-glib Reference Manual: NMSecretAgent - + - - - - - - - - - - + + + + + + +
@@ -39,266 +32,230 @@

NMSecretAgent

NMSecretAgent

- +
-
-

Synopsis

-
#define             NM_SECRET_AGENT_ERROR
-GQuark              nm_secret_agent_error_quark         (void);
-enum                NMSecretAgentError;
-enum                NMSecretAgentGetSecretsFlags;
-#define             NM_SECRET_AGENT_IDENTIFIER
-#define             NM_SECRET_AGENT_AUTO_REGISTER
-#define             NM_SECRET_AGENT_REGISTERED
-#define             NM_SECRET_AGENT_REGISTRATION_RESULT
-                    NMSecretAgent;
-void                (*NMSecretAgentGetSecretsFunc)      (NMSecretAgent *agent,
-                                                         NMConnection *connection,
-                                                         GHashTable *secrets,
-                                                         GError *error,
-                                                         gpointer user_data);
-void                (*NMSecretAgentSaveSecretsFunc)     (NMSecretAgent *agent,
-                                                         NMConnection *connection,
-                                                         GError *error,
-                                                         gpointer user_data);
-void                (*NMSecretAgentDeleteSecretsFunc)   (NMSecretAgent *agent,
-                                                         NMConnection *connection,
-                                                         GError *error,
-                                                         gpointer user_data);
-                    NMSecretAgentClass;
-gboolean            nm_secret_agent_register            (NMSecretAgent *self);
-gboolean            nm_secret_agent_unregister          (NMSecretAgent *self);
-gboolean            nm_secret_agent_get_registered      (NMSecretAgent *self);
-void                nm_secret_agent_get_secrets         (NMSecretAgent *self,
-                                                         NMConnection *connection,
-                                                         const char *setting_name,
-                                                         const char **hints,
-                                                         NMSecretAgentGetSecretsFlags flags,
-                                                         NMSecretAgentGetSecretsFunc callback,
-                                                         gpointer user_data);
-void                nm_secret_agent_save_secrets        (NMSecretAgent *self,
-                                                         NMConnection *connection,
-                                                         NMSecretAgentSaveSecretsFunc callback,
-                                                         gpointer user_data);
-void                nm_secret_agent_delete_secrets      (NMSecretAgent *self,
-                                                         NMConnection *connection,
-                                                         NMSecretAgentDeleteSecretsFunc callback,
-                                                         gpointer user_data);
-
-
-
-

Object Hierarchy

-
-  GObject
-   +----NMSecretAgent
-
-
-
-

Properties

-
-  "auto-register"            gboolean              : Read / Write / Construct
-  "identifier"               gchar*                : Read / Write / Construct Only
-  "registered"               gboolean              : Read
-
-
-
-

Signals

-
-  "registration-result"                            : Run First
-
-
-
-

Description

-

-

-
-

Details

-
-

NM_SECRET_AGENT_ERROR

-
#define NM_SECRET_AGENT_ERROR         (nm_secret_agent_error_quark ())
-
-

-

-
-
-
-

nm_secret_agent_error_quark ()

-
GQuark              nm_secret_agent_error_quark         (void);
-

-

-
-
-
-

enum NMSecretAgentError

-
typedef enum {
-	NM_SECRET_AGENT_ERROR_NOT_AUTHORIZED = 0, /*< nick=NotAuthorized >*/
-	NM_SECRET_AGENT_ERROR_INVALID_CONNECTION, /*< nick=InvalidConnection >*/
-	NM_SECRET_AGENT_ERROR_USER_CANCELED,      /*< nick=UserCanceled >*/
-	NM_SECRET_AGENT_ERROR_AGENT_CANCELED,     /*< nick=AgentCanceled >*/
-	NM_SECRET_AGENT_ERROR_INTERNAL_ERROR,     /*< nick=InternalError >*/
-	NM_SECRET_AGENT_ERROR_NO_SECRETS,         /*< nick=NoSecrets >*/
-} NMSecretAgentError;
-
-

-NMSecretAgentError values are passed by secret agents back to NetworkManager -when they encounter problems retrieving secrets on behalf of NM. -

-
+

Functions

+
--++ - - + + + + + + + + + + + + + + + + + + + + + - - + - - + - - + - - + - - +

NM_SECRET_AGENT_ERROR_NOT_AUTHORIZED

the caller (ie, NetworkManager) is not - authorized to make this request +#defineNM_SECRET_AGENT_ERROR
+GQuark + +nm_secret_agent_error_quark () +
+void + +(*NMSecretAgentGetSecretsFunc) () +
+void + +(*NMSecretAgentSaveSecretsFunc) () +
+void + +(*NMSecretAgentDeleteSecretsFunc) () +
+gboolean + +nm_secret_agent_register ()

NM_SECRET_AGENT_ERROR_INVALID_CONNECTION

the connection for which secrets - were requested could not be found + +gboolean + +nm_secret_agent_unregister ()

NM_SECRET_AGENT_ERROR_USER_CANCELED

the request was canceled by the user + +gboolean + +nm_secret_agent_get_registered ()

NM_SECRET_AGENT_ERROR_AGENT_CANCELED

the agent canceled the request - because it was requested to do so by NetworkManager + +void + +nm_secret_agent_get_secrets ()

NM_SECRET_AGENT_ERROR_INTERNAL_ERROR

some internal error in the agent caused - the request to fail + +void + +nm_secret_agent_save_secrets ()

NM_SECRET_AGENT_ERROR_NO_SECRETS

the agent cannot find any secrets for this - connection + +void + +nm_secret_agent_delete_secrets ()
-
-
-

enum NMSecretAgentGetSecretsFlags

-
typedef enum {
-	NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE = 0x0,
-	NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION = 0x1,
-	NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW = 0x2,
-	NM_SECRET_AGENT_GET_SECRETS_FLAG_USER_REQUESTED = 0x4
-} NMSecretAgentGetSecretsFlags;
-
-

-NMSecretAgentGetSecretsFlags values modify the behavior of a GetSecrets request. -

-
+
+

Properties

+
--+++ - - + + + - - + + + - - + + + + +

NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE

no special behavior; by default no -user interaction is allowed and requests for secrets are fulfilled from -persistent storage, or if no secrets are available an error is returned. -gbooleanauto-registerRead / Write / Construct

NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION

allows the request to -interact with the user, possibly prompting via UI for secrets if any are -required, or if none are found in persistent storage. - +gchar *identifierRead / Write / Construct Only

NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW

explicitly prompt for new -secrets from the user. This flag signals that NetworkManager thinks any -existing secrets are invalid or wrong. This flag implies that interaction -is allowed. -gbooleanregisteredRead
+
+
+

Signals

+
+++++ + + + + + +
voidregistration-resultRun First
+
+
+

Types and Values

+
++++ + - - + + + + + + + + + + + + + + + + + + + + + +

NM_SECRET_AGENT_GET_SECRETS_FLAG_USER_REQUESTED

set if the request was -initiated by user-requested action via the D-Bus interface, as opposed to -automatically initiated by NetworkManager in response to (for example) scan -results or carrier changes. -enumNMSecretAgentError
enumNMSecretAgentGetSecretsFlags
#defineNM_SECRET_AGENT_IDENTIFIER
#defineNM_SECRET_AGENT_AUTO_REGISTER
#defineNM_SECRET_AGENT_REGISTERED
#defineNM_SECRET_AGENT_REGISTRATION_RESULT
-
-
-

NM_SECRET_AGENT_IDENTIFIER

-
#define NM_SECRET_AGENT_IDENTIFIER          "identifier"
+

+
Object Hierarchy

+
    GObject
+    ╰── NMSecretAgent
 

-

-

 

-

-

-
NM_SECRET_AGENT_AUTO_REGISTER

-
#define NM_SECRET_AGENT_AUTO_REGISTER       "auto-register"
-

+

+
Description

 

 

 

-

+

+
Functions

 

-
NM_SECRET_AGENT_REGISTERED

-
#define NM_SECRET_AGENT_REGISTERED          "registered"
+
NM_SECRET_AGENT_ERROR

+
#define NM_SECRET_AGENT_ERROR         (nm_secret_agent_error_quark ())
 

 

 

 

 

 

-
NM_SECRET_AGENT_REGISTRATION_RESULT

-
#define NM_SECRET_AGENT_REGISTRATION_RESULT "registration-result"
-

+
nm_secret_agent_error_quark ()

+
GQuark
+nm_secret_agent_error_quark (void);

 

 

+

+
Returns

+

 

-

-

-
NMSecretAgent

-
typedef struct _NMSecretAgent NMSecretAgent;

-

-

 

 

 

-
NMSecretAgentGetSecretsFunc ()

-
void                (*NMSecretAgentGetSecretsFunc)      (NMSecretAgent *agent,
-                                                         NMConnection *connection,
-                                                         GHashTable *secrets,
-                                                         GError *error,
-                                                         gpointer user_data);

-

-Called as a result of a request by NM to retrieve secrets.  When the
+
NMSecretAgentGetSecretsFunc ()

+
void
+(*NMSecretAgentGetSecretsFunc) (NMSecretAgent *agent,
+                                NMConnection *connection,
+                                GHashTable *secrets,
+                                GError *error,
+                                gpointer user_data);

+
Called as a result of a request by NM to retrieve secrets.  When the
 NMSecretAgent subclass has finished retrieving secrets and is ready to
 return them, or to return an error, this function should be called with
-those secrets or the error.
-

-

-To easily create the hash table to return the WiFi PSK, you could do
-something like this:
-

+those secrets or the error.

+
To easily create the hash table to return the WiFi PSK, you could do
+something like this:

 

-
Example 1. Creating a secrets hash

+
Example 1. Creating a secrets hash

 

   
@@ -323,13 +280,13 @@ something like this:
 NMSettingWirelessSecurity *s_wsec;GHashTable *secrets_hash;
 
-secrets = nm_connection_new ();
-s_wsec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new ();
+secrets = nm_connection_new ();
+s_wsec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new ();g_object_set (G_OBJECT (s_wsec),
-              NM_SETTING_WIRELESS_SECURITY_PSK, "my really cool PSK",
+              NM_SETTING_WIRELESS_SECURITY_PSK, "my really cool PSK",              NULL);
-nm_connection_add_setting (secrets, NM_SETTING (s_wsec));
-secrets_hash = nm_connection_to_hash (secrets, NM_SETTING_HASH_FLAG_ALL);
+nm_connection_add_setting (secrets, NM_SETTING (s_wsec));
+secrets_hash = nm_connection_to_hash (secrets, NM_SETTING_HASH_FLAG_ALL);(call the NMSecretAgentGetSecretsFunc with secrets_hash)
 
@@ -341,508 +298,591 @@ something like this:
 
-


-

-

     
 
 
 
 
 
 
 

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+has returned. 

+
-
-
+
+is the secret. 

+
-
-
+
+
+
-
-
+
+
+

 





 
 
 
agent :
the secret agent object
agent
the secret agent object
 
 

 
connection :
the connection for which secrets were requested,
+
connection
 the connection for which secrets were requested,
 note that this object will be unrefed after the callback has returned, use
 g_object_ref()/g_object_unref() if you want to use this object after the callback
-has returned. [transfer none]
-
[transfer none]
 

 
secrets :
the GHashTable containing
-the requested secrets in the same format as an NMConnection hash (as
-created by nm_connection_to_hash() for example).  Each key in secrets
-should be the name of a NMSetting object (like "802-11-wireless-security")
+
secrets
 the GHashTable containing
+the requested secrets in the same format as an NMConnection hash (as
+created by nm_connection_to_hash() for example).  Each key in secrets
+should be the name of a NMSetting object (like "802-11-wireless-security")
 and each value should be a GHashTable.  The sub-hashes map string:GValue
 where the string is the setting property name (like "psk") and the value
-is the secret. [element-type utf8 GLib.HashTable]
-
[element-type utf8 GLib.HashTable]
 

 
error :
if the secrets request failed, give a descriptive error here
error
if the secrets request failed, give a descriptive error here
 
 

 
user_data :
caller-specific data to be passed to the function
user_data
caller-specific data to be passed to the function
 
 

 
 

 

+

 

 

-
NMSecretAgentSaveSecretsFunc ()

-
void                (*NMSecretAgentSaveSecretsFunc)     (NMSecretAgent *agent,
-                                                         NMConnection *connection,
-                                                         GError *error,
-                                                         gpointer user_data);

-

-Called as a result of a request by NM to save secrets.  When the
+
NMSecretAgentSaveSecretsFunc ()

+
void
+(*NMSecretAgentSaveSecretsFunc) (NMSecretAgent *agent,
+                                 NMConnection *connection,
+                                 GError *error,
+                                 gpointer user_data);

+
Called as a result of a request by NM to save secrets.  When the
 NMSecretAgent subclass has finished saving the secrets, this function
-should be called.
-

-

+should be called.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+has returned. 

+
-
-
+
+
+
-
-
+
+
+

 





 
 
 
agent :
the secret agent object
agent
the secret agent object
 
 

 
connection :
the connection for which secrets were to be saved,
+
connection
 the connection for which secrets were to be saved,
 note that this object will be unrefed after the callback has returned, use
 g_object_ref()/g_object_unref() if you want to use this object after the callback
-has returned. [transfer none]
-
[transfer none]
 

 
error :
if the saving secrets failed, give a descriptive error here
error
if the saving secrets failed, give a descriptive error here
 
 

 
user_data :
caller-specific data to be passed to the function
user_data
caller-specific data to be passed to the function
 
 

 
 

 

+

 

 

-
NMSecretAgentDeleteSecretsFunc ()

-
void                (*NMSecretAgentDeleteSecretsFunc)   (NMSecretAgent *agent,
-                                                         NMConnection *connection,
-                                                         GError *error,
-                                                         gpointer user_data);

-

-Called as a result of a request by NM to delete secrets.  When the
+
NMSecretAgentDeleteSecretsFunc ()

+
void
+(*NMSecretAgentDeleteSecretsFunc) (NMSecretAgent *agent,
+                                   NMConnection *connection,
+                                   GError *error,
+                                   gpointer user_data);

+
Called as a result of a request by NM to delete secrets.  When the
 NMSecretAgent subclass has finished deleting the secrets, this function
-should be called.
-

-

+should be called.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+has returned. 

+
-
-
+
+
+
-
-
+
+
+

 





 
 
 
agent :
the secret agent object
agent
the secret agent object
 
 

 
connection :
the connection for which secrets were to be deleted,
+
connection
 the connection for which secrets were to be deleted,
 note that this object will be unrefed after the callback has returned, use
 g_object_ref()/g_object_unref() if you want to use this object after the callback
-has returned. [transfer none]
-
[transfer none]
 

 
error :
if the deleting secrets failed, give a descriptive error here
error
if the deleting secrets failed, give a descriptive error here
 
 

 
user_data :
caller-specific data to be passed to the function
user_data
caller-specific data to be passed to the function
 
 

 
 

 

-

-

-
NMSecretAgentClass

-
typedef struct {
-	GObjectClass parent;
-
-	/* Virtual methods for subclasses */
-
-	/* Called when the subclass should retrieve and return secrets.  Subclass
-	 * must copy or reference any arguments it may require after returning from
-	 * this method, as the arguments will freed (except for 'self', 'callback',
-	 * and 'user_data' of course).  If the request is canceled, the callback
-	 * should still be called, but with the NM_SECRET_AGENT_ERROR_AGENT_CANCELED
-	 * error.
-	 */
-	void (*get_secrets) (NMSecretAgent *self,
-	                     NMConnection *connection,
-	                     const char *connection_path,
-	                     const char *setting_name,
-	                     const char **hints,
-	                     NMSecretAgentGetSecretsFlags flags,
-	                     NMSecretAgentGetSecretsFunc callback,
-	                     gpointer user_data);
-
-	/* Called when the subclass should cancel an outstanding request to
-	 * get secrets for a given connection.  Canceling the request MUST
-	 * call the callback that was passed along with the initial get_secrets
-	 * call, sending the NM_SECRET_AGENT_ERROR/NM_SECRET_AGENT_ERROR_AGENT_CANCELED
-	 * error to that callback.
-	 */
-	void (*cancel_get_secrets) (NMSecretAgent *self,
-	                            const char *connection_path,
-	                            const char *setting_name);
-
-	/* Called when the subclass should save the secrets contained in the
-	 * connection to backing storage.  Subclass must copy or reference any
-	 * arguments it may require after returning from this method, as the
-	 * arguments will freed (except for 'self', 'callback', and 'user_data'
-	 * of course).
-	 */
-	void (*save_secrets) (NMSecretAgent *self,
-	                      NMConnection *connection,
-	                      const char *connection_path,
-	                      NMSecretAgentSaveSecretsFunc callback,
-	                      gpointer user_data);
-
-	/* Called when the subclass should delete the secrets contained in the
-	 * connection from backing storage.  Subclass must copy or reference any
-	 * arguments it may require after returning from this method, as the
-	 * arguments will freed (except for 'self', 'callback', and 'user_data'
-	 * of course).
-	 */
-	void (*delete_secrets) (NMSecretAgent *self,
-	                        NMConnection *connection,
-	                        const char *connection_path,
-	                        NMSecretAgentDeleteSecretsFunc callback,
-	                        gpointer user_data);
-
-	/* Signals */
-	void (*registration_result) (NMSecretAgent *agent, GError *error);
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMSecretAgentClass;
-

-

-

 

 

 

-
nm_secret_agent_register ()

-
gboolean            nm_secret_agent_register            (NMSecretAgent *self);

-

-Registers the NMSecretAgent with the NetworkManager secret manager,
+
nm_secret_agent_register ()

+
gboolean
+nm_secret_agent_register (NMSecretAgent *self);

+
Registers the NMSecretAgent with the NetworkManager secret manager,
 indicating to NetworkManager that the agent is able to provide and save
 secrets for connections on behalf of its user.  Registration is an
 asynchronous operation and its success or failure is indicated via the
-'registration-result' signal.
-

-

+'registration-result' signal.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
self :
a NMSecretAgent
-
Returns :
a new TRUE if registration was successfully requested (this does
-not mean registration itself was successful), FALSE if registration was not
-successfully requested.
self
a NMSecretAgent
 

 

 

+

+
Returns

+
 a new TRUE if registration was successfully requested (this does
+not mean registration itself was successful), FALSE if registration was not
+successfully requested.

+

+

+

 

 

-
nm_secret_agent_unregister ()

-
gboolean            nm_secret_agent_unregister          (NMSecretAgent *self);

-

-Unregisters the NMSecretAgent with the NetworkManager secret manager,
+
nm_secret_agent_unregister ()

+
gboolean
+nm_secret_agent_unregister (NMSecretAgent *self);

+
Unregisters the NMSecretAgent with the NetworkManager secret manager,
 indicating to NetworkManager that the agent is will no longer provide or
-store secrets on behalf of this user.
-

-

+store secrets on behalf of this user.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
self :
a NMSecretAgent
-
Returns :
a new TRUE if unregistration was successful, FALSE if it was not.
self
a NMSecretAgent
 

 

 

+

+
Returns

+
 a new TRUE if unregistration was successful, FALSE if it was not.

+

+

+

 

 

-
nm_secret_agent_get_registered ()

-
gboolean            nm_secret_agent_get_registered      (NMSecretAgent *self);

-

+
nm_secret_agent_get_registered ()

+
gboolean
+nm_secret_agent_get_registered (NMSecretAgent *self);

+

+
Parameters

+
--++++
+
+
+
+
+
+

 






self
a NMSecretAgent
 

+

+

+
Returns

+
 a TRUE if the agent is registered, FALSE if it is not.

+

+

+
+
+
+

nm_secret_agent_get_secrets ()

+
void
+nm_secret_agent_get_secrets (NMSecretAgent *self,
+                             NMConnection *connection,
+                             const char *setting_name,
+                             const char **hints,
+                             NMSecretAgentGetSecretsFlags flags,
+                             NMSecretAgentGetSecretsFunc callback,
+                             gpointer user_data);
+

Asyncronously retrieve secrets belonging to connection + for the +setting setting_name +. flags + indicate specific behavior that the secret +agent should use when performing the request, for example returning only +existing secrets without user interaction, or requesting entirely new +secrets from the user.

+

Virtual: get_secrets

+
+

Parameters

+
++++ - - + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + +

self :

a NMSecretAgent -

self

a NMSecretAgent

 

connection

the NMConnection for which we're asked secrets

 

setting_name

the name of the secret setting

 

hints

hints to the agent.

[array zero-terminated=1]

Returns :

a TRUE if the agent is registered, FALSE if it is not.

flags

flags that modify the behavior of the request

 

callback

a callback, to be invoked when the operation is done.

[scope async]

user_data

caller-specific data to be passed to callback +.

[closure]
+
-

nm_secret_agent_get_secrets ()

-
void                nm_secret_agent_get_secrets         (NMSecretAgent *self,
-                                                         NMConnection *connection,
-                                                         const char *setting_name,
-                                                         const char **hints,
-                                                         NMSecretAgentGetSecretsFlags flags,
-                                                         NMSecretAgentGetSecretsFunc callback,
-                                                         gpointer user_data);
-

-Asyncronously retrieve secrets belonging to connection for the -setting setting_name. flags indicate specific behavior that the secret -agent should use when performing the request, for example returning only -existing secrets without user interaction, or requesting entirely new -secrets from the user. -

-

-Virtual: get_secrets -

-
+

nm_secret_agent_save_secrets ()

+
void
+nm_secret_agent_save_secrets (NMSecretAgent *self,
+                              NMConnection *connection,
+                              NMSecretAgentSaveSecretsFunc callback,
+                              gpointer user_data);
+

Asyncronously ensure that all secrets inside connection + +are stored to disk.

+

Virtual: save_secrets

+
+

Parameters

+
--+++ - - + + + - - + + + - - + + + - - + + + + + +

self :

a NMSecretAgent -

self

a NMSecretAgent

 

connection :

the NMConnection for which we're asked secrets

connection

a NMConnection

 

setting_name :

the name of the secret setting

callback

a callback, to be invoked when the operation is done.

[scope async]

hints :

hints to the agent. [array zero-terminated=1] -

user_data

caller-specific data to be passed to callback +.

[closure]
+
+
+
+
+

nm_secret_agent_delete_secrets ()

+
void
+nm_secret_agent_delete_secrets (NMSecretAgent *self,
+                                NMConnection *connection,
+                                NMSecretAgentDeleteSecretsFunc callback,
+                                gpointer user_data);
+

Asynchronously ask the agent to delete all saved secrets belonging to +connection +.

+

Virtual: delete_secrets

+
+

Parameters

+
+++++ + + + + + - - + + + - - + + + - - + + +

self

a NMSecretAgent

 

flags :

flags that modify the behavior of the request

connection

a NMConnection

 

callback :

a callback, to be invoked when the operation is done. [scope async] -

callback

a callback, to be invoked when the operation is done.

[scope async]

user_data :

caller-specific data to be passed to callback. [closure] -

user_data

caller-specific data to be passed to callback +.

[closure]
-
+
+
+
+

Types and Values

-

nm_secret_agent_save_secrets ()

-
void                nm_secret_agent_save_secrets        (NMSecretAgent *self,
-                                                         NMConnection *connection,
-                                                         NMSecretAgentSaveSecretsFunc callback,
-                                                         gpointer user_data);
-

-Asyncronously ensure that all secrets inside connection -are stored to disk. -

-

-Virtual: save_secrets -

-
+

enum NMSecretAgentError

+

NMSecretAgentError values are passed by secret agents back to NetworkManager +when they encounter problems retrieving secrets on behalf of NM.

+
+

Members

+
--+++ - - + + - - + + - - + + - - + + + + + + + + + + + +

self :

a NMSecretAgent +

NM_SECRET_AGENT_ERROR_NOT_AUTHORIZED

 +

the caller (ie, NetworkManager) is not + authorized to make this request

 

connection :

a NMConnection +

NM_SECRET_AGENT_ERROR_INVALID_CONNECTION

 +

the connection for which secrets + were requested could not be found

 

callback :

a callback, to be invoked when the operation is done. [scope async] +

NM_SECRET_AGENT_ERROR_USER_CANCELED

 +

the request was canceled by the user

 

user_data :

caller-specific data to be passed to callback. [closure] +

NM_SECRET_AGENT_ERROR_AGENT_CANCELED

 +

the agent canceled the request + because it was requested to do so by NetworkManager

 

NM_SECRET_AGENT_ERROR_INTERNAL_ERROR

 +

some internal error in the agent caused + the request to fail

+		 

NM_SECRET_AGENT_ERROR_NO_SECRETS

 +

the agent cannot find any secrets for this + connection

+		 
+
-

nm_secret_agent_delete_secrets ()

-
void                nm_secret_agent_delete_secrets      (NMSecretAgent *self,
-                                                         NMConnection *connection,
-                                                         NMSecretAgentDeleteSecretsFunc callback,
-                                                         gpointer user_data);
-

-Asynchronously ask the agent to delete all saved secrets belonging to -connection. -

-

-Virtual: delete_secrets -

-
+

enum NMSecretAgentGetSecretsFlags

+

NMSecretAgentGetSecretsFlags values modify the behavior of a GetSecrets request.

+
+

Members

+
--+++ - - + + - - + + - - + + - - + +

self :

a NMSecretAgent +

NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE

 +

no special behavior; by default no +user interaction is allowed and requests for secrets are fulfilled from +persistent storage, or if no secrets are available an error is returned.

 

connection :

a NMConnection +

NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION

 +

allows the request to +interact with the user, possibly prompting via UI for secrets if any are +required, or if none are found in persistent storage.

 

callback :

a callback, to be invoked when the operation is done. [scope async] +

NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW

 +

explicitly prompt for new +secrets from the user. This flag signals that NetworkManager thinks any +existing secrets are invalid or wrong. This flag implies that interaction +is allowed.

 

user_data :

caller-specific data to be passed to callback. [closure] +

NM_SECRET_AGENT_GET_SECRETS_FLAG_USER_REQUESTED

 +

set if the request was +initiated by user-requested action via the D-Bus interface, as opposed to +automatically initiated by NetworkManager in response to (for example) scan +results or carrier changes.

 
-
-

Property Details

+
-

The "auto-register" property

-
  "auto-register"            gboolean              : Read / Write / Construct
+

NM_SECRET_AGENT_IDENTIFIER

+
#define NM_SECRET_AGENT_IDENTIFIER          "identifier"
+

-If TRUE, the agent will attempt to automatically register itself after -it is created (via an idle handler) and to re-register itself if -NetworkManager restarts. If FALSE, the agent does not automatically -register with NetworkManager, and nm_secret_agent_register() must be -called. If 'auto-register' is TRUE, calling nm_secret_agent_unregister() -will suppress auto-registration until nm_secret_agent_register() is -called, which re-enables auto-registration.

-

Default value: TRUE

-

The "identifier" property

-
  "identifier"               gchar*                : Read / Write / Construct Only
+

NM_SECRET_AGENT_AUTO_REGISTER

+
#define NM_SECRET_AGENT_AUTO_REGISTER       "auto-register"
+

-Identifies this agent; only one agent in each user session may use the -same identifier. Identifier formatting follows the same rules as -D-Bus bus names with the exception that the ':' character is not -allowed. The valid set of characters is "[A-Z][a-z][0-9]_-." and the -identifier is limited in length to 255 characters with a minimum -of 3 characters. An example valid identifier is 'org.gnome.nm-applet' -(without quotes).

-

Default value: NULL

-

The "registered" property

-
  "registered"               gboolean              : Read
+

NM_SECRET_AGENT_REGISTERED

+
#define NM_SECRET_AGENT_REGISTERED          "registered"
+

-TRUE if the agent is registered with NetworkManager, FALSE if not.

+
+
+
+

NM_SECRET_AGENT_REGISTRATION_RESULT

+
#define NM_SECRET_AGENT_REGISTRATION_RESULT "registration-result"
+
+

+

+
+
+
+

Property Details

+
+

The “auto-register” property

+
  “auto-register”            gboolean
+

Auto Register.

+

Flags: Read / Write / Construct

+

Default value: TRUE

+
+
+
+

The “identifier” property

+
  “identifier”               gchar *
+

Identifier.

+

Flags: Read / Write / Construct Only

+

Default value: NULL

+
+
+
+

The “registered” property

+
  “registered”               gboolean
+

Registered.

+

Flags: Read

Default value: FALSE

Signal Details

-

The "registration-result" signal

-
void                user_function                      (NMSecretAgent *agent,
-                                                        gpointer       error,
-                                                        gpointer       user_data)      : Run First
-

-Indicates the result of a registration request; if error is NULL the -request was successful. -

-
---- - - - - - - - - - - - - - - -

agent :

the agent that received the signal

error :

the error, if any, that occured while registering

user_data :

user data set when the signal handler was connected.
+

The “registration-result” signal

+
void
+user_function (NMSecretAgent *agent,
+               gpointer       error,
+               gpointer       user_data)
+

Flags: Run First

- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20 \ No newline at end of file diff --git a/docs/libnm-glib/html/NMVPNConnection.html b/docs/libnm-glib/html/NMVPNConnection.html index 4241b467..1b1238f9 100644 --- a/docs/libnm-glib/html/NMVPNConnection.html +++ b/docs/libnm-glib/html/NMVPNConnection.html @@ -2,38 +2,29 @@ -NMVPNConnection +libnm-glib Reference Manual: NMVPNConnection - + - - - - - - - - - - + + + + + + +
@@ -41,200 +32,237 @@

NMVPNConnection

NMVPNConnection

- +
-
-

Synopsis

-
#define             NM_VPN_CONNECTION_VPN_STATE
-#define             NM_VPN_CONNECTION_BANNER
-                    NMVPNConnection;
-                    NMVPNConnectionClass;
-GObject *           nm_vpn_connection_new               (DBusGConnection *connection,
-                                                         const char *path);
-NMVPNConnectionState nm_vpn_connection_get_vpn_state    (NMVPNConnection *vpn);
-const char *        nm_vpn_connection_get_banner        (NMVPNConnection *vpn);
-
-
-

Object Hierarchy

-
-  GObject
-   +----NMObject
-         +----NMActiveConnection
-               +----NMVPNConnection
-
-
-
-

Implemented Interfaces

-

-NMVPNConnection implements - GInitable and GAsyncInitable.

+

Functions

+
++++ + + + + + + + + + + + + + + +
+GObject * + +nm_vpn_connection_new () +
+NMVPNConnectionState + +nm_vpn_connection_get_vpn_state () +
const char * + +nm_vpn_connection_get_banner () +

Properties

-
-  "banner"                   gchar*                : Read
-  "vpn-state"                guint                 : Read
-
+
+++++ + + + + + + + + + + + + +
+gchar *bannerRead
guintvpn-stateRead

Signals

-
-  "vpn-state-changed"                              : Run First
-
+
+++++ + + + + + +
voidvpn-state-changedRun First
-

Description

-

-

+

Types and Values

+
++++ + + + + + + + + + + +
#defineNM_VPN_CONNECTION_VPN_STATE
#defineNM_VPN_CONNECTION_BANNER
-

Details

-
-

NM_VPN_CONNECTION_VPN_STATE

-
#define NM_VPN_CONNECTION_VPN_STATE "vpn-state"
-
-

-

-
-
-
-

NM_VPN_CONNECTION_BANNER

-
#define NM_VPN_CONNECTION_BANNER "banner"
+
Object Hierarchy

+
    GObject
+    ╰── NMObject
+        ╰── NMActiveConnection
+            ╰── NMVPNConnection
 

-

-

-
-
-
-

NMVPNConnection

-
typedef struct _NMVPNConnection NMVPNConnection;
-

-

-
-
-

NMVPNConnectionClass

-
typedef struct {
-	NMActiveConnectionClass parent;
-
-	/* Signals */
-	void (*vpn_state_changed) (NMVPNConnection *connection,
-	                           NMVPNConnectionState state,
-	                           NMVPNConnectionStateReason reason);
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMVPNConnectionClass;
-
+
+

Description

-
+
+

Functions

-

nm_vpn_connection_new ()

-
GObject *           nm_vpn_connection_new               (DBusGConnection *connection,
-                                                         const char *path);
-

-Creates a new NMVPNConnection. -

-
+

nm_vpn_connection_new ()

+
GObject *
+nm_vpn_connection_new (DBusGConnection *connection,
+                       const char *path);
+

Creates a new NMVPNConnection.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + +

connection :

the DBusGConnection -

path :

the DBus object path of the new connection

connection

the DBusGConnection

 

Returns :

a new connection object. [transfer full] -

path

the DBus object path of the new connection

 
+
+

Returns

+

a new connection object.

+

[transfer full]

+
+
-

nm_vpn_connection_get_vpn_state ()

-
NMVPNConnectionState nm_vpn_connection_get_vpn_state    (NMVPNConnection *vpn);
-

-Gets the current NMVPNConnection state. -

-
+

nm_vpn_connection_get_vpn_state ()

+
NMVPNConnectionState
+nm_vpn_connection_get_vpn_state (NMVPNConnection *vpn);
+

Gets the current NMVPNConnection state.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

vpn :

a NMVPNConnection -

Returns :

the VPN state of the active VPN connection.

vpn

a NMVPNConnection

 
+
+

Returns

+

the VPN state of the active VPN connection.

+

+
+
-

nm_vpn_connection_get_banner ()

-
const char *        nm_vpn_connection_get_banner        (NMVPNConnection *vpn);
-

-Gets the VPN login banner of the active NMVPNConnection. -

-
+

nm_vpn_connection_get_banner ()

+
const char *
+nm_vpn_connection_get_banner (NMVPNConnection *vpn);
+

Gets the VPN login banner of the active NMVPNConnection.

+
+

Parameters

+
--+++ - - - - - - - - - - + + + + +

vpn :

a NMVPNConnection -

Returns :

the VPN login banner of the VPN connection. This is the internal -string used by the connection, and must not be modified.

vpn

a NMVPNConnection

 
+
+

Returns

+

the VPN login banner of the VPN connection. This is the internal +string used by the connection, and must not be modified.

+

+
+
-

Property Details

+

Types and Values

-

The "banner" property

-
  "banner"                   gchar*                : Read
+

NM_VPN_CONNECTION_VPN_STATE

+
#define NM_VPN_CONNECTION_VPN_STATE "vpn-state"
+

-The VPN login banner of the active VPN connection.

-

Default value: NULL

-

The "vpn-state" property

-
  "vpn-state"                guint                 : Read
+

NM_VPN_CONNECTION_BANNER

+
#define NM_VPN_CONNECTION_BANNER "banner"
+

-The VPN state of the active VPN connection.

+
+
+
+

Property Details

+
+

The “banner” property

+
  “banner”                   gchar *
+

Login Banner.

+

Flags: Read

+

Default value: NULL

+
+
+
+

The “vpn-state” property

+
  “vpn-state”                guint
+

Current VPN state.

+

Flags: Read

Allowed values: <= 7

Default value: 0

@@ -242,34 +270,18 @@ The VPN state of the active VPN connection.

Signal Details

-

The "vpn-state-changed" signal

-
void                user_function                      (NMVPNConnection *nmvpnconnection,
-                                                        guint            arg1,
-                                                        guint            arg2,
-                                                        gpointer         user_data)            : Run First
-

-

-
---- - - - - - - - - - - -

nmvpnconnection :

the object which received the signal.

user_data :

user data set when the signal handler was connected.
+

The “vpn-state-changed” signal

+
void
+user_function (NMVPNConnection *nmvpnconnection,
+               guint            arg1,
+               guint            arg2,
+               gpointer         user_data)
+

Flags: Run First

- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20 \ No newline at end of file diff --git a/docs/libnm-glib/html/NMWimaxNsp.html b/docs/libnm-glib/html/NMWimaxNsp.html index 34933aaa..0976c9ff 100644 --- a/docs/libnm-glib/html/NMWimaxNsp.html +++ b/docs/libnm-glib/html/NMWimaxNsp.html @@ -2,36 +2,28 @@ -NMWimaxNsp +libnm-glib Reference Manual: NMWimaxNsp - + - - - - - - - - - - + + + + + + +
@@ -39,350 +31,423 @@

NMWimaxNsp

NMWimaxNsp

- +
-
-

Synopsis

-
#define             NM_WIMAX_NSP_NAME
-#define             NM_WIMAX_NSP_SIGNAL_QUALITY
-#define             NM_WIMAX_NSP_NETWORK_TYPE
-enum                NMWimaxNspNetworkType;
-                    NMWimaxNsp;
-                    NMWimaxNspClass;
-GObject *           nm_wimax_nsp_new                    (DBusGConnection *connection,
-                                                         const char *path);
-const char *        nm_wimax_nsp_get_name               (NMWimaxNsp *nsp);
-guint32             nm_wimax_nsp_get_signal_quality     (NMWimaxNsp *nsp);
-NMWimaxNspNetworkType nm_wimax_nsp_get_network_type     (NMWimaxNsp *nsp);
-GSList *            nm_wimax_nsp_filter_connections     (NMWimaxNsp *nsp,
-                                                         const GSList *connections);
-gboolean            nm_wimax_nsp_connection_valid       (NMWimaxNsp *nsp,
-                                                         NMConnection *connection);
-
-
-
-

Object Hierarchy

-
-  GObject
-   +----NMObject
-         +----NMWimaxNsp
-
-
-
-

Implemented Interfaces

-

-NMWimaxNsp implements - GInitable and GAsyncInitable.

-
-
-

Properties

-
-  "name"                     gchar*                : Read
-  "network-type"             guint                 : Read
-  "signal-quality"           guint                 : Read
-
-
-
-

Description

-

-

-
-

Details

-
-

NM_WIMAX_NSP_NAME

-
#define NM_WIMAX_NSP_NAME           "name"
-
-

-

-
-
-
-

NM_WIMAX_NSP_SIGNAL_QUALITY

-
#define NM_WIMAX_NSP_SIGNAL_QUALITY "signal-quality"
-
-

-

-
-
-
-

NM_WIMAX_NSP_NETWORK_TYPE

-
#define NM_WIMAX_NSP_NETWORK_TYPE   "network-type"
-
-

-

-
-
-
-

enum NMWimaxNspNetworkType

-
typedef enum {
-	NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN         = 0,
-	NM_WIMAX_NSP_NETWORK_TYPE_HOME            = 1,
-	NM_WIMAX_NSP_NETWORK_TYPE_PARTNER         = 2,
-	NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER = 3
-} NMWimaxNspNetworkType;
-
-

-

-
+

Functions

+
--++ - - + + + + + - - + - - + - - + + + + +

NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN

 + +GObject * + +nm_wimax_nsp_new () +
const char * + +nm_wimax_nsp_get_name ()

NM_WIMAX_NSP_NETWORK_TYPE_HOME

 + +guint32 + +nm_wimax_nsp_get_signal_quality ()

NM_WIMAX_NSP_NETWORK_TYPE_PARTNER

 + +NMWimaxNspNetworkType + +nm_wimax_nsp_get_network_type ()

NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER

 + +GSList * + +nm_wimax_nsp_filter_connections () +
+gboolean + +nm_wimax_nsp_connection_valid ()
-
-
-

NMWimaxNsp

-
typedef struct _NMWimaxNsp NMWimaxNsp;
-

-

-
-
-
-

NMWimaxNspClass

-
typedef struct {
-	NMObjectClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMWimaxNspClass;
-
-

-

-
-
-
-

nm_wimax_nsp_new ()

-
GObject *           nm_wimax_nsp_new                    (DBusGConnection *connection,
-                                                         const char *path);
-

-Creates a new NMWimaxNsp. -

-
+
+

Properties

+
--+++ - - + + + - - + + + - - + + +

connection :

the DBusGConnection - +gchar *nameRead

path :

the D-Bus object path of the WiMAX NSPguintnetwork-typeRead

Returns :

a new WiMAX NSP. [transfer full] -guintsignal-qualityRead
-
-
-

nm_wimax_nsp_get_name ()

-
const char *        nm_wimax_nsp_get_name               (NMWimaxNsp *nsp);
-

-Gets the name of the wimax NSP -

-
+
+

Types and Values

+
--++ - - + + + + + + - - + + + + + +

nsp :

a NMWimaxNsp -#defineNM_WIMAX_NSP_NAME
#defineNM_WIMAX_NSP_SIGNAL_QUALITY

Returns :

the name#defineNM_WIMAX_NSP_NETWORK_TYPE
enumNMWimaxNspNetworkType
-
-
-

nm_wimax_nsp_get_signal_quality ()

-
guint32             nm_wimax_nsp_get_signal_quality     (NMWimaxNsp *nsp);
+
+

Object Hierarchy

+
    GObject
+    ╰── NMObject
+        ╰── NMWimaxNsp
+
+
+
+

Description

-Gets the WPA signal quality of the wimax NSP.

-
+ +
+

Functions

+
+

nm_wimax_nsp_new ()

+
GObject *
+nm_wimax_nsp_new (DBusGConnection *connection,
+                  const char *path);
+

Creates a new NMWimaxNsp.

+
+

Parameters

+
--+++ - - + + + - - + + +

nsp :

a NMWimaxNsp -

connection

the DBusGConnection

 

Returns :

the signal quality

path

the D-Bus object path of the WiMAX NSP

 
+
+

Returns

+

a new WiMAX NSP.

+

[transfer full]

+
+
-

nm_wimax_nsp_get_network_type ()

-
NMWimaxNspNetworkType nm_wimax_nsp_get_network_type     (NMWimaxNsp *nsp);
-

-Gets the network type of the wimax NSP. -

-
+

nm_wimax_nsp_get_name ()

+
const char *
+nm_wimax_nsp_get_name (NMWimaxNsp *nsp);
+

Gets the name of the wimax NSP

+
+

Parameters

+
+++++ + + + + + +

nsp

a NMWimaxNsp

 
+
+
+

Returns

+

the name

+

+
+
+
+
+

nm_wimax_nsp_get_signal_quality ()

+
guint32
+nm_wimax_nsp_get_signal_quality (NMWimaxNsp *nsp);
+

Gets the WPA signal quality of the wimax NSP.

+
+

Parameters

+
+++++ + + + + + +

nsp

a NMWimaxNsp

 
+
+
+

Returns

+

the signal quality

+

+
+
+
+
+

nm_wimax_nsp_get_network_type ()

+
NMWimaxNspNetworkType
+nm_wimax_nsp_get_network_type (NMWimaxNsp *nsp);
+

Gets the network type of the wimax NSP.

+
+

Parameters

+
--++++ + + + + + +

nsp

a NMWimaxNsp

 
+
+
+

Returns

+

the network type

+

+
+
+
+
+

nm_wimax_nsp_filter_connections ()

+
GSList *
+nm_wimax_nsp_filter_connections (NMWimaxNsp *nsp,
+                                 const GSList *connections);
+

Filters a given list of connections for a given NMWimaxNsp object and +return connections which may be activated with the access point. Any +returned connections will match the nsp +'s network name and other attributes.

+
+

Parameters

+
++++ - - + + + - - + + +

nsp :

a NMWimaxNsp -

nsp

an NMWimaxNsp to filter connections for

 

Returns :

the network type

connections

a list of +NMConnection objects to filter.

[element-type NetworkManager.Connection]
+
+

Returns

+

a +list of NMConnection objects that could be activated with the given nsp +. +The elements of the list are owned by their creator and should not be freed +by the caller, but the returned list itself is owned by the caller and should +be freed with g_slist_free() when it is no longer required.

+

[transfer container][element-type NetworkManager.Connection]

+
+
-

nm_wimax_nsp_filter_connections ()

-
GSList *            nm_wimax_nsp_filter_connections     (NMWimaxNsp *nsp,
-                                                         const GSList *connections);
-

-Filters a given list of connections for a given NMWimaxNsp object and -return connections which may be activated with the access point. Any -returned connections will match the nsp's network name and other attributes. -

-
+

nm_wimax_nsp_connection_valid ()

+
gboolean
+nm_wimax_nsp_connection_valid (NMWimaxNsp *nsp,
+                               NMConnection *connection);
+

Validates a given connection against a given WiMAX NSP to ensure that the +connection may be activated with that NSP. The connection must match the +nsp +'s network name and other attributes.

+
+

Parameters

+
--+++ - - - - - - + + + - - + + +

nsp :

an NMWimaxNsp to filter connections for

connections :

a list of -NMConnection objects to filter. [element-type NetworkManager.Connection] -

nsp

an NMWimaxNsp to validate connection +against

 

Returns :

a -list of NMConnection objects that could be activated with the given nsp. -The elements of the list are owned by their creator and should not be freed -by the caller, but the returned list itself is owned by the caller and should -be freed with g_slist_free() when it is no longer required. [transfer container][element-type NetworkManager.Connection] -

connection

an NMConnection to validate against nsp +

 
+
+

Returns

+

TRUE if the connection may be activated with this WiMAX NSP, +FALSE if it cannot be.

+

+
+
+ +
+

Types and Values

+
+

NM_WIMAX_NSP_NAME

+
#define NM_WIMAX_NSP_NAME           "name"
+
+

+

+
-

nm_wimax_nsp_connection_valid ()

-
gboolean            nm_wimax_nsp_connection_valid       (NMWimaxNsp *nsp,
-                                                         NMConnection *connection);
+

NM_WIMAX_NSP_SIGNAL_QUALITY

+
#define NM_WIMAX_NSP_SIGNAL_QUALITY "signal-quality"
+
+

+

+
+
+
+

NM_WIMAX_NSP_NETWORK_TYPE

+
#define NM_WIMAX_NSP_NETWORK_TYPE   "network-type"
+

-Validates a given connection against a given WiMAX NSP to ensure that the -connection may be activated with that NSP. The connection must match the -nsp's network name and other attributes.

-
+ +
+
+

enum NMWimaxNspNetworkType

+

+

+
+

Members

+
--+++ - - + + + - - + + + + + + + + - - + + +

nsp :

an NMWimaxNsp to validate connection against

NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN

  

connection :

an NMConnection to validate against nsp -

NM_WIMAX_NSP_NETWORK_TYPE_HOME

  

NM_WIMAX_NSP_NETWORK_TYPE_PARTNER

  

Returns :

 -TRUE if the connection may be activated with this WiMAX NSP, -FALSE if it cannot be.

NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER

  
+

Property Details

-

The "name" property

-
  "name"                     gchar*                : Read
-

-The name of the WiMAX NSP. -

+

The “name” property

+
  “name”                     gchar *
+

Name.

+

Flags: Read

Default value: NULL

-

The "network-type" property

-
  "network-type"             guint                 : Read
-

-The network type of the WiMAX NSP. -

+

The “network-type” property

+
  “network-type”             guint
+

Network Type.

+

Flags: Read

Default value: 0

-

The "signal-quality" property

-
  "signal-quality"           guint                 : Read
-

-The signal quality of the WiMAX NSP. -

+

The “signal-quality” property

+
  “signal-quality”           guint
+

Signal Quality.

+

Flags: Read

Allowed values: <= 100

Default value: 0

@@ -390,6 +455,6 @@ The signal quality of the WiMAX NSP.
- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20 \ No newline at end of file diff --git a/docs/libnm-glib/html/annotation-glossary.html b/docs/libnm-glib/html/annotation-glossary.html index b8c851e4..ede10027 100644 --- a/docs/libnm-glib/html/annotation-glossary.html +++ b/docs/libnm-glib/html/annotation-glossary.html @@ -2,81 +2,62 @@ -Annotation Glossary +libnm-glib Reference Manual: Annotation Glossary - + - - - - - - - - - - + + + + + + +

Annotation Glossary

-

C

-
closure
-

This parameter is a 'user_data', for callbacks; many bindings can pass NULL here.

-

T

-
transfer container
-

Free data container after the code is done.

A

allow-none

NULL is ok, both for passing and for returning.

-

S

-
scope async
-

The callback is valid until first called.

+
array
+

Parameter points to an array of items.

+

C

+
closure
+

This parameter is a 'user_data', for callbacks; many bindings can pass NULL here.

E

element-type

Generics and defining elements of containers and arrays.

-

T

-
transfer none
-

Don't free data after the code is done.

-

A

-
array
-

Parameter points to an array of items.

-

T

-
type
-

Override the parsed C type with given type.

O

out

Parameter for returning results. Default is transfer full.

+

S

+
scope async
+

The callback is valid until first called.

T

+
transfer container
+

Free data container after the code is done.

transfer full

Free data after the code is done.

+
transfer none
+

Don't free data after the code is done.

- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20 \ No newline at end of file diff --git a/docs/libnm-glib/html/api-index-full.html b/docs/libnm-glib/html/api-index-full.html index fd9de82b..822db046 100644 --- a/docs/libnm-glib/html/api-index-full.html +++ b/docs/libnm-glib/html/api-index-full.html @@ -2,94 +2,81 @@ -API Index +libnm-glib Reference Manual: API Index - + - - - - - - - - - - + + + + + + +

API Index

A

-NMAccessPoint, struct in NMAccessPoint +NMAccessPoint:bssid, object property in NMAccessPoint
-NMAccessPoint:bssid, object property in NMAccessPoint +NMAccessPoint:flags, object property in NMAccessPoint
-NMAccessPoint:flags, object property in NMAccessPoint +NMAccessPoint:frequency, object property in NMAccessPoint
-NMAccessPoint:frequency, object property in NMAccessPoint +NMAccessPoint:hw-address, object property in NMAccessPoint
-NMAccessPoint:hw-address, object property in NMAccessPoint +NMAccessPoint:max-bitrate, object property in NMAccessPoint
-NMAccessPoint:max-bitrate, object property in NMAccessPoint +NMAccessPoint:mode, object property in NMAccessPoint
-NMAccessPoint:mode, object property in NMAccessPoint +NMAccessPoint:rsn-flags, object property in NMAccessPoint
-NMAccessPoint:rsn-flags, object property in NMAccessPoint +NMAccessPoint:ssid, object property in NMAccessPoint
-NMAccessPoint:ssid, object property in NMAccessPoint +NMAccessPoint:strength, object property in NMAccessPoint
-NMAccessPoint:strength, object property in NMAccessPoint -
-
-
-NMAccessPoint:wpa-flags, object property in NMAccessPoint -
-
-
-NMAccessPointClass, struct in NMAccessPoint +NMAccessPoint:wpa-flags, object property in NMAccessPoint
@@ -97,11 +84,11 @@
-nm_access_point_connection_valid, function in NMAccessPoint +nm_access_point_connection_valid, function in NMAccessPoint
-nm_access_point_filter_connections, function in NMAccessPoint +nm_access_point_filter_connections, function in NMAccessPoint
@@ -113,43 +100,43 @@
-nm_access_point_get_bssid, function in NMAccessPoint +nm_access_point_get_bssid, function in NMAccessPoint
-nm_access_point_get_flags, function in NMAccessPoint +nm_access_point_get_flags, function in NMAccessPoint
-nm_access_point_get_frequency, function in NMAccessPoint +nm_access_point_get_frequency, function in NMAccessPoint
-nm_access_point_get_hw_address, function in NMAccessPoint +nm_access_point_get_hw_address, function in NMAccessPoint
-nm_access_point_get_max_bitrate, function in NMAccessPoint +nm_access_point_get_max_bitrate, function in NMAccessPoint
-nm_access_point_get_mode, function in NMAccessPoint +nm_access_point_get_mode, function in NMAccessPoint
-nm_access_point_get_rsn_flags, function in NMAccessPoint +nm_access_point_get_rsn_flags, function in NMAccessPoint
-nm_access_point_get_ssid, function in NMAccessPoint +nm_access_point_get_ssid, function in NMAccessPoint
-nm_access_point_get_strength, function in NMAccessPoint +nm_access_point_get_strength, function in NMAccessPoint
-nm_access_point_get_wpa_flags, function in NMAccessPoint +nm_access_point_get_wpa_flags, function in NMAccessPoint
@@ -165,7 +152,7 @@
-nm_access_point_new, function in NMAccessPoint +nm_access_point_new, function in NMAccessPoint
@@ -185,43 +172,35 @@
-NMActiveConnection, struct in NMActiveConnection +NMActiveConnection:connection, object property in NMActiveConnection
-NMActiveConnection:connection, object property in NMActiveConnection +NMActiveConnection:default, object property in NMActiveConnection
-NMActiveConnection:default, object property in NMActiveConnection +NMActiveConnection:default6, object property in NMActiveConnection
-NMActiveConnection:default6, object property in NMActiveConnection +NMActiveConnection:devices, object property in NMActiveConnection
-NMActiveConnection:devices, object property in NMActiveConnection +NMActiveConnection:master, object property in NMActiveConnection
-NMActiveConnection:master, object property in NMActiveConnection +NMActiveConnection:specific-object, object property in NMActiveConnection
-NMActiveConnection:specific-object, object property in NMActiveConnection +NMActiveConnection:state, object property in NMActiveConnection
-NMActiveConnection:state, object property in NMActiveConnection -
-
-
-NMActiveConnection:uuid, object property in NMActiveConnection -
-
-
-NMActiveConnectionClass, struct in NMActiveConnection +NMActiveConnection:uuid, object property in NMActiveConnection
@@ -241,35 +220,35 @@
-nm_active_connection_get_connection, function in NMActiveConnection +nm_active_connection_get_connection, function in NMActiveConnection
-nm_active_connection_get_default, function in NMActiveConnection +nm_active_connection_get_default, function in NMActiveConnection
-nm_active_connection_get_default6, function in NMActiveConnection +nm_active_connection_get_default6, function in NMActiveConnection
-nm_active_connection_get_devices, function in NMActiveConnection +nm_active_connection_get_devices, function in NMActiveConnection
-nm_active_connection_get_master, function in NMActiveConnection +nm_active_connection_get_master, function in NMActiveConnection
-nm_active_connection_get_specific_object, function in NMActiveConnection +nm_active_connection_get_specific_object, function in NMActiveConnection
-nm_active_connection_get_state, function in NMActiveConnection +nm_active_connection_get_state, function in NMActiveConnection
-nm_active_connection_get_uuid, function in NMActiveConnection +nm_active_connection_get_uuid, function in NMActiveConnection
@@ -277,7 +256,7 @@
-nm_active_connection_new, function in NMActiveConnection +nm_active_connection_new, function in NMActiveConnection
@@ -294,87 +273,79 @@

C

-NMClient, struct in NMClient -
-
-
-NMClient::device-added, object signal in NMClient -
-
-
-NMClient::device-removed, object signal in NMClient +NMClient::device-added, object signal in NMClient
-NMClient::permission-changed, object signal in NMClient +NMClient::device-removed, object signal in NMClient
-NMClient:activating-connection, object property in NMClient +NMClient::permission-changed, object signal in NMClient
-NMClient:active-connections, object property in NMClient +NMClient:activating-connection, object property in NMClient
-NMClient:connectivity, object property in NMClient +NMClient:active-connections, object property in NMClient
-NMClient:manager-running, object property in NMClient +NMClient:connectivity, object property in NMClient
-NMClient:networking-enabled, object property in NMClient +NMClient:manager-running, object property in NMClient
-NMClient:primary-connection, object property in NMClient +NMClient:networking-enabled, object property in NMClient
-NMClient:state, object property in NMClient +NMClient:primary-connection, object property in NMClient
-NMClient:version, object property in NMClient +NMClient:state, object property in NMClient
-NMClient:wimax-enabled, object property in NMClient +NMClient:version, object property in NMClient
-NMClient:wimax-hardware-enabled, object property in NMClient +NMClient:wimax-enabled, object property in NMClient
-NMClient:wireless-enabled, object property in NMClient +NMClient:wimax-hardware-enabled, object property in NMClient
-NMClient:wireless-hardware-enabled, object property in NMClient +NMClient:wireless-enabled, object property in NMClient
-NMClient:wwan-enabled, object property in NMClient +NMClient:wireless-hardware-enabled, object property in NMClient
-NMClient:wwan-hardware-enabled, object property in NMClient +NMClient:wwan-enabled, object property in NMClient
-NMClientActivateFn, user_function in NMClient +NMClient:wwan-hardware-enabled, object property in NMClient
-NMClientAddActivateFn, user_function in NMClient +NMClientActivateFn, user_function in NMClient
-NMClientClass, struct in NMClient +NMClientAddActivateFn, user_function in NMClient
@@ -386,7 +357,7 @@
-nm_client_activate_connection, function in NMClient +nm_client_activate_connection, function in NMClient
@@ -398,19 +369,19 @@
-nm_client_add_and_activate_connection, function in NMClient +nm_client_add_and_activate_connection, function in NMClient
-nm_client_check_connectivity, function in NMClient +nm_client_check_connectivity, function in NMClient
-nm_client_check_connectivity_async, function in NMClient +nm_client_check_connectivity_async, function in NMClient
-nm_client_check_connectivity_finish, function in NMClient +nm_client_check_connectivity_finish, function in NMClient
@@ -418,55 +389,55 @@
-nm_client_deactivate_connection, function in NMClient +nm_client_deactivate_connection, function in NMClient
-nm_client_get_activating_connection, function in NMClient +nm_client_get_activating_connection, function in NMClient
-nm_client_get_active_connections, function in NMClient +nm_client_get_active_connections, function in NMClient
-nm_client_get_connectivity, function in NMClient +nm_client_get_connectivity, function in NMClient
-nm_client_get_devices, function in NMClient +nm_client_get_devices, function in NMClient
-nm_client_get_device_by_iface, function in NMClient +nm_client_get_device_by_iface, function in NMClient
-nm_client_get_device_by_path, function in NMClient +nm_client_get_device_by_path, function in NMClient
-nm_client_get_logging, function in NMClient +nm_client_get_logging, function in NMClient
-nm_client_get_manager_running, function in NMClient +nm_client_get_manager_running, function in NMClient
-nm_client_get_permission_result, function in NMClient +nm_client_get_permission_result, function in NMClient
-nm_client_get_primary_connection, function in NMClient +nm_client_get_primary_connection, function in NMClient
-nm_client_get_state, function in NMClient +nm_client_get_state, function in NMClient
-nm_client_get_version, function in NMClient +nm_client_get_version, function in NMClient
@@ -478,23 +449,23 @@
-nm_client_networking_get_enabled, function in NMClient +nm_client_networking_get_enabled, function in NMClient
-nm_client_networking_set_enabled, function in NMClient +nm_client_networking_set_enabled, function in NMClient
-nm_client_new, function in NMClient +nm_client_new, function in NMClient
-nm_client_new_async, function in NMClient +nm_client_new_async, function in NMClient
-nm_client_new_finish, function in NMClient +nm_client_new_finish, function in NMClient
@@ -502,11 +473,11 @@
-nm_client_set_logging, function in NMClient +nm_client_set_logging, function in NMClient
-nm_client_sleep, function in NMClient +nm_client_sleep, function in NMClient
@@ -522,7 +493,7 @@
-nm_client_wimax_get_enabled, function in NMClient +nm_client_wimax_get_enabled, function in NMClient
@@ -530,11 +501,11 @@
-nm_client_wimax_hardware_get_enabled, function in NMClient +nm_client_wimax_hardware_get_enabled, function in NMClient
-nm_client_wimax_set_enabled, function in NMClient +nm_client_wimax_set_enabled, function in NMClient
@@ -542,7 +513,7 @@
-nm_client_wireless_get_enabled, function in NMClient +nm_client_wireless_get_enabled, function in NMClient
@@ -550,11 +521,11 @@
-nm_client_wireless_hardware_get_enabled, function in NMClient +nm_client_wireless_hardware_get_enabled, function in NMClient
-nm_client_wireless_set_enabled, function in NMClient +nm_client_wireless_set_enabled, function in NMClient
@@ -562,7 +533,7 @@
-nm_client_wwan_get_enabled, function in NMClient +nm_client_wwan_get_enabled, function in NMClient
@@ -570,116 +541,104 @@
-nm_client_wwan_hardware_get_enabled, function in NMClient +nm_client_wwan_hardware_get_enabled, function in NMClient
-nm_client_wwan_set_enabled, function in NMClient +nm_client_wwan_set_enabled, function in NMClient

D

-NMDevice, struct in NMDevice -
-
-
-NMDevice::state-changed, object signal in NMDevice +NMDevice::state-changed, object signal in NMDevice
-NMDevice:active-connection, object property in NMDevice +NMDevice:active-connection, object property in NMDevice
-NMDevice:autoconnect, object property in NMDevice +NMDevice:autoconnect, object property in NMDevice
-NMDevice:available-connections, object property in NMDevice +NMDevice:available-connections, object property in NMDevice
-NMDevice:capabilities, object property in NMDevice +NMDevice:capabilities, object property in NMDevice
-NMDevice:device-type, object property in NMDevice +NMDevice:device-type, object property in NMDevice
-NMDevice:dhcp4-config, object property in NMDevice +NMDevice:dhcp4-config, object property in NMDevice
-NMDevice:dhcp6-config, object property in NMDevice +NMDevice:dhcp6-config, object property in NMDevice
-NMDevice:driver, object property in NMDevice +NMDevice:driver, object property in NMDevice
-NMDevice:driver-version, object property in NMDevice +NMDevice:driver-version, object property in NMDevice
-NMDevice:firmware-missing, object property in NMDevice +NMDevice:firmware-missing, object property in NMDevice
-NMDevice:firmware-version, object property in NMDevice +NMDevice:firmware-version, object property in NMDevice
-NMDevice:interface, object property in NMDevice +NMDevice:interface, object property in NMDevice
-NMDevice:ip-interface, object property in NMDevice +NMDevice:ip-interface, object property in NMDevice
-NMDevice:ip4-config, object property in NMDevice +NMDevice:ip4-config, object property in NMDevice
-NMDevice:ip6-config, object property in NMDevice +NMDevice:ip6-config, object property in NMDevice
-NMDevice:managed, object property in NMDevice +NMDevice:managed, object property in NMDevice
-NMDevice:product, object property in NMDevice +NMDevice:product, object property in NMDevice
-NMDevice:state, object property in NMDevice +NMDevice:state, object property in NMDevice
-NMDevice:state-reason, object property in NMDevice +NMDevice:state-reason, object property in NMDevice
-NMDevice:udi, object property in NMDevice +NMDevice:udi, object property in NMDevice
-NMDevice:vendor, object property in NMDevice +NMDevice:vendor, object property in NMDevice
-NMDeviceAdsl, struct in NMDeviceAdsl -
-
-
-NMDeviceAdsl:carrier, object property in NMDeviceAdsl -
-
-
-NMDeviceAdslClass, struct in NMDeviceAdsl +NMDeviceAdsl:carrier, object property in NMDeviceAdsl
@@ -687,23 +646,15 @@
-NMDeviceBond, struct in NMDeviceBond -
-
-
-NMDeviceBond:carrier, object property in NMDeviceBond -
-
-
-NMDeviceBond:hw-address, object property in NMDeviceBond +NMDeviceBond:carrier, object property in NMDeviceBond
-NMDeviceBond:slaves, object property in NMDeviceBond +NMDeviceBond:hw-address, object property in NMDeviceBond
-NMDeviceBondClass, struct in NMDeviceBond +NMDeviceBond:slaves, object property in NMDeviceBond
@@ -711,23 +662,15 @@
-NMDeviceBridge, struct in NMDeviceBridge -
-
-
-NMDeviceBridge:carrier, object property in NMDeviceBridge +NMDeviceBridge:carrier, object property in NMDeviceBridge
-NMDeviceBridge:hw-address, object property in NMDeviceBridge +NMDeviceBridge:hw-address, object property in NMDeviceBridge
-NMDeviceBridge:slaves, object property in NMDeviceBridge -
-
-
-NMDeviceBridgeClass, struct in NMDeviceBridge +NMDeviceBridge:slaves, object property in NMDeviceBridge
@@ -735,23 +678,15 @@
-NMDeviceBt, struct in NMDeviceBt +NMDeviceBt:bt-capabilities, object property in NMDeviceBt
-NMDeviceBt:bt-capabilities, object property in NMDeviceBt +NMDeviceBt:hw-address, object property in NMDeviceBt
-NMDeviceBt:hw-address, object property in NMDeviceBt -
-
-
-NMDeviceBt:name, object property in NMDeviceBt -
-
-
-NMDeviceBtClass, struct in NMDeviceBt +NMDeviceBt:name, object property in NMDeviceBt
@@ -759,35 +694,23 @@
-NMDeviceClass, struct in NMDevice -
-
-
-NMDeviceDeactivateFn, user_function in NMDevice -
-
-
-NMDeviceEthernet, struct in NMDeviceEthernet +NMDeviceDeactivateFn, user_function in NMDevice
-NMDeviceEthernet:carrier, object property in NMDeviceEthernet +NMDeviceEthernet:carrier, object property in NMDeviceEthernet
-NMDeviceEthernet:hw-address, object property in NMDeviceEthernet +NMDeviceEthernet:hw-address, object property in NMDeviceEthernet
-NMDeviceEthernet:perm-hw-address, object property in NMDeviceEthernet +NMDeviceEthernet:perm-hw-address, object property in NMDeviceEthernet
-NMDeviceEthernet:speed, object property in NMDeviceEthernet -
-
-
-NMDeviceEthernetClass, struct in NMDeviceEthernet +NMDeviceEthernet:speed, object property in NMDeviceEthernet
@@ -795,19 +718,11 @@
-NMDeviceInfiniband, struct in NMDeviceInfiniband -
-
-
-NMDeviceInfiniband:carrier, object property in NMDeviceInfiniband +NMDeviceInfiniband:carrier, object property in NMDeviceInfiniband
-NMDeviceInfiniband:hw-address, object property in NMDeviceInfiniband -
-
-
-NMDeviceInfinibandClass, struct in NMDeviceInfiniband +NMDeviceInfiniband:hw-address, object property in NMDeviceInfiniband
@@ -815,19 +730,11 @@
-NMDeviceModem, struct in NMDeviceModem -
-
-
-NMDeviceModem:current-capabilities, object property in NMDeviceModem -
-
-
-NMDeviceModem:modem-capabilities, object property in NMDeviceModem +NMDeviceModem:current-capabilities, object property in NMDeviceModem
-NMDeviceModemClass, struct in NMDeviceModem +NMDeviceModem:modem-capabilities, object property in NMDeviceModem
@@ -835,23 +742,15 @@
-NMDeviceOlpcMesh, struct in NMDeviceOlpcMesh -
-
-
-NMDeviceOlpcMesh:active-channel, object property in NMDeviceOlpcMesh -
-
-
-NMDeviceOlpcMesh:companion, object property in NMDeviceOlpcMesh +NMDeviceOlpcMesh:active-channel, object property in NMDeviceOlpcMesh
-NMDeviceOlpcMesh:hw-address, object property in NMDeviceOlpcMesh +NMDeviceOlpcMesh:companion, object property in NMDeviceOlpcMesh
-NMDeviceOlpcMeshClass, struct in NMDeviceOlpcMesh +NMDeviceOlpcMesh:hw-address, object property in NMDeviceOlpcMesh
@@ -859,23 +758,15 @@
-NMDeviceVlan, struct in NMDeviceVlan -
-
-
-NMDeviceVlan:carrier, object property in NMDeviceVlan -
-
-
-NMDeviceVlan:hw-address, object property in NMDeviceVlan +NMDeviceVlan:carrier, object property in NMDeviceVlan
-NMDeviceVlan:vlan-id, object property in NMDeviceVlan +NMDeviceVlan:hw-address, object property in NMDeviceVlan
-NMDeviceVlanClass, struct in NMDeviceVlan +NMDeviceVlan:vlan-id, object property in NMDeviceVlan
@@ -883,43 +774,35 @@
-NMDeviceWifi, struct in NMDeviceWifi -
-
-
-NMDeviceWifi::access-point-added, object signal in NMDeviceWifi +NMDeviceWifi::access-point-added, object signal in NMDeviceWifi
-NMDeviceWifi::access-point-removed, object signal in NMDeviceWifi +NMDeviceWifi::access-point-removed, object signal in NMDeviceWifi
-NMDeviceWifi:active-access-point, object property in NMDeviceWifi +NMDeviceWifi:active-access-point, object property in NMDeviceWifi
-NMDeviceWifi:bitrate, object property in NMDeviceWifi +NMDeviceWifi:bitrate, object property in NMDeviceWifi
-NMDeviceWifi:hw-address, object property in NMDeviceWifi +NMDeviceWifi:hw-address, object property in NMDeviceWifi
-NMDeviceWifi:mode, object property in NMDeviceWifi +NMDeviceWifi:mode, object property in NMDeviceWifi
-NMDeviceWifi:perm-hw-address, object property in NMDeviceWifi +NMDeviceWifi:perm-hw-address, object property in NMDeviceWifi
-NMDeviceWifi:wireless-capabilities, object property in NMDeviceWifi -
-
-
-NMDeviceWifiClass, struct in NMDeviceWifi +NMDeviceWifi:wireless-capabilities, object property in NMDeviceWifi
@@ -927,51 +810,43 @@
-NMDeviceWifiRequestScanFn, user_function in NMDeviceWifi -
-
-
-NMDeviceWimax, struct in NMDeviceWimax +NMDeviceWifiRequestScanFn, user_function in NMDeviceWifi
-NMDeviceWimax::nsp-added, object signal in NMDeviceWimax +NMDeviceWimax::nsp-added, object signal in NMDeviceWimax
-NMDeviceWimax::nsp-removed, object signal in NMDeviceWimax +NMDeviceWimax::nsp-removed, object signal in NMDeviceWimax
-NMDeviceWimax:active-nsp, object property in NMDeviceWimax +NMDeviceWimax:active-nsp, object property in NMDeviceWimax
-NMDeviceWimax:bsid, object property in NMDeviceWimax +NMDeviceWimax:bsid, object property in NMDeviceWimax
-NMDeviceWimax:center-frequency, object property in NMDeviceWimax +NMDeviceWimax:center-frequency, object property in NMDeviceWimax
-NMDeviceWimax:cinr, object property in NMDeviceWimax +NMDeviceWimax:cinr, object property in NMDeviceWimax
-NMDeviceWimax:hw-address, object property in NMDeviceWimax +NMDeviceWimax:hw-address, object property in NMDeviceWimax
-NMDeviceWimax:rssi, object property in NMDeviceWimax +NMDeviceWimax:rssi, object property in NMDeviceWimax
-NMDeviceWimax:tx-power, object property in NMDeviceWimax -
-
-
-NMDeviceWimaxClass, struct in NMDeviceWimax +NMDeviceWimax:tx-power, object property in NMDeviceWimax
@@ -991,15 +866,15 @@
-nm_device_adsl_error_quark, function in NMDeviceAdsl +nm_device_adsl_error_quark, function in NMDeviceAdsl
-nm_device_adsl_get_carrier, function in NMDeviceAdsl +nm_device_adsl_get_carrier, function in NMDeviceAdsl
-nm_device_adsl_new, function in NMDeviceAdsl +nm_device_adsl_new, function in NMDeviceAdsl
@@ -1019,19 +894,19 @@
-nm_device_bond_error_quark, function in NMDeviceBond +nm_device_bond_error_quark, function in NMDeviceBond
-nm_device_bond_get_carrier, function in NMDeviceBond +nm_device_bond_get_carrier, function in NMDeviceBond
-nm_device_bond_get_hw_address, function in NMDeviceBond +nm_device_bond_get_hw_address, function in NMDeviceBond
-nm_device_bond_get_slaves, function in NMDeviceBond +nm_device_bond_get_slaves, function in NMDeviceBond
@@ -1039,7 +914,7 @@
-nm_device_bond_new, function in NMDeviceBond +nm_device_bond_new, function in NMDeviceBond
@@ -1055,19 +930,19 @@
-nm_device_bridge_error_quark, function in NMDeviceBridge +nm_device_bridge_error_quark, function in NMDeviceBridge
-nm_device_bridge_get_carrier, function in NMDeviceBridge +nm_device_bridge_get_carrier, function in NMDeviceBridge
-nm_device_bridge_get_hw_address, function in NMDeviceBridge +nm_device_bridge_get_hw_address, function in NMDeviceBridge
-nm_device_bridge_get_slaves, function in NMDeviceBridge +nm_device_bridge_get_slaves, function in NMDeviceBridge
@@ -1075,7 +950,7 @@
-nm_device_bridge_new, function in NMDeviceBridge +nm_device_bridge_new, function in NMDeviceBridge
@@ -1091,19 +966,19 @@
-nm_device_bt_error_quark, function in NMDeviceBt +nm_device_bt_error_quark, function in NMDeviceBt
-nm_device_bt_get_capabilities, function in NMDeviceBt +nm_device_bt_get_capabilities, function in NMDeviceBt
-nm_device_bt_get_hw_address, function in NMDeviceBt +nm_device_bt_get_hw_address, function in NMDeviceBt
-nm_device_bt_get_name, function in NMDeviceBt +nm_device_bt_get_name, function in NMDeviceBt
@@ -1115,7 +990,7 @@
-nm_device_bt_new, function in NMDeviceBt +nm_device_bt_new, function in NMDeviceBt
@@ -1123,11 +998,11 @@
-nm_device_connection_compatible, function in NMDevice +nm_device_connection_compatible, function in NMDevice
-nm_device_connection_valid, function in NMDevice +nm_device_connection_valid, function in NMDevice
@@ -1143,7 +1018,7 @@
-nm_device_disconnect, function in NMDevice +nm_device_disconnect, function in NMDevice
@@ -1163,23 +1038,23 @@
-nm_device_ethernet_error_quark, function in NMDeviceEthernet +nm_device_ethernet_error_quark, function in NMDeviceEthernet
-nm_device_ethernet_get_carrier, function in NMDeviceEthernet +nm_device_ethernet_get_carrier, function in NMDeviceEthernet
-nm_device_ethernet_get_hw_address, function in NMDeviceEthernet +nm_device_ethernet_get_hw_address, function in NMDeviceEthernet
-nm_device_ethernet_get_permanent_hw_address, function in NMDeviceEthernet +nm_device_ethernet_get_permanent_hw_address, function in NMDeviceEthernet
-nm_device_ethernet_get_speed, function in NMDeviceEthernet +nm_device_ethernet_get_speed, function in NMDeviceEthernet
@@ -1187,7 +1062,7 @@
-nm_device_ethernet_new, function in NMDeviceEthernet +nm_device_ethernet_new, function in NMDeviceEthernet
@@ -1199,7 +1074,7 @@
-nm_device_filter_connections, function in NMDevice +nm_device_filter_connections, function in NMDevice
@@ -1211,87 +1086,87 @@
-nm_device_get_active_connection, function in NMDevice +nm_device_get_active_connection, function in NMDevice
-nm_device_get_autoconnect, function in NMDevice +nm_device_get_autoconnect, function in NMDevice
-nm_device_get_available_connections, function in NMDevice +nm_device_get_available_connections, function in NMDevice
-nm_device_get_capabilities, function in NMDevice +nm_device_get_capabilities, function in NMDevice
-nm_device_get_device_type, function in NMDevice +nm_device_get_device_type, function in NMDevice
-nm_device_get_dhcp4_config, function in NMDevice +nm_device_get_dhcp4_config, function in NMDevice
-nm_device_get_dhcp6_config, function in NMDevice +nm_device_get_dhcp6_config, function in NMDevice
-nm_device_get_driver, function in NMDevice +nm_device_get_driver, function in NMDevice
-nm_device_get_driver_version, function in NMDevice +nm_device_get_driver_version, function in NMDevice
-nm_device_get_firmware_missing, function in NMDevice +nm_device_get_firmware_missing, function in NMDevice
-nm_device_get_firmware_version, function in NMDevice +nm_device_get_firmware_version, function in NMDevice
-nm_device_get_iface, function in NMDevice +nm_device_get_iface, function in NMDevice
-nm_device_get_ip4_config, function in NMDevice +nm_device_get_ip4_config, function in NMDevice
-nm_device_get_ip6_config, function in NMDevice +nm_device_get_ip6_config, function in NMDevice
-nm_device_get_ip_iface, function in NMDevice +nm_device_get_ip_iface, function in NMDevice
-nm_device_get_managed, function in NMDevice +nm_device_get_managed, function in NMDevice
-nm_device_get_product, function in NMDevice +nm_device_get_product, function in NMDevice
-nm_device_get_state, function in NMDevice +nm_device_get_state, function in NMDevice
-nm_device_get_state_reason, function in NMDevice +nm_device_get_state_reason, function in NMDevice
-nm_device_get_udi, function in NMDevice +nm_device_get_udi, function in NMDevice
-nm_device_get_vendor, function in NMDevice +nm_device_get_vendor, function in NMDevice
@@ -1303,15 +1178,15 @@
-nm_device_infiniband_error_quark, function in NMDeviceInfiniband +nm_device_infiniband_error_quark, function in NMDeviceInfiniband
-nm_device_infiniband_get_carrier, function in NMDeviceInfiniband +nm_device_infiniband_get_carrier, function in NMDeviceInfiniband
-nm_device_infiniband_get_hw_address, function in NMDeviceInfiniband +nm_device_infiniband_get_hw_address, function in NMDeviceInfiniband
@@ -1319,7 +1194,7 @@
-nm_device_infiniband_new, function in NMDeviceInfiniband +nm_device_infiniband_new, function in NMDeviceInfiniband
@@ -1351,15 +1226,15 @@
-nm_device_modem_error_quark, function in NMDeviceModem +nm_device_modem_error_quark, function in NMDeviceModem
-nm_device_modem_get_current_capabilities, function in NMDeviceModem +nm_device_modem_get_current_capabilities, function in NMDeviceModem
-nm_device_modem_get_modem_capabilities, function in NMDeviceModem +nm_device_modem_get_modem_capabilities, function in NMDeviceModem
@@ -1367,7 +1242,7 @@
-nm_device_new, function in NMDevice +nm_device_new, function in NMDevice
@@ -1383,19 +1258,19 @@
-nm_device_olpc_mesh_error_quark, function in NMDeviceOlpcMesh +nm_device_olpc_mesh_error_quark, function in NMDeviceOlpcMesh
-nm_device_olpc_mesh_get_active_channel, function in NMDeviceOlpcMesh +nm_device_olpc_mesh_get_active_channel, function in NMDeviceOlpcMesh
-nm_device_olpc_mesh_get_companion, function in NMDeviceOlpcMesh +nm_device_olpc_mesh_get_companion, function in NMDeviceOlpcMesh
-nm_device_olpc_mesh_get_hw_address, function in NMDeviceOlpcMesh +nm_device_olpc_mesh_get_hw_address, function in NMDeviceOlpcMesh
@@ -1403,7 +1278,7 @@
-nm_device_olpc_mesh_new, function in NMDeviceOlpcMesh +nm_device_olpc_mesh_new, function in NMDeviceOlpcMesh
@@ -1411,7 +1286,7 @@
-nm_device_set_autoconnect, function in NMDevice +nm_device_set_autoconnect, function in NMDevice
@@ -1439,19 +1314,19 @@
-nm_device_vlan_error_quark, function in NMDeviceVlan +nm_device_vlan_error_quark, function in NMDeviceVlan
-nm_device_vlan_get_carrier, function in NMDeviceVlan +nm_device_vlan_get_carrier, function in NMDeviceVlan
-nm_device_vlan_get_hw_address, function in NMDeviceVlan +nm_device_vlan_get_hw_address, function in NMDeviceVlan
-nm_device_vlan_get_vlan_id, function in NMDeviceVlan +nm_device_vlan_get_vlan_id, function in NMDeviceVlan
@@ -1459,7 +1334,7 @@
-nm_device_vlan_new, function in NMDeviceVlan +nm_device_vlan_new, function in NMDeviceVlan
@@ -1483,39 +1358,39 @@
-nm_device_wifi_error_quark, function in NMDeviceWifi +nm_device_wifi_error_quark, function in NMDeviceWifi
-nm_device_wifi_get_access_points, function in NMDeviceWifi +nm_device_wifi_get_access_points, function in NMDeviceWifi
-nm_device_wifi_get_access_point_by_path, function in NMDeviceWifi +nm_device_wifi_get_access_point_by_path, function in NMDeviceWifi
-nm_device_wifi_get_active_access_point, function in NMDeviceWifi +nm_device_wifi_get_active_access_point, function in NMDeviceWifi
-nm_device_wifi_get_bitrate, function in NMDeviceWifi +nm_device_wifi_get_bitrate, function in NMDeviceWifi
-nm_device_wifi_get_capabilities, function in NMDeviceWifi +nm_device_wifi_get_capabilities, function in NMDeviceWifi
-nm_device_wifi_get_hw_address, function in NMDeviceWifi +nm_device_wifi_get_hw_address, function in NMDeviceWifi
-nm_device_wifi_get_mode, function in NMDeviceWifi +nm_device_wifi_get_mode, function in NMDeviceWifi
-nm_device_wifi_get_permanent_hw_address, function in NMDeviceWifi +nm_device_wifi_get_permanent_hw_address, function in NMDeviceWifi
@@ -1527,7 +1402,7 @@
-nm_device_wifi_new, function in NMDeviceWifi +nm_device_wifi_new, function in NMDeviceWifi
@@ -1535,7 +1410,7 @@
-nm_device_wifi_request_scan_simple, function in NMDeviceWifi +nm_device_wifi_request_scan_simple, function in NMDeviceWifi
@@ -1559,43 +1434,43 @@
-nm_device_wimax_error_quark, function in NMDeviceWimax +nm_device_wimax_error_quark, function in NMDeviceWimax
-nm_device_wimax_get_active_nsp, function in NMDeviceWimax +nm_device_wimax_get_active_nsp, function in NMDeviceWimax
-nm_device_wimax_get_bsid, function in NMDeviceWimax +nm_device_wimax_get_bsid, function in NMDeviceWimax
-nm_device_wimax_get_center_frequency, function in NMDeviceWimax +nm_device_wimax_get_center_frequency, function in NMDeviceWimax
-nm_device_wimax_get_cinr, function in NMDeviceWimax +nm_device_wimax_get_cinr, function in NMDeviceWimax
-nm_device_wimax_get_hw_address, function in NMDeviceWimax +nm_device_wimax_get_hw_address, function in NMDeviceWimax
-nm_device_wimax_get_nsps, function in NMDeviceWimax +nm_device_wimax_get_nsps, function in NMDeviceWimax
-nm_device_wimax_get_nsp_by_path, function in NMDeviceWimax +nm_device_wimax_get_nsp_by_path, function in NMDeviceWimax
-nm_device_wimax_get_rssi, function in NMDeviceWimax +nm_device_wimax_get_rssi, function in NMDeviceWimax
-nm_device_wimax_get_tx_power, function in NMDeviceWimax +nm_device_wimax_get_tx_power, function in NMDeviceWimax
@@ -1603,7 +1478,7 @@
-nm_device_wimax_new, function in NMDeviceWimax +nm_device_wimax_new, function in NMDeviceWimax
@@ -1615,27 +1490,19 @@
-NMDHCP4Config, struct in NMDHCP4Config +NMDHCP4Config:options, object property in NMDHCP4Config
-NMDHCP4Config:options, object property in NMDHCP4Config +nm_dhcp4_config_get_one_option, function in NMDHCP4Config
-NMDHCP4ConfigClass, struct in NMDHCP4Config +nm_dhcp4_config_get_options, function in NMDHCP4Config
-nm_dhcp4_config_get_one_option, function in NMDHCP4Config -
-
-
-nm_dhcp4_config_get_options, function in NMDHCP4Config -
-
-
-nm_dhcp4_config_new, function in NMDHCP4Config +nm_dhcp4_config_new, function in NMDHCP4Config
@@ -1643,27 +1510,19 @@
-NMDHCP6Config, struct in NMDHCP6Config -
-
-
-NMDHCP6Config:options, object property in NMDHCP6Config -
-
-
-NMDHCP6ConfigClass, struct in NMDHCP6Config +NMDHCP6Config:options, object property in NMDHCP6Config
-nm_dhcp6_config_get_one_option, function in NMDHCP6Config +nm_dhcp6_config_get_one_option, function in NMDHCP6Config
-nm_dhcp6_config_get_options, function in NMDHCP6Config +nm_dhcp6_config_get_options, function in NMDHCP6Config
-nm_dhcp6_config_new, function in NMDHCP6Config +nm_dhcp6_config_new, function in NMDHCP6Config
@@ -1672,31 +1531,23 @@

I

-NMIP4Config, struct in NMIP4Config +NMIP4Config:addresses, object property in NMIP4Config
-NMIP4Config:addresses, object property in NMIP4Config +NMIP4Config:domains, object property in NMIP4Config
-NMIP4Config:domains, object property in NMIP4Config +NMIP4Config:nameservers, object property in NMIP4Config
-NMIP4Config:nameservers, object property in NMIP4Config +NMIP4Config:routes, object property in NMIP4Config
-NMIP4Config:routes, object property in NMIP4Config -
-
-
-NMIP4Config:wins-servers, object property in NMIP4Config -
-
-
-NMIP4ConfigClass, struct in NMIP4Config +NMIP4Config:wins-servers, object property in NMIP4Config
@@ -1708,23 +1559,23 @@
-nm_ip4_config_get_addresses, function in NMIP4Config +nm_ip4_config_get_addresses, function in NMIP4Config
-nm_ip4_config_get_domains, function in NMIP4Config +nm_ip4_config_get_domains, function in NMIP4Config
-nm_ip4_config_get_nameservers, function in NMIP4Config +nm_ip4_config_get_nameservers, function in NMIP4Config
-nm_ip4_config_get_routes, function in NMIP4Config +nm_ip4_config_get_routes, function in NMIP4Config
-nm_ip4_config_get_wins_servers, function in NMIP4Config +nm_ip4_config_get_wins_servers, function in NMIP4Config
@@ -1732,7 +1583,7 @@
-nm_ip4_config_new, function in NMIP4Config +nm_ip4_config_new, function in NMIP4Config
@@ -1744,27 +1595,19 @@
-NMIP6Config, struct in NMIP6Config -
-
-
-NMIP6Config:addresses, object property in NMIP6Config -
-
-
-NMIP6Config:domains, object property in NMIP6Config +NMIP6Config:addresses, object property in NMIP6Config
-NMIP6Config:nameservers, object property in NMIP6Config +NMIP6Config:domains, object property in NMIP6Config
-NMIP6Config:routes, object property in NMIP6Config +NMIP6Config:nameservers, object property in NMIP6Config
-NMIP6ConfigClass, struct in NMIP6Config +NMIP6Config:routes, object property in NMIP6Config
@@ -1776,19 +1619,19 @@
-nm_ip6_config_get_addresses, function in NMIP6Config +nm_ip6_config_get_addresses, function in NMIP6Config
-nm_ip6_config_get_domains, function in NMIP6Config +nm_ip6_config_get_domains, function in NMIP6Config
-nm_ip6_config_get_nameservers, function in NMIP6Config +nm_ip6_config_get_nameservers, function in NMIP6Config
-nm_ip6_config_get_routes, function in NMIP6Config +nm_ip6_config_get_routes, function in NMIP6Config
@@ -1796,7 +1639,7 @@
-nm_ip6_config_new, function in NMIP6Config +nm_ip6_config_new, function in NMIP6Config
@@ -1805,23 +1648,15 @@

O

-NMObject, struct in NMObject -
-
-
-NMObject::object-creation-failed, object signal in NMObject +NMObject::object-creation-failed, object signal in NMObject
-NMObject:dbus-connection, object property in NMObject +NMObject:dbus-connection, object property in NMObject
-NMObject:dbus-path, object property in NMObject -
-
-
-NMObjectClass, struct in NMObject +NMObject:dbus-path, object property in NMObject
@@ -1841,96 +1676,80 @@
-nm_object_error_quark, function in NMObject +nm_object_error_quark, function in NMObject
-nm_object_get_connection, function in NMObject +nm_object_get_connection, function in NMObject
-nm_object_get_path, function in NMObject +nm_object_get_path, function in NMObject

R

-NMRemoteConnection, struct in NMRemoteConnection +NMRemoteConnection::removed, object signal in NMRemoteConnection
-NMRemoteConnection::removed, object signal in NMRemoteConnection +NMRemoteConnection::updated, object signal in NMRemoteConnection
-NMRemoteConnection::updated, object signal in NMRemoteConnection +NMRemoteConnection::visible, object signal in NMRemoteConnection
-NMRemoteConnection::visible, object signal in NMRemoteConnection +NMRemoteConnection:bus, object property in NMRemoteConnection
-NMRemoteConnection:bus, object property in NMRemoteConnection +NMRemoteConnection:dbus-connection, object property in NMRemoteConnection
-NMRemoteConnection:dbus-connection, object property in NMRemoteConnection +NMRemoteConnection:dbus-path, object property in NMRemoteConnection
-NMRemoteConnection:dbus-path, object property in NMRemoteConnection +NMRemoteConnectionCommitFunc, user_function in NMRemoteConnection
-NMRemoteConnectionClass, struct in NMRemoteConnection +NMRemoteConnectionDeleteFunc, user_function in NMRemoteConnection
-NMRemoteConnectionCommitFunc, user_function in NMRemoteConnection +NMRemoteConnectionGetSecretsFunc, user_function in NMRemoteConnection
-NMRemoteConnectionDeleteFunc, user_function in NMRemoteConnection +NMRemoteSettings::connections-read, object signal in NMRemoteSettings
-NMRemoteConnectionGetSecretsFunc, user_function in NMRemoteConnection +NMRemoteSettings::new-connection, object signal in NMRemoteSettings
-NMRemoteSettings, struct in NMRemoteSettings +NMRemoteSettings:bus, object property in NMRemoteSettings
-NMRemoteSettings::connections-read, object signal in NMRemoteSettings +NMRemoteSettings:can-modify, object property in NMRemoteSettings
-NMRemoteSettings::new-connection, object signal in NMRemoteSettings +NMRemoteSettings:hostname, object property in NMRemoteSettings
-NMRemoteSettings:bus, object property in NMRemoteSettings +NMRemoteSettings:service-running, object property in NMRemoteSettings
-NMRemoteSettings:can-modify, object property in NMRemoteSettings -
-
-
-NMRemoteSettings:hostname, object property in NMRemoteSettings -
-
-
-NMRemoteSettings:service-running, object property in NMRemoteSettings -
-
-
-NMRemoteSettingsAddConnectionFunc, user_function in NMRemoteSettings -
-
-
-NMRemoteSettingsClass, struct in NMRemoteSettings +NMRemoteSettingsAddConnectionFunc, user_function in NMRemoteSettings
@@ -1938,23 +1757,23 @@
-NMRemoteSettingsSaveHostnameFunc, user_function in NMRemoteSettings +NMRemoteSettingsSaveHostnameFunc, user_function in NMRemoteSettings
-nm_remote_connection_commit_changes, function in NMRemoteConnection +nm_remote_connection_commit_changes, function in NMRemoteConnection
-nm_remote_connection_delete, function in NMRemoteConnection +nm_remote_connection_delete, function in NMRemoteConnection
-nm_remote_connection_get_secrets, function in NMRemoteConnection +nm_remote_connection_get_secrets, function in NMRemoteConnection
-nm_remote_connection_new, function in NMRemoteConnection +nm_remote_connection_new, function in NMRemoteConnection
@@ -1966,7 +1785,7 @@
-nm_remote_settings_add_connection, function in NMRemoteSettings +nm_remote_settings_add_connection, function in NMRemoteSettings
@@ -1986,15 +1805,15 @@
-nm_remote_settings_error_quark, function in NMRemoteSettings +nm_remote_settings_error_quark, function in NMRemoteSettings
-nm_remote_settings_get_connection_by_path, function in NMRemoteSettings +nm_remote_settings_get_connection_by_path, function in NMRemoteSettings
-nm_remote_settings_get_connection_by_uuid, function in NMRemoteSettings +nm_remote_settings_get_connection_by_uuid, function in NMRemoteSettings
@@ -2002,15 +1821,15 @@
-nm_remote_settings_list_connections, function in NMRemoteSettings +nm_remote_settings_list_connections, function in NMRemoteSettings
-nm_remote_settings_new, function in NMRemoteSettings +nm_remote_settings_new, function in NMRemoteSettings
-nm_remote_settings_new_async, function in NMRemoteSettings +nm_remote_settings_new_async, function in NMRemoteSettings
@@ -2018,11 +1837,11 @@
-nm_remote_settings_new_finish, function in NMRemoteSettings +nm_remote_settings_new_finish, function in NMRemoteSettings
-nm_remote_settings_save_hostname, function in NMRemoteSettings +nm_remote_settings_save_hostname, function in NMRemoteSettings
@@ -2031,31 +1850,23 @@

S

-NMSecretAgent, struct in NMSecretAgent +NMSecretAgent::registration-result, object signal in NMSecretAgent
-NMSecretAgent::registration-result, object signal in NMSecretAgent +NMSecretAgent:auto-register, object property in NMSecretAgent
-NMSecretAgent:auto-register, object property in NMSecretAgent +NMSecretAgent:identifier, object property in NMSecretAgent
-NMSecretAgent:identifier, object property in NMSecretAgent +NMSecretAgent:registered, object property in NMSecretAgent
-NMSecretAgent:registered, object property in NMSecretAgent -
-
-
-NMSecretAgentClass, struct in NMSecretAgent -
-
-
-NMSecretAgentDeleteSecretsFunc, user_function in NMSecretAgent +NMSecretAgentDeleteSecretsFunc, user_function in NMSecretAgent
@@ -2067,11 +1878,11 @@
-NMSecretAgentGetSecretsFunc, user_function in NMSecretAgent +NMSecretAgentGetSecretsFunc, user_function in NMSecretAgent
-NMSecretAgentSaveSecretsFunc, user_function in NMSecretAgent +NMSecretAgentSaveSecretsFunc, user_function in NMSecretAgent
@@ -2079,7 +1890,7 @@
-nm_secret_agent_delete_secrets, function in NMSecretAgent +nm_secret_agent_delete_secrets, function in NMSecretAgent
@@ -2087,15 +1898,15 @@
-nm_secret_agent_error_quark, function in NMSecretAgent +nm_secret_agent_error_quark, function in NMSecretAgent
-nm_secret_agent_get_registered, function in NMSecretAgent +nm_secret_agent_get_registered, function in NMSecretAgent
-nm_secret_agent_get_secrets, function in NMSecretAgent +nm_secret_agent_get_secrets, function in NMSecretAgent
@@ -2103,7 +1914,7 @@
-nm_secret_agent_register, function in NMSecretAgent +nm_secret_agent_register, function in NMSecretAgent
@@ -2115,40 +1926,24 @@
-nm_secret_agent_save_secrets, function in NMSecretAgent +nm_secret_agent_save_secrets, function in NMSecretAgent
-nm_secret_agent_unregister, function in NMSecretAgent +nm_secret_agent_unregister, function in NMSecretAgent

V

-NMVPNConnection, struct in NMVPNConnection -
-
-
-NMVPNConnection::vpn-state-changed, object signal in NMVPNConnection -
-
-
-NMVPNConnection:banner, object property in NMVPNConnection -
-
-
-NMVPNConnection:vpn-state, object property in NMVPNConnection +NMVPNConnection::vpn-state-changed, object signal in NMVPNConnection
-NMVPNConnectionClass, struct in NMVPNConnection +NMVPNConnection:banner, object property in NMVPNConnection
-NMVPNPlugin, struct in NMVPNPlugin -
-
-
-NMVPNPluginClass, struct in NMVPNPlugin +NMVPNConnection:vpn-state, object property in NMVPNConnection
@@ -2156,23 +1951,15 @@
-NMVpnPluginUiCapability, enum in NMVpnPluginUi -
-
-
-NMVpnPluginUiFactory, user_function in NMVpnPluginUi +NMVpnPluginUiCapability, enum in NMVpnPluginUiWidget
-NMVpnPluginUiInterface, struct in NMVpnPluginUi +NMVpnPluginUiFactory, user_function in NMVpnPluginUiWidget
-NMVpnPluginUiInterfaceProp, enum in NMVpnPluginUi -
-
-
-NMVpnPluginUiWidgetInterface, struct in NMVpnPluginUi +NMVpnPluginUiInterfaceProp, enum in NMVpnPluginUiWidget
@@ -2180,15 +1967,15 @@
-nm_vpn_connection_get_banner, function in NMVPNConnection +nm_vpn_connection_get_banner, function in NMVPNConnection
-nm_vpn_connection_get_vpn_state, function in NMVPNConnection +nm_vpn_connection_get_vpn_state, function in NMVPNConnection
-nm_vpn_connection_new, function in NMVPNConnection +nm_vpn_connection_new, function in NMVPNConnection
@@ -2200,43 +1987,43 @@
-nm_vpn_plugin_disconnect, function in NMVPNPlugin +nm_vpn_plugin_disconnect, function in NMVPNPlugin
-nm_vpn_plugin_error_quark, function in NMVPNPlugin +nm_vpn_plugin_error_quark, function in NMVPNPlugin
-nm_vpn_plugin_failure, function in NMVPNPlugin +nm_vpn_plugin_failure, function in NMVPNPlugin
-nm_vpn_plugin_get_connection, function in NMVPNPlugin +nm_vpn_plugin_get_connection, function in NMVPNPlugin
-nm_vpn_plugin_get_state, function in NMVPNPlugin +nm_vpn_plugin_get_state, function in NMVPNPlugin
-nm_vpn_plugin_set_config, function in NMVPNPlugin +nm_vpn_plugin_set_config, function in NMVPNPlugin
-nm_vpn_plugin_set_ip4_config, function in NMVPNPlugin +nm_vpn_plugin_set_ip4_config, function in NMVPNPlugin
-nm_vpn_plugin_set_ip6_config, function in NMVPNPlugin +nm_vpn_plugin_set_ip6_config, function in NMVPNPlugin
-nm_vpn_plugin_set_login_banner, function in NMVPNPlugin +nm_vpn_plugin_set_login_banner, function in NMVPNPlugin
-nm_vpn_plugin_set_state, function in NMVPNPlugin +nm_vpn_plugin_set_state, function in NMVPNPlugin
@@ -2244,84 +2031,76 @@
-nm_vpn_plugin_ui_factory, function in NMVpnPluginUi +nm_vpn_plugin_ui_factory, function in NMVpnPluginUiWidget
-nm_vpn_plugin_ui_interface_delete_connection, function in NMVpnPluginUi +nm_vpn_plugin_ui_interface_delete_connection, function in NMVpnPluginUiWidget
-NM_VPN_PLUGIN_UI_INTERFACE_DESC, macro in NMVpnPluginUi +NM_VPN_PLUGIN_UI_INTERFACE_DESC, macro in NMVpnPluginUiWidget
-nm_vpn_plugin_ui_interface_export, function in NMVpnPluginUi +nm_vpn_plugin_ui_interface_export, function in NMVpnPluginUiWidget
-nm_vpn_plugin_ui_interface_get_capabilities, function in NMVpnPluginUi +nm_vpn_plugin_ui_interface_get_capabilities, function in NMVpnPluginUiWidget
-nm_vpn_plugin_ui_interface_get_suggested_name, function in NMVpnPluginUi +nm_vpn_plugin_ui_interface_get_suggested_name, function in NMVpnPluginUiWidget
-nm_vpn_plugin_ui_interface_import, function in NMVpnPluginUi +nm_vpn_plugin_ui_interface_import, function in NMVpnPluginUiWidget
-NM_VPN_PLUGIN_UI_INTERFACE_NAME, macro in NMVpnPluginUi +NM_VPN_PLUGIN_UI_INTERFACE_NAME, macro in NMVpnPluginUiWidget
-NM_VPN_PLUGIN_UI_INTERFACE_SERVICE, macro in NMVpnPluginUi +NM_VPN_PLUGIN_UI_INTERFACE_SERVICE, macro in NMVpnPluginUiWidget
-nm_vpn_plugin_ui_interface_ui_factory, function in NMVpnPluginUi +nm_vpn_plugin_ui_interface_ui_factory, function in NMVpnPluginUiWidget
-nm_vpn_plugin_ui_widget_interface_get_widget, function in NMVpnPluginUi +nm_vpn_plugin_ui_widget_interface_get_widget, function in NMVpnPluginUiWidget
-nm_vpn_plugin_ui_widget_interface_save_secrets, function in NMVpnPluginUi +nm_vpn_plugin_ui_widget_interface_save_secrets, function in NMVpnPluginUiWidget
-nm_vpn_plugin_ui_widget_interface_update_connection, function in NMVpnPluginUi +nm_vpn_plugin_ui_widget_interface_update_connection, function in NMVpnPluginUiWidget
-nm_vpn_plugin_utils_get_secret_flags, function in nm-vpn-plugin-utils +nm_vpn_plugin_utils_get_secret_flags, function in nm-vpn-plugin-utils
-nm_vpn_plugin_utils_read_vpn_details, function in nm-vpn-plugin-utils +nm_vpn_plugin_utils_read_vpn_details, function in nm-vpn-plugin-utils

W

-NMWimaxNsp, struct in NMWimaxNsp -
-
-
-NMWimaxNsp:name, object property in NMWimaxNsp -
-
-
-NMWimaxNsp:network-type, object property in NMWimaxNsp +NMWimaxNsp:name, object property in NMWimaxNsp
-NMWimaxNsp:signal-quality, object property in NMWimaxNsp +NMWimaxNsp:network-type, object property in NMWimaxNsp
-NMWimaxNspClass, struct in NMWimaxNsp +NMWimaxNsp:signal-quality, object property in NMWimaxNsp
@@ -2329,23 +2108,23 @@
-nm_wimax_nsp_connection_valid, function in NMWimaxNsp +nm_wimax_nsp_connection_valid, function in NMWimaxNsp
-nm_wimax_nsp_filter_connections, function in NMWimaxNsp +nm_wimax_nsp_filter_connections, function in NMWimaxNsp
-nm_wimax_nsp_get_name, function in NMWimaxNsp +nm_wimax_nsp_get_name, function in NMWimaxNsp
-nm_wimax_nsp_get_network_type, function in NMWimaxNsp +nm_wimax_nsp_get_network_type, function in NMWimaxNsp
-nm_wimax_nsp_get_signal_quality, function in NMWimaxNsp +nm_wimax_nsp_get_signal_quality, function in NMWimaxNsp
@@ -2357,7 +2136,7 @@
-nm_wimax_nsp_new, function in NMWimaxNsp +nm_wimax_nsp_new, function in NMWimaxNsp
@@ -2367,6 +2146,6 @@
- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20 \ No newline at end of file diff --git a/docs/libnm-glib/html/ch02.html b/docs/libnm-glib/html/ch02.html index a14eec19..573515a1 100644 --- a/docs/libnm-glib/html/ch02.html +++ b/docs/libnm-glib/html/ch02.html @@ -2,22 +2,22 @@ -libnm-glib API Reference +libnm-glib Reference Manual: libnm-glib API Reference - + - - - - - - + + + + + +

@@ -105,7 +105,7 @@ NMVPNPlugin
-NMVpnPluginUi +NMVpnPluginUiWidget
nm-vpn-plugin-utils @@ -114,6 +114,6 @@

- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20
\ No newline at end of file diff --git a/docs/libnm-glib/html/home.png b/docs/libnm-glib/html/home.png index 17003611..9346b336 100644 Binary files a/docs/libnm-glib/html/home.png and b/docs/libnm-glib/html/home.png differ diff --git a/docs/libnm-glib/html/index.html b/docs/libnm-glib/html/index.html index 36d9df96..e231d828 100644 --- a/docs/libnm-glib/html/index.html +++ b/docs/libnm-glib/html/index.html @@ -2,11 +2,11 @@ -libnm-glib Reference Manual +libnm-glib Reference Manual: libnm-glib Reference Manual - + @@ -15,12 +15,12 @@

- for libnm-glib 0.9.8.8 + for libnm-glib 0.9.8.10 The latest version of this documentation can be found on-line at - http://projects.gnome.org/NetworkManager/developers/libnm-glib/09/. + https://developer.gnome.org/libnm-glib/0.9/.

-

Copyright © 2012 The NetworkManager Authors

+

Copyright © 2012-2013 The NetworkManager Authors

Permission is granted to copy, distribute and/or modify this @@ -132,7 +132,7 @@ NMVPNPlugin

-NMVpnPluginUi +NMVpnPluginUiWidget
nm-vpn-plugin-utils @@ -145,6 +145,6 @@
- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20
\ No newline at end of file diff --git a/docs/libnm-glib/html/index.sgml b/docs/libnm-glib/html/index.sgml index 993d7c9a..c4c30f65 100644 --- a/docs/libnm-glib/html/index.sgml +++ b/docs/libnm-glib/html/index.sgml @@ -1,47 +1,12 @@ - + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -78,6 +43,23 @@ + + + + + + + + + + + + + + + + + @@ -98,22 +80,12 @@ - - - + + + - - - - - - - - - - - + @@ -123,6 +95,15 @@ + + + + + + + + + @@ -133,36 +114,13 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - + @@ -191,6 +149,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -216,62 +196,39 @@ - - - + + + - - - - - - - - + - - - - - - + + + + + + + - - - + + + - - - - - - - - - - + - - - - - - - - @@ -283,6 +240,15 @@ + + + + + + + + + @@ -294,82 +260,54 @@ - - - + + + - + + + + + - - - - - - - - - - - - + + + - - - - - - - - - + - - - - - + + + + + + - - - + + + - - - - - - - - + - - - - - - - - - @@ -380,6 +318,16 @@ + + + + + + + + + + @@ -392,204 +340,157 @@ - - - + + + - - - - - - + - - - + + + + - - - + + + - - - - - - - + - - - - - + + + + + + - - - + + + - - - - - - - + - - - - - + + + + + + - - - + + + - - - - - - - - + - - - - + + + + + - - - + + + - - - - - - - - + - - - - - + + + + + + - - - + + + - - - - - - + - - - - - + + + + + + - - - + + + - - - - - - - - - - - + + + + + + - - - + + + - - - - - - - - - - - - - + @@ -603,6 +504,17 @@ + + + + + + + + + + + @@ -615,25 +527,24 @@ - - - + + + - - - - - - - - + + + + + + + @@ -641,94 +552,84 @@ - - - + + + - - - - - - - + + + + + + - - - + + + - - - - + + + - - - + + + - - - - + + + - - - + + + - + + + + + - - - - - - - - - - + + + - - - - - + @@ -736,6 +637,9 @@ + + + @@ -745,29 +649,16 @@ - - - + + + - - - - - - + - - - - - - - - @@ -776,6 +667,15 @@ + + + + + + + + + @@ -785,45 +685,36 @@ - + - + + - - + + + - + - - - - - - - - - - - - - - - - - - + + + + + + + @@ -831,43 +722,30 @@ - - - + + + - - - - - + + + + - + + + - - - - - - - - - - - - - - - + @@ -878,48 +756,47 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - + - - + - - - - + + + + + diff --git a/docs/libnm-glib/html/left-insensitive.png b/docs/libnm-glib/html/left-insensitive.png new file mode 100644 index 00000000..3269393a Binary files /dev/null and b/docs/libnm-glib/html/left-insensitive.png differ diff --git a/docs/libnm-glib/html/left.png b/docs/libnm-glib/html/left.png index 2d05b3d5..2abde032 100644 Binary files a/docs/libnm-glib/html/left.png and b/docs/libnm-glib/html/left.png differ diff --git a/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html b/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html index f283bae7..41a3ce7c 100644 --- a/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html +++ b/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html @@ -2,30 +2,27 @@ -NMVPNPlugin +libnm-glib Reference Manual: NMVPNPlugin - - + + - - - - - - - - - - + + + + + + +
@@ -33,279 +30,348 @@

NMVPNPlugin

NMVPNPlugin

- +
-
-

Synopsis

-
#define             NM_VPN_PLUGIN_DBUS_SERVICE_NAME
-#define             NM_VPN_PLUGIN_STATE
-enum                NMVPNPluginError;
-                    NMVPNPlugin;
-                    NMVPNPluginClass;
-GQuark              nm_vpn_plugin_error_quark           (void);
-DBusGConnection *   nm_vpn_plugin_get_connection        (NMVPNPlugin *plugin);
-NMVPNServiceState   nm_vpn_plugin_get_state             (NMVPNPlugin *plugin);
-void                nm_vpn_plugin_set_state             (NMVPNPlugin *plugin,
-                                                         NMVPNServiceState state);
-void                nm_vpn_plugin_set_login_banner      (NMVPNPlugin *plugin,
-                                                         const char *banner);
-void                nm_vpn_plugin_failure               (NMVPNPlugin *plugin,
-                                                         NMVPNPluginFailure reason);
-void                nm_vpn_plugin_set_config            (NMVPNPlugin *plugin,
-                                                         GHashTable *config);
-void                nm_vpn_plugin_set_ip4_config        (NMVPNPlugin *plugin,
-                                                         GHashTable *ip4_config);
-void                nm_vpn_plugin_set_ip6_config        (NMVPNPlugin *plugin,
-                                                         GHashTable *ip6_config);
-gboolean            nm_vpn_plugin_disconnect            (NMVPNPlugin *plugin,
-                                                         GError **err);
-
-
-
-

Description

-

-

-
-

Details

-
-

NM_VPN_PLUGIN_DBUS_SERVICE_NAME

-
#define NM_VPN_PLUGIN_DBUS_SERVICE_NAME "service-name"
-
-

-

-
-
-
-

NM_VPN_PLUGIN_STATE

-
#define NM_VPN_PLUGIN_STATE             "state"
-
-

-

-
-
-
-

enum NMVPNPluginError

-
typedef enum {
-	NM_VPN_PLUGIN_ERROR_GENERAL,              /*< nick=General >*/
-	NM_VPN_PLUGIN_ERROR_STARTING_IN_PROGRESS, /*< nick=StartingInProgress >*/
-	NM_VPN_PLUGIN_ERROR_ALREADY_STARTED,      /*< nick=AlreadyStarted >*/
-	NM_VPN_PLUGIN_ERROR_STOPPING_IN_PROGRESS, /*< nick=StoppingInProgress >*/
-	NM_VPN_PLUGIN_ERROR_ALREADY_STOPPED,      /*< nick=AlreadyStopped >*/
-	NM_VPN_PLUGIN_ERROR_WRONG_STATE,          /*< nick=WrongState >*/
-	NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,        /*< nick=BadArguments >*/
-	NM_VPN_PLUGIN_ERROR_LAUNCH_FAILED,        /*< nick=LaunchFailed >*/
-	NM_VPN_PLUGIN_ERROR_CONNECTION_INVALID,   /*< nick=ConnectionInvalid >*/
-} NMVPNPluginError;
-
-

-Returned by the VPN service plugin to indicate errors. -

-
+

Functions

+
--++ - - + + + + + - - + - - + - - + - - + - - + - - + - - + - - +

NM_VPN_PLUGIN_ERROR_GENERAL

general failure + +GQuark + +nm_vpn_plugin_error_quark () +
+DBusGConnection * + +nm_vpn_plugin_get_connection ()

NM_VPN_PLUGIN_ERROR_STARTING_IN_PROGRESS

the plugin is already starting, - and another connect request was received + +NMVPNServiceState + +nm_vpn_plugin_get_state ()

NM_VPN_PLUGIN_ERROR_ALREADY_STARTED

the plugin is already connected, and - another connect request was received + +void + +nm_vpn_plugin_set_state ()

NM_VPN_PLUGIN_ERROR_STOPPING_IN_PROGRESS

the plugin is already stopping, - and another stop request was received + +void + +nm_vpn_plugin_set_login_banner ()

NM_VPN_PLUGIN_ERROR_ALREADY_STOPPED

the plugin is already stopped, and - another disconnect request was received + +void + +nm_vpn_plugin_failure ()

NM_VPN_PLUGIN_ERROR_WRONG_STATE

the operation could not be performed in - this state + +void + +nm_vpn_plugin_set_config ()

NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS

the operation could not be performed as - the request contained malformed arguments, or arguments of unexpected type. - Usually means that one of the VPN setting data items or secrets was not of - the expected type (ie int, string, bool, etc). + +void + +nm_vpn_plugin_set_ip4_config ()

NM_VPN_PLUGIN_ERROR_LAUNCH_FAILED

a child process failed to launch + +void + +nm_vpn_plugin_set_ip6_config ()

NM_VPN_PLUGIN_ERROR_CONNECTION_INVALID

the operation could not be performed - because the connection was invalid. Usually means that the connection's - VPN setting was missing some required data item or secret. + +gboolean + +nm_vpn_plugin_disconnect ()
-
-
-

NMVPNPlugin

-
typedef struct {
-	GObject parent;
-} NMVPNPlugin;
+

+
Types and Values

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+




#defineNM_VPN_PLUGIN_DBUS_SERVICE_NAME
#defineNM_VPN_PLUGIN_STATE
enumNMVPNPluginError

+

+

+
Object Hierarchy

+
 

+

+

+
Description

 

 

 

-

+

+
Functions

 

-
NMVPNPluginClass

-
typedef struct {
-	GObjectClass parent;
-
-	/* virtual methods */
-	gboolean (*connect)      (NMVPNPlugin   *plugin,
-	                          NMConnection  *connection,
-	                          GError       **err);
-
-	gboolean (*need_secrets) (NMVPNPlugin *plugin,
-	                          NMConnection *connection,
-	                          char **setting_name,
-	                          GError **error);
-
-	gboolean (*disconnect)   (NMVPNPlugin   *plugin,
-	                          GError       **err);
-
-	/* Signals */
-	void (*state_changed)  (NMVPNPlugin *plugin,
-	                        NMVPNServiceState state);
-
-	void (*ip4_config)     (NMVPNPlugin *plugin,
-	                        GHashTable  *ip4_config);
-
-	void (*login_banner)   (NMVPNPlugin *plugin,
-	                        const char *banner);
-
-	void (*failure)        (NMVPNPlugin *plugin,
-	                        NMVPNPluginFailure reason);
-
-	void (*quit)           (NMVPNPlugin *plugin);
-
-	void (*config)         (NMVPNPlugin *plugin,
-	                        GHashTable  *config);
-
-	void (*ip6_config)     (NMVPNPlugin *plugin,
-	                        GHashTable  *config);
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMVPNPluginClass;
-

+
nm_vpn_plugin_error_quark ()

+
GQuark
+nm_vpn_plugin_error_quark (void);

 

 

+

+
Returns

+

+

 

 

 

-
nm_vpn_plugin_error_quark ()

-
GQuark              nm_vpn_plugin_error_quark           (void);

+
nm_vpn_plugin_get_connection ()

+
DBusGConnection *
+nm_vpn_plugin_get_connection (NMVPNPlugin *plugin);

 

 

+

+
Returns

+

+

 

 

 

-
nm_vpn_plugin_get_connection ()

-
DBusGConnection *   nm_vpn_plugin_get_connection        (NMVPNPlugin *plugin);

+
nm_vpn_plugin_get_state ()

+
NMVPNServiceState
+nm_vpn_plugin_get_state (NMVPNPlugin *plugin);

 

 

+

+
Returns

+

+

 

 

 

-
nm_vpn_plugin_get_state ()

-
NMVPNServiceState   nm_vpn_plugin_get_state             (NMVPNPlugin *plugin);

+
nm_vpn_plugin_set_state ()

+
void
+nm_vpn_plugin_set_state (NMVPNPlugin *plugin,
+                         NMVPNServiceState state);

 

 

 

 

 

-
nm_vpn_plugin_set_state ()

-
void                nm_vpn_plugin_set_state             (NMVPNPlugin *plugin,
-                                                         NMVPNServiceState state);

+
nm_vpn_plugin_set_login_banner ()

+
void
+nm_vpn_plugin_set_login_banner (NMVPNPlugin *plugin,
+                                const char *banner);

 

 

 

 

 

-
nm_vpn_plugin_set_login_banner ()

-
void                nm_vpn_plugin_set_login_banner      (NMVPNPlugin *plugin,
-                                                         const char *banner);

+
nm_vpn_plugin_failure ()

+
void
+nm_vpn_plugin_failure (NMVPNPlugin *plugin,
+                       NMVPNPluginFailure reason);

 

 

 

 

 

-
nm_vpn_plugin_failure ()

-
void                nm_vpn_plugin_failure               (NMVPNPlugin *plugin,
-                                                         NMVPNPluginFailure reason);

+
nm_vpn_plugin_set_config ()

+
void
+nm_vpn_plugin_set_config (NMVPNPlugin *plugin,
+                          GHashTable *config);

 

 

 

 

 

-
nm_vpn_plugin_set_config ()

-
void                nm_vpn_plugin_set_config            (NMVPNPlugin *plugin,
-                                                         GHashTable *config);

+
nm_vpn_plugin_set_ip4_config ()

+
void
+nm_vpn_plugin_set_ip4_config (NMVPNPlugin *plugin,
+                              GHashTable *ip4_config);

 

 

 

 

 

-
nm_vpn_plugin_set_ip4_config ()

-
void                nm_vpn_plugin_set_ip4_config        (NMVPNPlugin *plugin,
-                                                         GHashTable *ip4_config);

+
nm_vpn_plugin_set_ip6_config ()

+
void
+nm_vpn_plugin_set_ip6_config (NMVPNPlugin *plugin,
+                              GHashTable *ip6_config);

 

 

 

 

 

-
nm_vpn_plugin_set_ip6_config ()

-
void                nm_vpn_plugin_set_ip6_config        (NMVPNPlugin *plugin,
-                                                         GHashTable *ip6_config);

+
nm_vpn_plugin_disconnect ()

+
gboolean
+nm_vpn_plugin_disconnect (NMVPNPlugin *plugin,
+                          GError **err);

+

+

+

+
Returns

+

+

+

+

+

+
Types and Values

+

+
NM_VPN_PLUGIN_DBUS_SERVICE_NAME

+
#define NM_VPN_PLUGIN_DBUS_SERVICE_NAME "service-name"
+

 

 

 

 

 

-
nm_vpn_plugin_disconnect ()

-
gboolean            nm_vpn_plugin_disconnect            (NMVPNPlugin *plugin,
-                                                         GError **err);

+
NM_VPN_PLUGIN_STATE

+
#define NM_VPN_PLUGIN_STATE             "state"
+

 

 

 

+

+

+
enum NMVPNPluginError

+
Returned by the VPN service plugin to indicate errors.

+

+
Members

+

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





NM_VPN_PLUGIN_ERROR_GENERAL

+
general failure

+		 
NM_VPN_PLUGIN_ERROR_STARTING_IN_PROGRESS

+
the plugin is already starting,
+ and another connect request was received

+		 
NM_VPN_PLUGIN_ERROR_ALREADY_STARTED

+
the plugin is already connected, and
+ another connect request was received

+		 
NM_VPN_PLUGIN_ERROR_STOPPING_IN_PROGRESS

+
the plugin is already stopping,
+ and another stop request was received

+		 
NM_VPN_PLUGIN_ERROR_ALREADY_STOPPED

+
the plugin is already stopped, and
+ another disconnect request was received

+		 
NM_VPN_PLUGIN_ERROR_WRONG_STATE

+
the operation could not be performed in
+ this state

+		 
NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS

+
the operation could not be performed as
+ the request contained malformed arguments, or arguments of unexpected type.
+ Usually means that one of the VPN setting data items or secrets was not of
+ the expected type (ie int, string, bool, etc).

+		 
NM_VPN_PLUGIN_ERROR_LAUNCH_FAILED

+
a child process failed to launch

+		 
NM_VPN_PLUGIN_ERROR_CONNECTION_INVALID

+
the operation could not be performed
+ because the connection was invalid.  Usually means that the connection's
+ VPN setting was missing some required data item or secret.

+		 

+

+
- Generated by GTK-Doc V1.19
+ Generated by GTK-Doc V1.20
\ No newline at end of file diff --git a/docs/libnm-glib/html/libnm-glib-NMVpnPluginUi.html b/docs/libnm-glib/html/libnm-glib-NMVpnPluginUi.html deleted file mode 100644 index fb13eb06..00000000 --- a/docs/libnm-glib/html/libnm-glib-NMVpnPluginUi.html +++ /dev/null @@ -1,388 +0,0 @@ - - - - -NMVpnPluginUi - - - - - - - - - - - - - - - - - - - -
-
-
- - -
-

NMVpnPluginUi

-

NMVpnPluginUi

-
-
-

Synopsis

-
NMVpnPluginUiInterface * (*NMVpnPluginUiFactory)        (GError **error);
-NMVpnPluginUiInterface * nm_vpn_plugin_ui_factory       (GError **error);
-enum                NMVpnPluginUiCapability;
-#define             NM_VPN_PLUGIN_UI_INTERFACE_NAME
-#define             NM_VPN_PLUGIN_UI_INTERFACE_DESC
-#define             NM_VPN_PLUGIN_UI_INTERFACE_SERVICE
-enum                NMVpnPluginUiInterfaceProp;
-struct              NMVpnPluginUiInterface;
-NMVpnPluginUiWidgetInterface * nm_vpn_plugin_ui_interface_ui_factory
-                                                        (NMVpnPluginUiInterface *iface,
-                                                         NMConnection *connection,
-                                                         GError **error);
-guint32             nm_vpn_plugin_ui_interface_get_capabilities
-                                                        (NMVpnPluginUiInterface *iface);
-NMConnection *      nm_vpn_plugin_ui_interface_import   (NMVpnPluginUiInterface *iface,
-                                                         const char *path,
-                                                         GError **error);
-gboolean            nm_vpn_plugin_ui_interface_export   (NMVpnPluginUiInterface *iface,
-                                                         const char *path,
-                                                         NMConnection *connection,
-                                                         GError **error);
-char *              nm_vpn_plugin_ui_interface_get_suggested_name
-                                                        (NMVpnPluginUiInterface *iface,
-                                                         NMConnection *connection);
-gboolean            nm_vpn_plugin_ui_interface_delete_connection
-                                                        (NMVpnPluginUiInterface *iface,
-                                                         NMConnection *connection,
-                                                         GError **error);
-struct              NMVpnPluginUiWidgetInterface;
-GObject *           nm_vpn_plugin_ui_widget_interface_get_widget
-                                                        (NMVpnPluginUiWidgetInterface *iface);
-gboolean            nm_vpn_plugin_ui_widget_interface_update_connection
-                                                        (NMVpnPluginUiWidgetInterface *iface,
-                                                         NMConnection *connection,
-                                                         GError **error);
-gboolean            nm_vpn_plugin_ui_widget_interface_save_secrets
-                                                        (NMVpnPluginUiWidgetInterface *iface,
-                                                         NMConnection *connection,
-                                                         GError **error);
-
-
-
-

Description

-

-

-
-
-

Details

-
-

NMVpnPluginUiFactory ()

-
NMVpnPluginUiInterface * (*NMVpnPluginUiFactory)        (GError **error);
-

-

-
-
-
-

nm_vpn_plugin_ui_factory ()

-
NMVpnPluginUiInterface * nm_vpn_plugin_ui_factory       (GError **error);
-

-

-
-
-
-

enum NMVpnPluginUiCapability

-
typedef enum {
-	NM_VPN_PLUGIN_UI_CAPABILITY_NONE   = 0x00,
-	NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT = 0x01,
-	NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT = 0x02,
-	NM_VPN_PLUGIN_UI_CAPABILITY_IPV6   = 0x04
-} NMVpnPluginUiCapability;
-
-

-Flags that indicate to UI programs certain capabilities of the plugin. -

-
---- - - - - - - - - - - - - - - - - - - -

NM_VPN_PLUGIN_UI_CAPABILITY_NONE

unknown or no capability -

NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT

the plugin can import new connections -

NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT

the plugin can export connections -

NM_VPN_PLUGIN_UI_CAPABILITY_IPV6

the plugin supports IPv6 addressing -
-
-
-
-

NM_VPN_PLUGIN_UI_INTERFACE_NAME

-
#define NM_VPN_PLUGIN_UI_INTERFACE_NAME "name"
-
-

-

-
-
-
-

NM_VPN_PLUGIN_UI_INTERFACE_DESC

-
#define NM_VPN_PLUGIN_UI_INTERFACE_DESC "desc"
-
-

-

-
-
-
-

NM_VPN_PLUGIN_UI_INTERFACE_SERVICE

-
#define NM_VPN_PLUGIN_UI_INTERFACE_SERVICE "service"
-
-

-

-
-
-
-

enum NMVpnPluginUiInterfaceProp

-
typedef enum {
-	NM_VPN_PLUGIN_UI_INTERFACE_PROP_NAME = NM_VPN_PLUGIN_UI_INTERFACE_PROP_FIRST,
-	NM_VPN_PLUGIN_UI_INTERFACE_PROP_DESC,
-	NM_VPN_PLUGIN_UI_INTERFACE_PROP_SERVICE
-} NMVpnPluginUiInterfaceProp;
-
-

-GObject property numbers that plugins should override to provide certain -information to UI programs. -

-
---- - - - - - - - - - - - - - - -

NM_VPN_PLUGIN_UI_INTERFACE_PROP_NAME

the VPN plugin's name -

NM_VPN_PLUGIN_UI_INTERFACE_PROP_DESC

description of the VPN plugin and what -VPN services it supports -

NM_VPN_PLUGIN_UI_INTERFACE_PROP_SERVICE

the D-Bus service name used by the -plugin's VPN service daemon -
-
-
-
-

struct NMVpnPluginUiInterface

-
struct NMVpnPluginUiInterface {
-	GTypeInterface g_iface;
-
-	/* Plugin's factory function that returns a GObject that implements
-	 * NMVpnPluginUiWidgetInterface, pre-filled with values from 'connection'
-	 * if non-NULL.
-	 */
-	NMVpnPluginUiWidgetInterface * (*ui_factory) (NMVpnPluginUiInterface *iface,
-	                                              NMConnection *connection,
-	                                              GError **error);
-
-	/* Plugin's capabiltity function that returns a bitmask of capabilities
-	 * described by NM_VPN_PLUGIN_UI_CAPABILITY_* defines.
-	 */
-	guint32 (*get_capabilities) (NMVpnPluginUiInterface *iface);
-
-	/* Try to import a connection from the specified path.  On success, return a
-	 * partial NMConnection object.  On error, return NULL and set 'error' with
-	 * additional information.  Note that 'error' can be NULL, in which case no
-	 * additional error information should be provided.
-	 */
-	NMConnection * (*import_from_file) (NMVpnPluginUiInterface *iface,
-	                                    const char *path,
-	                                    GError **error);
-
-	/* Export the given connection to the specified path.  Return TRUE on success.
-	 * On error, return FALSE and set 'error' with additional error information.
-	 * Note that 'error' can be NULL, in which case no additional error information
-	 * should be provided.
-	 */
-	gboolean (*export_to_file) (NMVpnPluginUiInterface *iface,
-	                            const char *path,
-	                            NMConnection *connection,
-	                            GError **error);
-
-	/* For a given connection, return a suggested file name.  Returned value should
-	 * be NULL or a suggested file name allocated via g_malloc/g_new/etc to be freed
-	 * by the caller.
-	 */
-	char * (*get_suggested_name) (NMVpnPluginUiInterface *iface, NMConnection *connection);
-
-	/* Deprecated and no longer used */
-	gboolean (*delete_connection) (NMVpnPluginUiInterface *iface, NMConnection *connection, GError **error);
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-};
-
-

-

-
-
-
-

nm_vpn_plugin_ui_interface_ui_factory ()

-
NMVpnPluginUiWidgetInterface * nm_vpn_plugin_ui_interface_ui_factory
-                                                        (NMVpnPluginUiInterface *iface,
-                                                         NMConnection *connection,
-                                                         GError **error);
-

-

-
-
-
-

nm_vpn_plugin_ui_interface_get_capabilities ()

-
guint32             nm_vpn_plugin_ui_interface_get_capabilities
-                                                        (NMVpnPluginUiInterface *iface);
-

-

-
-
-
-

nm_vpn_plugin_ui_interface_import ()

-
NMConnection *      nm_vpn_plugin_ui_interface_import   (NMVpnPluginUiInterface *iface,
-                                                         const char *path,
-                                                         GError **error);
-

-

-
-
-
-

nm_vpn_plugin_ui_interface_export ()

-
gboolean            nm_vpn_plugin_ui_interface_export   (NMVpnPluginUiInterface *iface,
-                                                         const char *path,
-                                                         NMConnection *connection,
-                                                         GError **error);
-

-

-
-
-
-

nm_vpn_plugin_ui_interface_get_suggested_name ()

-
char *              nm_vpn_plugin_ui_interface_get_suggested_name
-                                                        (NMVpnPluginUiInterface *iface,
-                                                         NMConnection *connection);
-

-

-
-
-
-

nm_vpn_plugin_ui_interface_delete_connection ()

-
gboolean            nm_vpn_plugin_ui_interface_delete_connection
-                                                        (NMVpnPluginUiInterface *iface,
-                                                         NMConnection *connection,
-                                                         GError **error);
-

-

-
-
-
-

struct NMVpnPluginUiWidgetInterface

-
struct NMVpnPluginUiWidgetInterface {
-	GTypeInterface g_iface;
-
-	/* Return the GtkWidget for the VPN's UI */
-	GObject * (*get_widget) (NMVpnPluginUiWidgetInterface *iface);
-
-	/* Called to save the user-entered options to the connection object.  Should
-	 * return FALSE and set 'error' if the current options are invalid.  'error'
-	 * should contain enough information for the plugin to determine which UI
-	 * widget is invalid at a later point in time.  For example, creating unique
-	 * error codes for what error occurred and populating the message field
-	 * of 'error' with the name of the invalid property.
-	 */
-	gboolean (*update_connection) (NMVpnPluginUiWidgetInterface *iface,
-	                               NMConnection *connection,
-	                               GError **error);
-
-	/* Deprecated and no longer used */
-	gboolean (*save_secrets) (NMVpnPluginUiWidgetInterface *iface,
-	                          NMConnection *connection,
-	                          GError **error);
-
-	/* Emitted when the value of a UI widget changes.  May trigger a validity
-	 * check via update_connection() to write values to the connection */
-	void (*changed) (NMVpnPluginUiWidgetInterface *iface);
-};
-
-

-

-
-
-
-

nm_vpn_plugin_ui_widget_interface_get_widget ()

-
GObject *           nm_vpn_plugin_ui_widget_interface_get_widget
-                                                        (NMVpnPluginUiWidgetInterface *iface);
-

-

-
-
-
-

nm_vpn_plugin_ui_widget_interface_update_connection ()

-
gboolean            nm_vpn_plugin_ui_widget_interface_update_connection
-                                                        (NMVpnPluginUiWidgetInterface *iface,
-                                                         NMConnection *connection,
-                                                         GError **error);
-

-

-
-
-
-

nm_vpn_plugin_ui_widget_interface_save_secrets ()

-
gboolean            nm_vpn_plugin_ui_widget_interface_save_secrets
-                                                        (NMVpnPluginUiWidgetInterface *iface,
-                                                         NMConnection *connection,
-                                                         GError **error);
-

-

-
-
-
-
-
- Generated by GTK-Doc V1.19
- - \ No newline at end of file diff --git a/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html b/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html new file mode 100644 index 00000000..01eb80ee --- /dev/null +++ b/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html @@ -0,0 +1,446 @@ + + + + +libnm-glib Reference Manual: NMVpnPluginUiWidget + + + + + + + + + + + + + + + + +
+
+
+ + +
+

NMVpnPluginUiWidget

+

NMVpnPluginUiWidget

+
+
+

Functions

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+NMVpnPluginUiInterface * + +(*NMVpnPluginUiFactory) () +
+NMVpnPluginUiInterface * + +nm_vpn_plugin_ui_factory () +
+NMVpnPluginUiWidgetInterface * + +nm_vpn_plugin_ui_interface_ui_factory () +
+guint32 + +nm_vpn_plugin_ui_interface_get_capabilities () +
+NMConnection * + +nm_vpn_plugin_ui_interface_import () +
+gboolean + +nm_vpn_plugin_ui_interface_export () +
+char * + +nm_vpn_plugin_ui_interface_get_suggested_name () +
+gboolean + +nm_vpn_plugin_ui_interface_delete_connection () +
+GObject * + +nm_vpn_plugin_ui_widget_interface_get_widget () +
+gboolean + +nm_vpn_plugin_ui_widget_interface_update_connection () +
+gboolean + +nm_vpn_plugin_ui_widget_interface_save_secrets () +
+
+
+

Types and Values

+
++++ + + + + + + + + + + + + + + + + + + + + + + +
enumNMVpnPluginUiCapability
#defineNM_VPN_PLUGIN_UI_INTERFACE_NAME
#defineNM_VPN_PLUGIN_UI_INTERFACE_DESC
#defineNM_VPN_PLUGIN_UI_INTERFACE_SERVICE
enumNMVpnPluginUiInterfaceProp
+
+
+

Object Hierarchy

+
+
+
+
+

Description

+

+

+
+
+

Functions

+
+

NMVpnPluginUiFactory ()

+
NMVpnPluginUiInterface *
+(*NMVpnPluginUiFactory) (GError **error);
+

+

+
+

Returns

+

+
+
+
+
+

nm_vpn_plugin_ui_factory ()

+
NMVpnPluginUiInterface *
+nm_vpn_plugin_ui_factory (GError **error);
+

+

+
+

Returns

+

+
+
+
+
+

nm_vpn_plugin_ui_interface_ui_factory ()

+
NMVpnPluginUiWidgetInterface *
+nm_vpn_plugin_ui_interface_ui_factory (NMVpnPluginUiInterface *iface,
+                                       NMConnection *connection,
+                                       GError **error);
+

+

+
+

Returns

+

+
+
+
+
+

nm_vpn_plugin_ui_interface_get_capabilities ()

+
guint32
+nm_vpn_plugin_ui_interface_get_capabilities
+                               (NMVpnPluginUiInterface *iface);
+

+

+
+

Returns

+

+
+
+
+
+

nm_vpn_plugin_ui_interface_import ()

+
NMConnection *
+nm_vpn_plugin_ui_interface_import (NMVpnPluginUiInterface *iface,
+                                   const char *path,
+                                   GError **error);
+

+

+
+

Returns

+

+
+
+
+
+

nm_vpn_plugin_ui_interface_export ()

+
gboolean
+nm_vpn_plugin_ui_interface_export (NMVpnPluginUiInterface *iface,
+                                   const char *path,
+                                   NMConnection *connection,
+                                   GError **error);
+

+

+
+

Returns

+

+
+
+
+
+

nm_vpn_plugin_ui_interface_get_suggested_name ()

+
char *
+nm_vpn_plugin_ui_interface_get_suggested_name
+                               (NMVpnPluginUiInterface *iface,
+                                NMConnection *connection);
+

+

+
+

Returns

+

+
+
+
+
+

nm_vpn_plugin_ui_interface_delete_connection ()

+
gboolean
+nm_vpn_plugin_ui_interface_delete_connection
+                               (NMVpnPluginUiInterface *iface,
+                                NMConnection *connection,
+                                GError **error);
+

+

+
+

Returns

+

+
+
+
+
+

nm_vpn_plugin_ui_widget_interface_get_widget ()

+
GObject *
+nm_vpn_plugin_ui_widget_interface_get_widget
+                               (NMVpnPluginUiWidgetInterface *iface);
+

+

+
+

Returns

+

+
+
+
+
+

nm_vpn_plugin_ui_widget_interface_update_connection ()

+
gboolean
+nm_vpn_plugin_ui_widget_interface_update_connection
+                               (NMVpnPluginUiWidgetInterface *iface,
+                                NMConnection *connection,
+                                GError **error);
+

+

+
+

Returns

+

+
+
+
+
+

nm_vpn_plugin_ui_widget_interface_save_secrets ()

+
gboolean
+nm_vpn_plugin_ui_widget_interface_save_secrets
+                               (NMVpnPluginUiWidgetInterface *iface,
+                                NMConnection *connection,
+                                GError **error);
+

+

+
+

Returns

+

+
+
+
+
+

Types and Values

+
+

enum NMVpnPluginUiCapability

+

Flags that indicate to UI programs certain capabilities of the plugin.

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

NM_VPN_PLUGIN_UI_CAPABILITY_NONE

 +

unknown or no capability

+		 

NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT

 +

the plugin can import new connections

+		 

NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT

 +

the plugin can export connections

+		 

NM_VPN_PLUGIN_UI_CAPABILITY_IPV6

 +

the plugin supports IPv6 addressing

+		 
+
+
+
+
+

NM_VPN_PLUGIN_UI_INTERFACE_NAME

+
#define NM_VPN_PLUGIN_UI_INTERFACE_NAME "name"
+
+

+

+
+
+
+

NM_VPN_PLUGIN_UI_INTERFACE_DESC

+
#define NM_VPN_PLUGIN_UI_INTERFACE_DESC "desc"
+
+

+

+
+
+
+

NM_VPN_PLUGIN_UI_INTERFACE_SERVICE

+
#define NM_VPN_PLUGIN_UI_INTERFACE_SERVICE "service"
+
+

+

+
+
+
+

enum NMVpnPluginUiInterfaceProp

+

GObject property numbers that plugins should override to provide certain +information to UI programs.

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + +

NM_VPN_PLUGIN_UI_INTERFACE_PROP_NAME

 +

the VPN plugin's name

+		 

NM_VPN_PLUGIN_UI_INTERFACE_PROP_DESC

 +

description of the VPN plugin and what +VPN services it supports

+		 

NM_VPN_PLUGIN_UI_INTERFACE_PROP_SERVICE

 +

the D-Bus service name used by the +plugin's VPN service daemon

+		 
+
+
+
+
+
+
+ Generated by GTK-Doc V1.20
+ + \ No newline at end of file diff --git a/docs/libnm-glib/html/libnm-glib-nm-types.html b/docs/libnm-glib/html/libnm-glib-nm-types.html index 3793ddcd..c54f111e 100644 --- a/docs/libnm-glib/html/libnm-glib-nm-types.html +++ b/docs/libnm-glib/html/libnm-glib-nm-types.html @@ -2,30 +2,27 @@ -nm-types +libnm-glib Reference Manual: nm-types - + - - - - - - - - - - + + + + + + +
@@ -33,11 +30,12 @@

nm-types

nm-types

- +
-
-

Synopsis

-

+

+
Object Hierarchy

+
+

 

 

 
Description

@@ -45,11 +43,14 @@
 

 

 

-
Details

+
Functions

+

+

+
Types and Values

 

 

 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.20

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html b/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html
index 5bc3027b..cbb16e38 100644
--- a/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html
+++ b/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html
@@ -2,30 +2,27 @@
 
 
 
-nm-vpn-plugin-utils
+libnm-glib Reference Manual: nm-vpn-plugin-utils
 
 
 
-
+
 
-
+
 
 
 
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
 

 

 

@@ -33,18 +30,38 @@
 
nm-vpn-plugin-utils
nm-vpn-plugin-utils

-
+

 
 
 

-

-
Synopsis

-
gboolean            nm_vpn_plugin_utils_read_vpn_details
-                                                        (int fd,
-                                                         GHashTable **out_data,
-                                                         GHashTable **out_secrets);
-gboolean            nm_vpn_plugin_utils_get_secret_flags
-                                                        (GHashTable *data,
-                                                         const char *secret_name,
-                                                         NMSettingSecretFlags *out_flags);
+

+
Functions

+

++++
+
+
+
+
+
+
+
+
+
+
+





+gboolean
+
+nm_vpn_plugin_utils_read_vpn_details ()
+

+gboolean
+
+nm_vpn_plugin_utils_get_secret_flags ()
+

+

+

+
Object Hierarchy

+
 

 

 

@@ -53,91 +70,103 @@
 

 

 

-
Details

+
Functions

 

-
nm_vpn_plugin_utils_read_vpn_details ()

-
gboolean            nm_vpn_plugin_utils_read_vpn_details
-                                                        (int fd,
-                                                         GHashTable **out_data,
-                                                         GHashTable **out_secrets);

-

-Parses key/value pairs from a file descriptor (normally stdin) passed by
-an applet when the applet calls the authentication dialog of the VPN plugin.
-

-

+
nm_vpn_plugin_utils_read_vpn_details ()

+
gboolean
+nm_vpn_plugin_utils_read_vpn_details (int fd,
+                                      GHashTable **out_data,
+                                      GHashTable **out_secrets);

+
Parses key/value pairs from a file descriptor (normally stdin) passed by
+an applet when the applet calls the authentication dialog of the VPN plugin.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+
-
-
-
-
-
-
+
+
+

 





 
 
 
fd :
file descriptor to read from, usually stdin (0)
fd
file descriptor to read from, usually stdin (0)
 
 

 
out_data :
on successful return, a hash table
-(mapping char*:char*) containing the key/value pairs of VPN data items. [out][transfer full]
-
out_data
 on successful return, a hash table
+(mapping char*:char*) containing the key/value pairs of VPN data items. 
[out][transfer full]
 

 
out_secrets :
on successful return, a hash table
-(mapping char*:char*) containing the key/value pairsof VPN secrets. [out][transfer full]
-
Returns :

-TRUE if reading values was successful, FALSE if not
out_secrets
 on successful return, a hash table
+(mapping char*:char*) containing the key/value pairsof VPN secrets. 
[out][transfer full]
 

 
 

 

+

+
Returns

+
 TRUE if reading values was successful, FALSE if not

+

+

+

 

 

-
nm_vpn_plugin_utils_get_secret_flags ()

-
gboolean            nm_vpn_plugin_utils_get_secret_flags
-                                                        (GHashTable *data,
-                                                         const char *secret_name,
-                                                         NMSettingSecretFlags *out_flags);

-

-Given a VPN secret key name, attempts to find the corresponding flags data
-item in data.  If found, converts the flags data item to
-NMSettingSecretFlags and returns it.
-

-

+
nm_vpn_plugin_utils_get_secret_flags ()

+
gboolean
+nm_vpn_plugin_utils_get_secret_flags (GHashTable *data,
+                                      const char *secret_name,
+                                      NMSettingSecretFlags *out_flags);

+
Given a VPN secret key name, attempts to find the corresponding flags data
+item in data
+.  If found, converts the flags data item to
+NMSettingSecretFlags and returns it.

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+

 





 
 
 
data :
hash table containing VPN key/value pair data items
secret_name :
VPN secret key name for which to retrieve flags for
data
hash table containing VPN key/value pair data items
 
 

 
out_flags :
on success, the flags associated with secret_name. [out]
-
secret_name
VPN secret key name for which to retrieve flags for
 
 

 
Returns :

-TRUE if the flag data item was found and successfully converted
-to flags, FALSE if not
out_flags
 on success, the flags associated with secret_name
+. 
[out]
 

 
 

 

+

+
Returns

+
 TRUE if the flag data item was found and successfully converted
+to flags, FALSE if not

+

+

+

+

+

+
Types and Values

 

 

 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.20

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/libnm-glib.devhelp2 b/docs/libnm-glib/html/libnm-glib.devhelp2
index e046cc04..4e60b47e 100644
--- a/docs/libnm-glib/html/libnm-glib.devhelp2
+++ b/docs/libnm-glib/html/libnm-glib.devhelp2
@@ -31,7 +31,7 @@
       
       
       
-      
+      
       
     
     
@@ -39,6 +39,42 @@
     
   
   
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -55,61 +91,32 @@
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -118,25 +125,42 @@
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -158,135 +182,107 @@
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
-    
     
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
-    
     
     
     
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
-    
     
     
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
     
     
-    
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
-    
     
     
     
@@ -294,123 +290,110 @@
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
-    
     
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
     
     
-    
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
-    
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
     
     
-    
     
     
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
     
     
-    
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
-    
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -421,304 +404,164 @@
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
     
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
     
-    
-    
-    
-    
+    
+    
+    
+    
     
     
-    
     
     
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
-    
     
     
     
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
     
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
     
     
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
   
 
diff --git a/docs/libnm-glib/html/object-tree.html b/docs/libnm-glib/html/object-tree.html
index e001e47a..199cb73d 100644
--- a/docs/libnm-glib/html/object-tree.html
+++ b/docs/libnm-glib/html/object-tree.html
@@ -2,58 +2,58 @@
 
 
 
-Object Hierarchy
+libnm-glib Reference Manual: Object Hierarchy
 
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
+
+
+
+
+
+
 

 

 Object Hierarchy

 
     GObject
-        NMObject
-            NMClient
-            NMDevice
-                NMDeviceEthernet
-                NMDeviceWifi
-                NMDeviceModem
-                NMDeviceBt
-                NMDeviceWimax
-                NMDeviceOlpcMesh
-                NMDeviceAdsl
-                NMDeviceInfiniband
-                NMDeviceBond
-                NMDeviceBridge
-                NMDeviceVlan
-            NMWimaxNsp
-            NMAccessPoint
-            NMIP4Config
-            NMIP6Config
-            NMActiveConnection
-                NMVPNConnection
-            NMDHCP4Config
-            NMDHCP6Config
-        NMRemoteSettings
-        NMConnection
-            NMRemoteConnection
-        NMSecretAgent
+    ├── NMObject
+    │   ├── NMClient
+    │   ├── NMDevice
+    │   │   ├── NMDeviceEthernet
+    │   │   ├── NMDeviceWifi
+    │   │   ├── NMDeviceModem
+    │   │   ├── NMDeviceBt
+    │   │   ├── NMDeviceWimax
+    │   │   ├── NMDeviceOlpcMesh
+    │   │   ├── NMDeviceAdsl
+    │   │   ├── NMDeviceInfiniband
+    │   │   ├── NMDeviceBond
+    │   │   ├── NMDeviceBridge
+    │   │   ╰── NMDeviceVlan
+    │   ├── NMWimaxNsp
+    │   ├── NMAccessPoint
+    │   ├── NMIP4Config
+    │   ├── NMIP6Config
+    │   ├── NMActiveConnection
+    │   │   ╰── NMVPNConnection
+    │   ├── NMDHCP4Config
+    │   ╰── NMDHCP6Config
+    ├── NMRemoteSettings
+    ├── NMConnection
+    │   ╰── NMRemoteConnection
+    ╰── NMSecretAgent
 

 

 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.20

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/ref-overview.html b/docs/libnm-glib/html/ref-overview.html
index 6dd6954c..ad919bb8 100644
--- a/docs/libnm-glib/html/ref-overview.html
+++ b/docs/libnm-glib/html/ref-overview.html
@@ -2,22 +2,22 @@
 
 
 
-Object Overview
+libnm-glib Reference Manual: Object Overview
 
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
+
+
+
+
+
+
 

 

@@ -42,6 +42,6 @@
 

 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.20

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/right-insensitive.png b/docs/libnm-glib/html/right-insensitive.png
new file mode 100644
index 00000000..4c95785b
Binary files /dev/null and b/docs/libnm-glib/html/right-insensitive.png differ
diff --git a/docs/libnm-glib/html/right.png b/docs/libnm-glib/html/right.png
index 92832e3a..76260ec8 100644
Binary files a/docs/libnm-glib/html/right.png and b/docs/libnm-glib/html/right.png differ
diff --git a/docs/libnm-glib/html/style.css b/docs/libnm-glib/html/style.css
index d6f6c26e..705a5c9a 100644
--- a/docs/libnm-glib/html/style.css
+++ b/docs/libnm-glib/html/style.css
@@ -1,15 +1,23 @@
+body
+{
+  font-family: cantarell, sans-serif;
+}
 .synopsis, .classsynopsis
 {
   /* tango:aluminium 1/2 */
   background: #eeeeec;
-  border: solid 1px #d3d7cf;
+  background: rgba(238, 238, 236, 0.5);
+  border: solid 1px rgb(238, 238, 236);
   padding: 0.5em;
 }
 .programlisting
 {
   /* tango:sky blue 0/1 */
+  /* fallback for no rgba support */
   background: #e6f3ff;
   border: solid 1px #729fcf;
+  background: rgba(114, 159, 207, 0.1);
+  border: solid 1px rgba(114, 159, 207, 0.2);
   padding: 0.5em;
 }
 .variablelist
@@ -27,7 +35,6 @@
   {
     position: relative;
     top: 0em ! important;
-    
   }
   /* this is needed so that the local anchors are displayed below the naviagtion */
   div.footnote a[name], div.refnamediv a[name], div.refsect1 a[name], div.refsect2 a[name], div.index a[name], div.glossary a[name], div.sect1 a[name]
@@ -46,16 +53,20 @@
    */
   body
   {
-    padding-top: 3.2em;
-    padding-bottom: 20em;
+    padding-top: 5em;
+    padding-bottom: 500px;
+    max-width: 60em;
+  }
+  p
+  {
+    max-width: 60em;
   }
   /* style and size the navigation bar */
   table.navigation#top
   {
     position: fixed;
-    /* tango:scarlet red 0/1 */
-    background: #ffe6e6;
-    border: solid 1px #ef2929;
+    background: #e2e2e2;
+    border-bottom: solid 1px #babdb6;
     margin-top: 0;
     margin-bottom: 0;
     top: 0;
@@ -65,21 +76,57 @@
   }
   .navigation a, .navigation a:visited
   {
-    /* tango:scarlet red 3 */
-    color: #a40000;
+    /* tango:sky blue 3 */
+    color: #204a87;
   }
   .navigation a:hover
   {
-    /* tango:scarlet red 1 */
-    color: #ef2929;
+    /* tango:sky blue 2 */
+    color: #3465a4;
   }
   td.shortcuts
   {
-    /* tango:scarlet red 1 */
-    color: #ef2929;
+    /* tango:sky blue 2 */
+    color: #3465a4;
     font-size: 80%;
     white-space: nowrap;
   }
+  td.shortcuts .dim
+  {
+    color: #babdb6;
+  }
+}
+@media screen and (min-width: 60em) {
+  /* screen larger than 60em */
+  body { margin: auto; }
+}
+@media screen and (max-width: 60em) {
+  /* screen less than 60em */
+  #nav_hierarchy { display: none; }
+  #nav_interfaces { display: none; }
+  #nav_prerequisites { display: none; }
+  #nav_derived_interfaces { display: none; }
+  #nav_implementations { display: none; }
+  #nav_child_properties { display: none; }
+  #nav_style_properties { display: none; }
+  #nav_index { display: none; }
+  #nav_glossary { display: none; }
+  .gallery_image { display: none; }
+  .property_flags { display: none; }
+  .signal_flags { display: none; }
+  .parameter_annotations { display: none; }
+  .enum_member_annotations { display: none; }
+  .struct_member_annotations { display: none; }
+  .union_member_annotations { display: none; }
+  /* now that a column is hidden, optimize space */
+  col.parameters_name { width: auto; }
+  col.parameters_description { width: auto; }
+  col.struct_members_name { width: auto; }
+  col.struct_members_description { width: auto; }
+  col.enum_members_name { width: auto; }
+  col.enum_members_description { width: auto; }
+  col.union_members_name { width: auto; }
+  col.union_members_description { width: auto; }
 }
 @media print {
   table.navigation {
@@ -89,9 +136,8 @@
   div.titlepage table.navigation {
     visibility: visible;
     display: table;
-    /* tango:scarlet red 0/1 */
-    background: #ffe6e6;
-    border: solid 1px #ef2929;
+    background: #e2e2e2;
+    border: solid 1px #babdb6;
     margin-top: 0;
     margin-bottom: 0;
     top: 0;
@@ -102,7 +148,7 @@
 
 .navigation .title
 {
-  font-size: 200%;
+  font-size: 120%;
 }
 
 div.gallery-float
@@ -132,6 +178,67 @@ a:hover
   color: #729fcf;
 }
 
+div.informaltable table
+{
+  border-collapse: separate;
+  border-spacing: 20px 3px;
+  border: none;
+}
+
+div.informaltable table td, div.informaltable table th
+{
+  vertical-align: top;
+}
+
+.function_type,
+.variable_type,
+.property_type,
+.signal_type,
+.parameter_name,
+.struct_member_name,
+.union_member_name,
+.define_keyword,
+.datatype_keyword,
+.typedef_keyword
+{
+  text-align: right;
+}
+
+/* dim non-primary columns */
+.c_punctuation,
+.function_type,
+.variable_type,
+.property_type,
+.signal_type,
+.define_keyword,
+.datatype_keyword,
+.typedef_keyword,
+.property_flags,
+.signal_flags,
+.parameter_annotations,
+.enum_member_annotations,
+.struct_member_annotations,
+.union_member_annotations
+{
+  color: #888a85;
+}
+
+.function_type a,
+.function_type a:visited,
+.function_type a:hover,
+.property_type a,
+.property_type a:visited,
+.property_type a:hover,
+.signal_type a,
+.signal_type a:visited,
+.signal_type a:hover,
+.signal_flags a,
+.signal_flags a:visited,
+.signal_flags a:hover
+{
+ color: #729fcf;
+}
+
 div.table table
 {
   border-collapse: collapse;
@@ -154,14 +261,43 @@ div.table table th
   background-color: #d3d7cf;
 }
 
+h4
+{
+  color: #555753;
+}
+
 hr
 {
-  /* tango:aluminium 3 */
-  color: #babdb6;
-  background: #babdb6;
+  /* tango:aluminium 1 */
+  color: #d3d7cf;
+  background: #d3d7cf;
   border: none 0px;
   height: 1px;
   clear: both;
+  margin: 2.0em 0em 2.0em 0em;
+}
+
+dl.toc dt
+{
+  padding-bottom: 0.25em;
+}
+
+dl.toc > dd > dl > dt
+{
+  padding-top: 0.25em;
+  padding-bottom: 0.25em;
+}
+
+dl.toc > dt
+{
+  padding-top: 1em;
+  padding-bottom: 0.5em;
+  font-weight: bold;
+}
+
+.parameter
+{
+  font-style: normal;
 }
 
 .footer
@@ -173,31 +309,70 @@ hr
   font-size: 80%;
 }
 
+.informalfigure,
+.figure
+{
+  margin: 1em;
+}
+
+.informalexample,
+.example
+{
+  margin-top: 1em;
+  margin-bottom: 1em;
+}
+
 .warning
 {
   /* tango:orange 0/1 */
   background: #ffeed9;
+  background: rgba(252, 175, 62, 0.1);
   border-color: #ffb04f;
+  border-color: rgba(252, 175, 62, 0.2);
 }
 .note
 {
   /* tango:chameleon 0/0.5 */
   background: #d8ffb2;
+  background: rgba(138, 226, 52, 0.1);
   border-color: #abf562;
+  border-color: rgba(138, 226, 52, 0.2);
 }
-.note, .warning
+div.blockquote
+{
+  border-color: #eeeeec;
+}
+.note, .warning, div.blockquote
 {
   padding: 0.5em;
   border-width: 1px;
   border-style: solid;
+  margin: 2em;
 }
-.note h3, .warning h3
+.note p, .warning p
 {
-  margin-top: 0.0em
+  margin: 0;
 }
-.note p, .warning p
+
+div.warning h3.title,
+div.note h3.title
 {
-  margin-bottom: 0.0em
+  display: none;
+}
+
+p + div.section
+{
+  margin-top: 1em;
+}
+
+div.refnamediv,
+div.refsynopsisdiv,
+div.refsect1,
+div.refsect2,
+div.toc,
+div.section
+{
+  margin-bottom: 1em;
 }
 
 /* blob links */
@@ -210,11 +385,22 @@ h2 .extralinks, h3 .extralinks
   font-weight: normal;
 }
 
+.lineart
+{
+  color: #d3d7cf;
+  font-weight: normal;
+}
+
 .annotation
 {
   /* tango:aluminium 5 */
   color: #555753;
-  font-size: 80%;
+  font-weight: normal;
+}
+
+.structfield
+{
+  font-style: normal;
   font-weight: normal;
 }
 
@@ -237,6 +423,7 @@ h2 .extralinks, h3 .extralinks
 .listing_frame {
   /* tango:sky blue 1 */
   border: solid 1px #729fcf;
+  border: solid 1px rgba(114, 159, 207, 0.2);
   padding: 0px;
 }
 
@@ -245,20 +432,28 @@ h2 .extralinks, h3 .extralinks
   margin-bottom: 0px;
   padding: 0.5em;
 }
+.listing_lines {
+  /* this just adds visual clutter and
+     takes precious room from small screens */
+  display: none;
+}
 .listing_lines {
   /* tango:sky blue 0.5 */
   background: #a6c5e3;
+  background: rgba(114, 159, 207, 0.2);
   /* tango:aluminium 6 */
   color: #2e3436;
 }
 .listing_code {
   /* tango:sky blue 0 */
   background: #e6f3ff;
+  background: rgba(114, 159, 207, 0.1);
 }
 .listing_code .programlisting {
   /* override from previous */
   border: none 0px;
   padding: 0px;
+  background: none;
 }
 .listing_lines pre, .listing_code pre {
   margin: 0px;
diff --git a/docs/libnm-glib/html/up-insensitive.png b/docs/libnm-glib/html/up-insensitive.png
new file mode 100644
index 00000000..f4049860
Binary files /dev/null and b/docs/libnm-glib/html/up-insensitive.png differ
diff --git a/docs/libnm-glib/html/up.png b/docs/libnm-glib/html/up.png
index 85b3e2a2..80b4b37e 100644
Binary files a/docs/libnm-glib/html/up.png and b/docs/libnm-glib/html/up.png differ
diff --git a/docs/libnm-glib/libnm-glib-docs.xml b/docs/libnm-glib/libnm-glib-docs.xml
index aa3c6332..77863aec 100644
--- a/docs/libnm-glib/libnm-glib-docs.xml
+++ b/docs/libnm-glib/libnm-glib-docs.xml
@@ -10,11 +10,11 @@
     
       for libnm-glib &version;
       The latest version of this documentation can be found on-line at
-      http://projects.gnome.org/NetworkManager/developers/libnm-glib/09/.
+      https://developer.gnome.org/libnm-glib/0.9/.
     
 
     
-      2012
+      2012-2013
       The NetworkManager Authors
     
 
diff --git a/docs/libnm-glib/libnm-glib-sections.txt b/docs/libnm-glib/libnm-glib-sections.txt
index ea71d9d2..60e744d7 100644
--- a/docs/libnm-glib/libnm-glib-sections.txt
+++ b/docs/libnm-glib/libnm-glib-sections.txt
@@ -11,8 +11,6 @@ NM_ACCESS_POINT_MODE
 NM_ACCESS_POINT_MAX_BITRATE
 NM_ACCESS_POINT_STRENGTH
 NM_ACCESS_POINT_HW_ADDRESS
-NMAccessPoint
-NMAccessPointClass
 nm_access_point_new
 nm_access_point_get_flags
 nm_access_point_get_wpa_flags
@@ -27,6 +25,8 @@ nm_access_point_filter_connections
 nm_access_point_connection_valid
 nm_access_point_get_hw_address
 
+NMAccessPoint
+NMAccessPointClass
 NM_ACCESS_POINT
 NM_ACCESS_POINT_CLASS
 NM_ACCESS_POINT_GET_CLASS
@@ -47,8 +47,6 @@ NM_ACTIVE_CONNECTION_STATE
 NM_ACTIVE_CONNECTION_DEFAULT
 NM_ACTIVE_CONNECTION_DEFAULT6
 NM_ACTIVE_CONNECTION_MASTER
-NMActiveConnection
-NMActiveConnectionClass
 nm_active_connection_new
 nm_active_connection_get_connection
 nm_active_connection_get_uuid
@@ -59,6 +57,8 @@ nm_active_connection_get_default
 nm_active_connection_get_default6
 nm_active_connection_get_master
 
+NMActiveConnection
+NMActiveConnectionClass
 NM_ACTIVE_CONNECTION
 NM_ACTIVE_CONNECTION_CLASS
 NM_ACTIVE_CONNECTION_GET_CLASS
@@ -87,8 +87,6 @@ NM_CLIENT_PRIMARY_CONNECTION
 NM_CLIENT_ACTIVATING_CONNECTION
 NMClientPermission
 NMClientPermissionResult
-NMClient
-NMClientClass
 nm_client_new
 nm_client_new_async
 nm_client_new_finish
@@ -126,6 +124,8 @@ nm_client_check_connectivity_finish
 nm_client_get_primary_connection
 nm_client_get_activating_connection
 
+NMClient
+NMClientClass
 NM_CLIENT
 NM_CLIENT_CLASS
 NM_CLIENT_GET_CLASS
@@ -159,8 +159,6 @@ NM_DEVICE_ACTIVE_CONNECTION
 NM_DEVICE_AVAILABLE_CONNECTIONS
 NM_DEVICE_VENDOR
 NM_DEVICE_PRODUCT
-NMDevice
-NMDeviceClass
 nm_device_new
 nm_device_get_iface
 nm_device_get_ip_iface
@@ -190,6 +188,8 @@ nm_device_filter_connections
 nm_device_connection_valid
 nm_device_connection_compatible
 
+NMDevice
+NMDeviceClass
 NM_DEVICE
 NM_DEVICE_CLASS
 NM_DEVICE_GET_CLASS
@@ -206,11 +206,11 @@ NMDeviceAdslError
 NM_DEVICE_ADSL_ERROR
 nm_device_adsl_error_quark
 NM_DEVICE_ADSL_CARRIER
-NMDeviceAdsl
-NMDeviceAdslClass
 nm_device_adsl_new
 nm_device_adsl_get_carrier
 
+NMDeviceAdsl
+NMDeviceAdslClass
 NM_DEVICE_ADSL
 NM_DEVICE_ADSL_CLASS
 NM_DEVICE_ADSL_GET_CLASS
@@ -229,13 +229,13 @@ nm_device_bond_error_quark
 NM_DEVICE_BOND_HW_ADDRESS
 NM_DEVICE_BOND_CARRIER
 NM_DEVICE_BOND_SLAVES
-NMDeviceBond
-NMDeviceBondClass
 nm_device_bond_new
 nm_device_bond_get_hw_address
 nm_device_bond_get_carrier
 nm_device_bond_get_slaves
 
+NMDeviceBond
+NMDeviceBondClass
 NM_DEVICE_BOND
 NM_DEVICE_BOND_CLASS
 NM_DEVICE_BOND_GET_CLASS
@@ -254,13 +254,13 @@ nm_device_bridge_error_quark
 NM_DEVICE_BRIDGE_HW_ADDRESS
 NM_DEVICE_BRIDGE_CARRIER
 NM_DEVICE_BRIDGE_SLAVES
-NMDeviceBridge
-NMDeviceBridgeClass
 nm_device_bridge_new
 nm_device_bridge_get_hw_address
 nm_device_bridge_get_carrier
 nm_device_bridge_get_slaves
 
+NMDeviceBridge
+NMDeviceBridgeClass
 NM_DEVICE_BRIDGE
 NM_DEVICE_BRIDGE_CLASS
 NM_DEVICE_BRIDGE_GET_CLASS
@@ -279,13 +279,13 @@ nm_device_bt_error_quark
 NM_DEVICE_BT_HW_ADDRESS
 NM_DEVICE_BT_NAME
 NM_DEVICE_BT_CAPABILITIES
-NMDeviceBt
-NMDeviceBtClass
 nm_device_bt_new
 nm_device_bt_get_hw_address
 nm_device_bt_get_name
 nm_device_bt_get_capabilities
 
+NMDeviceBt
+NMDeviceBtClass
 NM_DEVICE_BT
 NM_DEVICE_BT_CLASS
 NM_DEVICE_BT_GET_CLASS
@@ -305,14 +305,14 @@ NM_DEVICE_ETHERNET_HW_ADDRESS
 NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS
 NM_DEVICE_ETHERNET_SPEED
 NM_DEVICE_ETHERNET_CARRIER
-NMDeviceEthernet
-NMDeviceEthernetClass
 nm_device_ethernet_new
 nm_device_ethernet_get_hw_address
 nm_device_ethernet_get_permanent_hw_address
 nm_device_ethernet_get_speed
 nm_device_ethernet_get_carrier
 
+NMDeviceEthernet
+NMDeviceEthernetClass
 NM_DEVICE_ETHERNET
 NM_DEVICE_ETHERNET_CLASS
 NM_DEVICE_ETHERNET_GET_CLASS
@@ -330,12 +330,12 @@ NM_DEVICE_INFINIBAND_ERROR
 nm_device_infiniband_error_quark
 NM_DEVICE_INFINIBAND_HW_ADDRESS
 NM_DEVICE_INFINIBAND_CARRIER
-NMDeviceInfiniband
-NMDeviceInfinibandClass
 nm_device_infiniband_new
 nm_device_infiniband_get_hw_address
 nm_device_infiniband_get_carrier
 
+NMDeviceInfiniband
+NMDeviceInfinibandClass
 NM_DEVICE_INFINIBAND
 NM_DEVICE_INFINIBAND_CLASS
 NM_DEVICE_INFINIBAND_GET_CLASS
@@ -353,11 +353,11 @@ NM_DEVICE_MODEM_ERROR
 nm_device_modem_error_quark
 NM_DEVICE_MODEM_MODEM_CAPABILITIES
 NM_DEVICE_MODEM_CURRENT_CAPABILITIES
-NMDeviceModem
-NMDeviceModemClass
 nm_device_modem_get_modem_capabilities
 nm_device_modem_get_current_capabilities
 
+NMDeviceModem
+NMDeviceModemClass
 NM_DEVICE_MODEM
 NM_DEVICE_MODEM_CLASS
 NM_DEVICE_MODEM_GET_CLASS
@@ -376,13 +376,13 @@ nm_device_olpc_mesh_error_quark
 NM_DEVICE_OLPC_MESH_HW_ADDRESS
 NM_DEVICE_OLPC_MESH_COMPANION
 NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL
-NMDeviceOlpcMesh
-NMDeviceOlpcMeshClass
 nm_device_olpc_mesh_new
 nm_device_olpc_mesh_get_hw_address
 nm_device_olpc_mesh_get_companion
 nm_device_olpc_mesh_get_active_channel
 
+NMDeviceOlpcMesh
+NMDeviceOlpcMeshClass
 NM_DEVICE_OLPC_MESH
 NM_DEVICE_OLPC_MESH_CLASS
 NM_DEVICE_OLPC_MESH_GET_CLASS
@@ -401,13 +401,13 @@ nm_device_vlan_error_quark
 NM_DEVICE_VLAN_HW_ADDRESS
 NM_DEVICE_VLAN_CARRIER
 NM_DEVICE_VLAN_VLAN_ID
-NMDeviceVlan
-NMDeviceVlanClass
 nm_device_vlan_new
 nm_device_vlan_get_hw_address
 nm_device_vlan_get_carrier
 nm_device_vlan_get_vlan_id
 
+NMDeviceVlan
+NMDeviceVlanClass
 NM_DEVICE_VLAN
 NM_DEVICE_VLAN_CLASS
 NM_DEVICE_VLAN_GET_CLASS
@@ -429,8 +429,6 @@ NM_DEVICE_WIFI_MODE
 NM_DEVICE_WIFI_BITRATE
 NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT
 NM_DEVICE_WIFI_CAPABILITIES
-NMDeviceWifi
-NMDeviceWifiClass
 nm_device_wifi_new
 nm_device_wifi_get_hw_address
 nm_device_wifi_get_permanent_hw_address
@@ -443,6 +441,8 @@ nm_device_wifi_get_access_points
 NMDeviceWifiRequestScanFn
 nm_device_wifi_request_scan_simple
 
+NMDeviceWifi
+NMDeviceWifiClass
 NM_DEVICE_WIFI
 NM_DEVICE_WIFI_CLASS
 NM_DEVICE_WIFI_GET_CLASS
@@ -465,8 +465,6 @@ NM_DEVICE_WIMAX_RSSI
 NM_DEVICE_WIMAX_CINR
 NM_DEVICE_WIMAX_TX_POWER
 NM_DEVICE_WIMAX_BSID
-NMDeviceWimax
-NMDeviceWimaxClass
 nm_device_wimax_new
 nm_device_wimax_get_hw_address
 nm_device_wimax_get_active_nsp
@@ -478,6 +476,8 @@ nm_device_wimax_get_cinr
 nm_device_wimax_get_tx_power
 nm_device_wimax_get_bsid
 
+NMDeviceWimax
+NMDeviceWimaxClass
 NM_DEVICE_WIMAX
 NM_DEVICE_WIMAX_CLASS
 NM_DEVICE_WIMAX_GET_CLASS
@@ -490,13 +490,13 @@ nm_device_wimax_get_type
 

 nm-dhcp4-config
 NMDHCP4Config
-NMDHCP4Config
-NMDHCP4ConfigClass
 NM_DHCP4_CONFIG_OPTIONS
 nm_dhcp4_config_new
 nm_dhcp4_config_get_options
 nm_dhcp4_config_get_one_option
 
+NMDHCP4Config
+NMDHCP4ConfigClass
 NM_DHCP4_CONFIG
 NM_DHCP4_CONFIG_CLASS
 NM_IS_DHCP4_CONFIG
@@ -508,13 +508,13 @@ nm_dhcp4_config_get_type
 

 nm-dhcp6-config
 NMDHCP6Config
-NMDHCP6Config
-NMDHCP6ConfigClass
 NM_DHCP6_CONFIG_OPTIONS
 nm_dhcp6_config_new
 nm_dhcp6_config_get_options
 nm_dhcp6_config_get_one_option
 
+NMDHCP6Config
+NMDHCP6ConfigClass
 NM_DHCP6_CONFIG
 NM_DHCP6_CONFIG_CLASS
 NM_IS_DHCP6_CONFIG
@@ -567,8 +567,6 @@ nm_wimax_nsp_network_type_get_type
 

 nm-ip4-config
 NMIP4Config
-NMIP4Config
-NMIP4ConfigClass
 NM_IP4_CONFIG_ADDRESSES
 NM_IP4_CONFIG_NAMESERVERS
 NM_IP4_CONFIG_DOMAINS
@@ -581,6 +579,8 @@ nm_ip4_config_get_domains
 nm_ip4_config_get_routes
 nm_ip4_config_get_wins_servers
 
+NMIP4Config
+NMIP4ConfigClass
 NM_IP4_CONFIG
 NM_IP4_CONFIG_CLASS
 NM_IP4_CONFIG_GET_CLASS
@@ -593,8 +593,6 @@ nm_ip4_config_get_type
 

 nm-ip6-config
 NMIP6Config
-NMIP6Config
-NMIP6ConfigClass
 NM_IP6_CONFIG_ADDRESSES
 NM_IP6_CONFIG_NAMESERVERS
 NM_IP6_CONFIG_DOMAINS
@@ -605,6 +603,8 @@ nm_ip6_config_get_nameservers
 nm_ip6_config_get_domains
 nm_ip6_config_get_routes
 
+NMIP6Config
+NMIP6ConfigClass
 NM_IP6_CONFIG
 NM_IP6_CONFIG_CLASS
 NM_IP6_CONFIG_GET_CLASS
@@ -622,11 +622,11 @@ NM_OBJECT_ERROR
 nm_object_error_quark
 NM_OBJECT_DBUS_CONNECTION
 NM_OBJECT_DBUS_PATH
-NMObject
-NMObjectClass
 nm_object_get_connection
 nm_object_get_path
 
+NMObject
+NMObjectClass
 NM_IS_OBJECT
 NM_IS_OBJECT_CLASS
 NM_OBJECT
@@ -641,8 +641,6 @@ nm_object_get_type
 NMRemoteConnection
 NM_REMOTE_CONNECTION_UPDATED
 NM_REMOTE_CONNECTION_REMOVED
-NMRemoteConnection
-NMRemoteConnectionClass
 NMRemoteConnectionCommitFunc
 NMRemoteConnectionDeleteFunc
 NMRemoteConnectionGetSecretsFunc
@@ -651,6 +649,8 @@ nm_remote_connection_commit_changes
 nm_remote_connection_delete
 nm_remote_connection_get_secrets
 
+NMRemoteConnection
+NMRemoteConnectionClass
 NM_IS_REMOTE_CONNECTION
 NM_IS_REMOTE_CONNECTION_CLASS
 NM_REMOTE_CONNECTION
@@ -674,8 +674,6 @@ NM_REMOTE_SETTINGS_NEW_CONNECTION
 NM_REMOTE_SETTINGS_CONNECTIONS_READ
 NMRemoteSettingsAddConnectionFunc
 NMRemoteSettingsSaveHostnameFunc
-NMRemoteSettings
-NMRemoteSettingsClass
 nm_remote_settings_new
 nm_remote_settings_new_async
 nm_remote_settings_new_finish
@@ -685,6 +683,8 @@ nm_remote_settings_get_connection_by_uuid
 nm_remote_settings_add_connection
 nm_remote_settings_save_hostname
 
+NMRemoteSettings
+NMRemoteSettingsClass
 NM_IS_REMOTE_SETTINGS
 NM_IS_REMOTE_SETTINGS_CLASS
 NM_REMOTE_SETTINGS
@@ -705,11 +705,9 @@ NM_SECRET_AGENT_IDENTIFIER
 NM_SECRET_AGENT_AUTO_REGISTER
 NM_SECRET_AGENT_REGISTERED
 NM_SECRET_AGENT_REGISTRATION_RESULT
-NMSecretAgent
 NMSecretAgentGetSecretsFunc
 NMSecretAgentSaveSecretsFunc
 NMSecretAgentDeleteSecretsFunc
-NMSecretAgentClass
 nm_secret_agent_register
 nm_secret_agent_unregister
 nm_secret_agent_get_registered
@@ -717,6 +715,8 @@ nm_secret_agent_get_secrets
 nm_secret_agent_save_secrets
 nm_secret_agent_delete_secrets
 
+NMSecretAgent
+NMSecretAgentClass
 NM_IS_SECRET_AGENT
 NM_IS_SECRET_AGENT_CLASS
 NM_SECRET_AGENT
@@ -750,12 +750,12 @@ nm_uint_array_get_type
 NMVPNConnection
 NM_VPN_CONNECTION_VPN_STATE
 NM_VPN_CONNECTION_BANNER
-NMVPNConnection
-NMVPNConnectionClass
 nm_vpn_connection_new
 nm_vpn_connection_get_vpn_state
 nm_vpn_connection_get_banner
 
+NMVPNConnection
+NMVPNConnectionClass
 NM_IS_VPN_CONNECTION
 NM_IS_VPN_CONNECTION_CLASS
 NM_TYPE_VPN_CONNECTION
@@ -782,8 +782,6 @@ nm_vpn_plugin_ui_interface_prop_get_type
 NM_VPN_PLUGIN_DBUS_SERVICE_NAME
 NM_VPN_PLUGIN_STATE
 NMVPNPluginError
-NMVPNPlugin
-NMVPNPluginClass
 nm_vpn_plugin_error_quark
 nm_vpn_plugin_get_connection
 nm_vpn_plugin_get_state
@@ -795,6 +793,8 @@ nm_vpn_plugin_set_ip4_config
 nm_vpn_plugin_set_ip6_config
 nm_vpn_plugin_disconnect
 
+NMVPNPlugin
+NMVPNPluginClass
 NM_IS_VPN_PLUGIN
 NM_IS_VPN_PLUGIN_CLASS
 NM_TYPE_VPN_PLUGIN
@@ -809,7 +809,6 @@ nm_vpn_plugin_get_type
 

 nm-vpn-plugin-ui-interface
 NMVpnPluginUiWidget
-NMVpnPluginUi
 NMVpnPluginUiFactory
 nm_vpn_plugin_ui_factory
 NMVpnPluginUiCapability
@@ -817,18 +816,18 @@ NM_VPN_PLUGIN_UI_INTERFACE_NAME
 NM_VPN_PLUGIN_UI_INTERFACE_DESC
 NM_VPN_PLUGIN_UI_INTERFACE_SERVICE
 NMVpnPluginUiInterfaceProp
-NMVpnPluginUiInterface
 nm_vpn_plugin_ui_interface_ui_factory
 nm_vpn_plugin_ui_interface_get_capabilities
 nm_vpn_plugin_ui_interface_import
 nm_vpn_plugin_ui_interface_export
 nm_vpn_plugin_ui_interface_get_suggested_name
 nm_vpn_plugin_ui_interface_delete_connection
-NMVpnPluginUiWidgetInterface
 nm_vpn_plugin_ui_widget_interface_get_widget
 nm_vpn_plugin_ui_widget_interface_update_connection
 nm_vpn_plugin_ui_widget_interface_save_secrets
 
+NMVpnPluginUiInterface
+NMVpnPluginUiWidgetInterface
 NM_IS_VPN_PLUGIN_UI_INTERFACE
 NM_IS_VPN_PLUGIN_UI_WIDGET_INTERFACE
 NM_TYPE_VPN_PLUGIN_UI_INTERFACE
@@ -854,8 +853,6 @@ NM_WIMAX_NSP_NAME
 NM_WIMAX_NSP_SIGNAL_QUALITY
 NM_WIMAX_NSP_NETWORK_TYPE
 NMWimaxNspNetworkType
-NMWimaxNsp
-NMWimaxNspClass
 nm_wimax_nsp_new
 nm_wimax_nsp_get_name
 nm_wimax_nsp_get_signal_quality
@@ -863,6 +860,8 @@ nm_wimax_nsp_get_network_type
 nm_wimax_nsp_filter_connections
 nm_wimax_nsp_connection_valid
 
+NMWimaxNsp
+NMWimaxNspClass
 NM_IS_WIMAX_NSP
 NM_IS_WIMAX_NSP_CLASS
 NM_TYPE_WIMAX_NSP
diff --git a/docs/libnm-glib/tmpl/nm-access-point.sgml b/docs/libnm-glib/tmpl/nm-access-point.sgml
index ad78146c..2a2ecb1c 100644
--- a/docs/libnm-glib/tmpl/nm-access-point.sgml
+++ b/docs/libnm-glib/tmpl/nm-access-point.sgml
@@ -92,75 +92,6 @@ NMAccessPoint
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-active-connection.sgml b/docs/libnm-glib/tmpl/nm-active-connection.sgml
index 56f51c6e..a7257528 100644
--- a/docs/libnm-glib/tmpl/nm-active-connection.sgml
+++ b/docs/libnm-glib/tmpl/nm-active-connection.sgml
@@ -78,65 +78,6 @@ NMActiveConnection
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-client.sgml b/docs/libnm-glib/tmpl/nm-client.sgml
index 2c439d61..ee1377d9 100644
--- a/docs/libnm-glib/tmpl/nm-client.sgml
+++ b/docs/libnm-glib/tmpl/nm-client.sgml
@@ -149,123 +149,6 @@ NMClient
 @NM_CLIENT_PERMISSION_RESULT_AUTH: 
 @NM_CLIENT_PERMISSION_RESULT_NO: 
 
-
-
-
-
-
-
-
-
-
-
-
-@nmclient: the object which received the signal.
-@arg1: 
-
-
-
-
-
-
-@nmclient: the object which received the signal.
-@arg1: 
-
-
-
-
-
-
-@nmclient: the object which received the signal.
-@arg1: 
-@arg2: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@device_added: 
-@device_removed: 
-@permission_changed: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-adsl.sgml b/docs/libnm-glib/tmpl/nm-device-adsl.sgml
index 111cf8a6..1c7e14c2 100644
--- a/docs/libnm-glib/tmpl/nm-device-adsl.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-adsl.sgml
@@ -54,30 +54,6 @@ NMDeviceAdsl
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-bond.sgml b/docs/libnm-glib/tmpl/nm-device-bond.sgml
index cc85389d..3270d995 100644
--- a/docs/libnm-glib/tmpl/nm-device-bond.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-bond.sgml
@@ -69,40 +69,6 @@ NMDeviceBond
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-bridge.sgml b/docs/libnm-glib/tmpl/nm-device-bridge.sgml
index 3570bae3..65094577 100644
--- a/docs/libnm-glib/tmpl/nm-device-bridge.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-bridge.sgml
@@ -69,40 +69,6 @@ NMDeviceBridge
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-bt.sgml b/docs/libnm-glib/tmpl/nm-device-bt.sgml
index 404ec888..44a6f692 100644
--- a/docs/libnm-glib/tmpl/nm-device-bt.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-bt.sgml
@@ -71,40 +71,6 @@ NMDeviceBt
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-ethernet.sgml b/docs/libnm-glib/tmpl/nm-device-ethernet.sgml
index a3771275..4d97c189 100644
--- a/docs/libnm-glib/tmpl/nm-device-ethernet.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-ethernet.sgml
@@ -77,45 +77,6 @@ NMDeviceEthernet
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-infiniband.sgml b/docs/libnm-glib/tmpl/nm-device-infiniband.sgml
index f50d415f..73a3f3c4 100644
--- a/docs/libnm-glib/tmpl/nm-device-infiniband.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-infiniband.sgml
@@ -63,35 +63,6 @@ NMDeviceInfiniband
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-modem.sgml b/docs/libnm-glib/tmpl/nm-device-modem.sgml
index 4e1cc83a..007c3b42 100644
--- a/docs/libnm-glib/tmpl/nm-device-modem.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-modem.sgml
@@ -62,35 +62,6 @@ NMDeviceModem
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml b/docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml
index fb78ba35..c8cccb2f 100644
--- a/docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml
@@ -68,40 +68,6 @@ NMDeviceOlpcMesh
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-vlan.sgml b/docs/libnm-glib/tmpl/nm-device-vlan.sgml
index 3ac5830f..68534f55 100644
--- a/docs/libnm-glib/tmpl/nm-device-vlan.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-vlan.sgml
@@ -70,40 +70,6 @@ NMDeviceVlan
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-wifi.sgml b/docs/libnm-glib/tmpl/nm-device-wifi.sgml
index 094344b8..50df1021 100644
--- a/docs/libnm-glib/tmpl/nm-device-wifi.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-wifi.sgml
@@ -93,73 +93,6 @@ NMDeviceWifi
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-@nmdevicewifi: the object which received the signal.
-@arg1: 
-
-
-
-
-
-
-@nmdevicewifi: the object which received the signal.
-@arg1: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@access_point_added: 
-@access_point_removed: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-wimax.sgml b/docs/libnm-glib/tmpl/nm-device-wimax.sgml
index 23d89281..cc0c8c8e 100644
--- a/docs/libnm-glib/tmpl/nm-device-wimax.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-wimax.sgml
@@ -98,72 +98,6 @@ NMDeviceWimax
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-@nmdevicewimax: the object which received the signal.
-@arg1: 
-
-
-
-
-
-
-@nmdevicewimax: the object which received the signal.
-@arg1: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@nsp_added: 
-@nsp_removed: 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device.sgml b/docs/libnm-glib/tmpl/nm-device.sgml
index 7d783dc0..1efb5ace 100644
--- a/docs/libnm-glib/tmpl/nm-device.sgml
+++ b/docs/libnm-glib/tmpl/nm-device.sgml
@@ -169,142 +169,6 @@ NMDevice
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-@nmdevice: the object which received the signal.
-@arg1: 
-@arg2: 
-@arg3: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@state_changed: 
-@connection_compatible: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml b/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml
index 35a6e306..4f3d8602 100644
--- a/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml
+++ b/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml
@@ -22,30 +22,6 @@ NMDHCP4Config
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml b/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml
index 3e00467c..7679b7d9 100644
--- a/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml
+++ b/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml
@@ -22,30 +22,6 @@ NMDHCP6Config
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-ip4-config.sgml b/docs/libnm-glib/tmpl/nm-ip4-config.sgml
index 08b6bcbd..996b3178 100644
--- a/docs/libnm-glib/tmpl/nm-ip4-config.sgml
+++ b/docs/libnm-glib/tmpl/nm-ip4-config.sgml
@@ -22,50 +22,6 @@ NMIP4Config
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-ip6-config.sgml b/docs/libnm-glib/tmpl/nm-ip6-config.sgml
index a9c44abd..c65bd18d 100644
--- a/docs/libnm-glib/tmpl/nm-ip6-config.sgml
+++ b/docs/libnm-glib/tmpl/nm-ip6-config.sgml
@@ -22,45 +22,6 @@ NMIP6Config
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-object.sgml b/docs/libnm-glib/tmpl/nm-object.sgml
index bb17ec37..7d99e2c0 100644
--- a/docs/libnm-glib/tmpl/nm-object.sgml
+++ b/docs/libnm-glib/tmpl/nm-object.sgml
@@ -60,45 +60,6 @@ NMObject
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-@nmobject: the object which received the signal.
-@arg1: 
-@arg2: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@object_creation_failed: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-remote-connection.sgml b/docs/libnm-glib/tmpl/nm-remote-connection.sgml
index e8314074..c0017833 100644
--- a/docs/libnm-glib/tmpl/nm-remote-connection.sgml
+++ b/docs/libnm-glib/tmpl/nm-remote-connection.sgml
@@ -36,64 +36,6 @@ NMRemoteConnection
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-@nmremoteconnection: the object which received the signal.
-
-
-
-
-
-
-@nmremoteconnection: the object which received the signal.
-
-
-
-
-
-
-@nmremoteconnection: the object which received the signal.
-@arg1: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent_class: 
-@updated: 
-@removed: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-remote-settings.sgml b/docs/libnm-glib/tmpl/nm-remote-settings.sgml
index 6471c98c..2f0ff5c8 100644
--- a/docs/libnm-glib/tmpl/nm-remote-settings.sgml
+++ b/docs/libnm-glib/tmpl/nm-remote-settings.sgml
@@ -110,62 +110,6 @@ NMRemoteSettings
 @user_data: 
 
 
-
-
-
-
-
-
-
-
-
-
-
-@nmremotesettings: the object which received the signal.
-
-
-
-
-
-
-@nmremotesettings: the object which received the signal.
-@arg1: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@new_connection: 
-@connections_read: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-secret-agent.sgml b/docs/libnm-glib/tmpl/nm-secret-agent.sgml
index 68a5f3a1..eb37ab5c 100644
--- a/docs/libnm-glib/tmpl/nm-secret-agent.sgml
+++ b/docs/libnm-glib/tmpl/nm-secret-agent.sgml
@@ -88,35 +88,6 @@ NMSecretAgent
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-@nmsecretagent: the object which received the signal.
-@arg1: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 
@@ -151,24 +122,6 @@ NMSecretAgent
 @user_data: 
 
 
-
-
-
-
-
-@parent: 
-@get_secrets: 
-@cancel_get_secrets: 
-@save_secrets: 
-@delete_secrets: 
-@registration_result: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-vpn-connection.sgml b/docs/libnm-glib/tmpl/nm-vpn-connection.sgml
index c20f145d..39d5ecc1 100644
--- a/docs/libnm-glib/tmpl/nm-vpn-connection.sgml
+++ b/docs/libnm-glib/tmpl/nm-vpn-connection.sgml
@@ -36,45 +36,6 @@ NMVPNConnection
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-@nmvpnconnection: the object which received the signal.
-@arg1: 
-@arg2: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@vpn_state_changed: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml b/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml
index f38e277d..4aae6d51 100644
--- a/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml
+++ b/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml
@@ -1,5 +1,5 @@
 
-NMVpnPluginUi
+NMVpnPluginUiWidget
 
 
 
@@ -80,25 +80,6 @@ NMVpnPluginUi
 @NM_VPN_PLUGIN_UI_INTERFACE_PROP_DESC: 
 @NM_VPN_PLUGIN_UI_INTERFACE_PROP_SERVICE: 
 
-
-
-
-
-
-@g_iface: 
-@ui_factory: 
-@get_capabilities: 
-@import_from_file: 
-@export_to_file: 
-@get_suggested_name: 
-@delete_connection: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
 
 
 
@@ -163,17 +144,6 @@ NMVpnPluginUi
 @Returns: 
 
 
-
-
-
-
-
-@g_iface: 
-@get_widget: 
-@update_connection: 
-@save_secrets: 
-@changed: 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml b/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml
index 8c738c54..2c0fd8ee 100644
--- a/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml
+++ b/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml
@@ -51,34 +51,6 @@ NMVPNPlugin
 @NM_VPN_PLUGIN_ERROR_LAUNCH_FAILED: 
 @NM_VPN_PLUGIN_ERROR_CONNECTION_INVALID: 
 
-
-
-
-
-
-@parent: 
-
-
-
-
-
-
-@parent: 
-@connect: 
-@need_secrets: 
-@disconnect: 
-@state_changed: 
-@ip4_config: 
-@login_banner: 
-@failure: 
-@quit: 
-@config: 
-@ip6_config: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-wimax-nsp.sgml b/docs/libnm-glib/tmpl/nm-wimax-nsp.sgml
index f270a1d2..8add56d4 100644
--- a/docs/libnm-glib/tmpl/nm-wimax-nsp.sgml
+++ b/docs/libnm-glib/tmpl/nm-wimax-nsp.sgml
@@ -53,40 +53,6 @@ NMWimaxNsp
 @NM_WIMAX_NSP_NETWORK_TYPE_PARTNER: 
 @NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER: 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
 
 
 
diff --git a/docs/libnm-glib/version.xml b/docs/libnm-glib/version.xml
index fe98bd59..dd62f24f 100644
--- a/docs/libnm-glib/version.xml
+++ b/docs/libnm-glib/version.xml
@@ -1 +1 @@
-0.9.8.8
+0.9.8.10
diff --git a/docs/libnm-util/Makefile.in b/docs/libnm-util/Makefile.in
index 68627afb..ded02ca9 100644
--- a/docs/libnm-util/Makefile.in
+++ b/docs/libnm-util/Makefile.in
@@ -158,6 +158,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -180,6 +181,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -462,12 +464,12 @@ REPORT_FILES = \
 	$(DOC_MODULE)-unused.txt
 
 CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) \
-	libnm-util-sections.txt libnm-util-overrides.txt html/* tmpl/* \
-	xml/*
-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = 
-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp
-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = 
-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp
+	gtkdoc-check.test libnm-util-sections.txt \
+	libnm-util-overrides.txt html/* tmpl/* xml/*
+@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = 
+@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp
+@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = 
+@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp
 
 #### setup ####
 GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_$(V))
@@ -588,6 +590,7 @@ distdir: $(DISTFILES)
 	  dist-hook
 check-am: all-am
 check: check-am
+@ENABLE_GTK_DOC_FALSE@all-local:
 all-am: Makefile all-local
 installdirs:
 install: install-am
@@ -705,8 +708,15 @@ uninstall-am: uninstall-local
 	uninstall-am uninstall-local
 
 
-@ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
-@ENABLE_GTK_DOC_FALSE@all-local:
+gtkdoc-check.test: Makefile
+	$(AM_V_GEN)echo "#!/bin/sh -e" > $@; \
+		echo "$(GTKDOC_CHECK_PATH) || exit 1" >> $@; \
+		chmod +x $@
+
+all-gtk-doc: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
+.PHONY: all-gtk-doc
+
+@ENABLE_GTK_DOC_TRUE@all-local: all-gtk-doc
 
 docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
 
@@ -717,17 +727,19 @@ setup-build.stamp:
 	    files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
 	    if test "x$$files" != "x" ; then \
 	        for file in $$files ; do \
+	            destdir=`dirname $(abs_builddir)/$$file` ;\
+	            test -d "$$destdir" || mkdir -p "$$destdir"; \
 	            test -f $(abs_srcdir)/$$file && \
-	                cp -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
+	                cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
 	        done; \
 	    fi; \
 	    test -d $(abs_srcdir)/tmpl && \
-	        { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \
+	        { cp -pR $(abs_srcdir)/tmpl $(abs_builddir)/; \
 	        chmod -R u+w $(abs_builddir)/tmpl; } \
 	fi
 	$(AM_V_at)touch setup-build.stamp
 
-scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
+scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
 	$(GTK_DOC_V_SCAN)_source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
@@ -757,7 +769,7 @@ tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DO
 	$(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
 	$(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
 	  if test -w $(abs_srcdir) ; then \
-	    cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \
+	    cp -pR $(abs_builddir)/tmpl $(abs_srcdir)/; \
 	  fi \
 	fi
 	$(AM_V_at)touch tmpl-build.stamp
@@ -769,7 +781,7 @@ $(srcdir)/tmpl/*.sgml:
 	@true
 
 sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
-	$(GTK_DOC_V_XML)-chmod -R u+w $(srcdir) && _source_dir='' ; \
+	-$(GTK_DOC_V_XML)chmod -R u+w $(srcdir) && _source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
 	done ; \
@@ -831,6 +843,9 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 clean-local:
 	@rm -f *~ *.bak
 	@rm -rf .libs
+	@if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \
+	  rm -f $(DOC_MODULE).types; \
+	fi
 
 distclean-local:
 	@rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
@@ -876,12 +891,14 @@ uninstall-local:
 #
 # Require gtk-doc when making dist
 #
-@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: docs
-@ENABLE_GTK_DOC_FALSE@dist-check-gtkdoc:
-@ENABLE_GTK_DOC_FALSE@	@echo "*** gtk-doc must be installed and enabled in order to make dist"
-@ENABLE_GTK_DOC_FALSE@	@false
-
-dist-hook: dist-check-gtkdoc dist-hook-local
+@HAVE_GTK_DOC_TRUE@dist-check-gtkdoc: docs
+@HAVE_GTK_DOC_FALSE@dist-check-gtkdoc:
+@HAVE_GTK_DOC_FALSE@	@echo "*** gtk-doc is needed to run 'make dist'.         ***"
+@HAVE_GTK_DOC_FALSE@	@echo "*** gtk-doc was not found when 'configure' ran.   ***"
+@HAVE_GTK_DOC_FALSE@	@echo "*** please install gtk-doc and rerun 'configure'. ***"
+@HAVE_GTK_DOC_FALSE@	@false
+
+dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local
 	@mkdir $(distdir)/tmpl
 	@mkdir $(distdir)/html
 	@-cp ./tmpl/*.sgml $(distdir)/tmpl
diff --git a/docs/libnm-util/html/NMConnection.html b/docs/libnm-util/html/NMConnection.html
index 7c3d81b0..d764706a 100644
--- a/docs/libnm-util/html/NMConnection.html
+++ b/docs/libnm-util/html/NMConnection.html
@@ -2,36 +2,29 @@
 
 
 
-NMConnection
+libnm-util Reference Manual: NMConnection
 
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
 

 

 

@@ -39,611 +32,910 @@
 
NMConnection
NMConnection — Describes a connection to specific network or provider

-
+

 
 
 

-

-
Synopsis

-
-#include <nm-connection.h>
-
-enum                NMConnectionError;
-#define             NM_CONNECTION_ERROR
-GQuark              nm_connection_error_quark           (void);
-#define             NM_CONNECTION_PATH
-                    NMConnection;
-                    NMConnectionClass;
-NMConnection *      nm_connection_new                   (void);
-NMConnection *      nm_connection_new_from_hash         (GHashTable *hash,
-                                                         GError **error);
-NMConnection *      nm_connection_duplicate             (NMConnection *connection);
-NMSetting *         nm_connection_create_setting        (const char *name);
-void                nm_connection_add_setting           (NMConnection *connection,
-                                                         NMSetting *setting);
-void                nm_connection_remove_setting        (NMConnection *connection,
-                                                         GType setting_type);
-NMSetting *         nm_connection_get_setting           (NMConnection *connection,
-                                                         GType setting_type);
-NMSetting *         nm_connection_get_setting_by_name   (NMConnection *connection,
-                                                         const char *name);
-gboolean            nm_connection_replace_settings      (NMConnection *connection,
-                                                         GHashTable *new_settings,
-                                                         GError **error);
-gboolean            nm_connection_compare               (NMConnection *a,
-                                                         NMConnection *b,
-                                                         NMSettingCompareFlags flags);
-gboolean            nm_connection_diff                  (NMConnection *a,
-                                                         NMConnection *b,
-                                                         NMSettingCompareFlags flags,
-                                                         GHashTable **out_settings);
-gboolean            nm_connection_verify                (NMConnection *connection,
-                                                         GError **error);
-const char *        nm_connection_need_secrets          (NMConnection *connection,
-                                                         GPtrArray **hints);
-void                nm_connection_clear_secrets         (NMConnection *connection);
-void                nm_connection_clear_secrets_with_flags
-                                                        (NMConnection *connection,
-                                                         NMSettingClearSecretsWithFlagsFn func,
-                                                         gpointer user_data);
-gboolean            nm_connection_update_secrets        (NMConnection *connection,
-                                                         const char *setting_name,
-                                                         GHashTable *secrets,
-                                                         GError **error);
-void                nm_connection_set_path              (NMConnection *connection,
-                                                         const char *path);
-const char *        nm_connection_get_path              (NMConnection *connection);
-const char *        nm_connection_get_virtual_iface_name
-                                                        (NMConnection *connection);
-gboolean            nm_connection_is_type               (NMConnection *connection,
-                                                         const char *type);
-void                nm_connection_for_each_setting_value
-                                                        (NMConnection *connection,
-                                                         NMSettingValueIterFn func,
-                                                         gpointer user_data);
-GHashTable *        nm_connection_to_hash               (NMConnection *connection,
-                                                         NMSettingHashFlags flags);
-void                nm_connection_dump                  (NMConnection *connection);
-GType               nm_connection_lookup_setting_type   (const char *name);
-GType               nm_connection_lookup_setting_type_by_quark
-                                                        (GQuark error_quark);
-const char *        nm_connection_get_uuid              (NMConnection *connection);
-const char *        nm_connection_get_id                (NMConnection *connection);
-NMSetting8021x *    nm_connection_get_setting_802_1x    (NMConnection *connection);
-NMSettingBluetooth * nm_connection_get_setting_bluetooth
-                                                        (NMConnection *connection);
-NMSettingBond *     nm_connection_get_setting_bond      (NMConnection *connection);
-NMSettingBridge *   nm_connection_get_setting_bridge    (NMConnection *connection);
-NMSettingBridgePort * nm_connection_get_setting_bridge_port
-                                                        (NMConnection *connection);
-NMSettingCdma *     nm_connection_get_setting_cdma      (NMConnection *connection);
-NMSettingConnection * nm_connection_get_setting_connection
-                                                        (NMConnection *connection);
-NMSettingGsm *      nm_connection_get_setting_gsm       (NMConnection *connection);
-NMSettingInfiniband * nm_connection_get_setting_infiniband
-                                                        (NMConnection *connection);
-NMSettingIP4Config * nm_connection_get_setting_ip4_config
-                                                        (NMConnection *connection);
-NMSettingIP6Config * nm_connection_get_setting_ip6_config
-                                                        (NMConnection *connection);
-NMSettingOlpcMesh * nm_connection_get_setting_olpc_mesh (NMConnection *connection);
-NMSettingPPP *      nm_connection_get_setting_ppp       (NMConnection *connection);
-NMSettingPPPOE *    nm_connection_get_setting_pppoe     (NMConnection *connection);
-NMSettingSerial *   nm_connection_get_setting_serial    (NMConnection *connection);
-NMSettingVPN *      nm_connection_get_setting_vpn       (NMConnection *connection);
-NMSettingWimax *    nm_connection_get_setting_wimax     (NMConnection *connection);
-NMSettingAdsl *     nm_connection_get_setting_adsl      (NMConnection *connection);
-NMSettingWired *    nm_connection_get_setting_wired     (NMConnection *connection);
-NMSettingWireless * nm_connection_get_setting_wireless  (NMConnection *connection);
-NMSettingWirelessSecurity * nm_connection_get_setting_wireless_security
-                                                        (NMConnection *connection);
-NMSettingVlan *     nm_connection_get_setting_vlan      (NMConnection *connection);
-

-

-

-
Object Hierarchy

-
-  GEnum
-   +----NMConnectionError
-

-
-  GObject
-   +----NMConnection
-

-

-

-
Properties

-
-  "path"                     gchar*                : Read / Write / Construct
-

-

-

-
Signals

-
-  "secrets-cleared"                                : Run First
-  "secrets-updated"                                : Run First
-

-

-

-
Description

-

-An NMConnection describes all the settings and configuration values that
-are necessary to configure network devices for operation on a specific
-network.  Connections are the fundamental operating object for
-NetworkManager; no device is connected without a NMConnection, or
-disconnected without having been connected with a NMConnection.
-

-

-Each NMConnection contains a list of NMSetting objects usually referenced
-by name (using nm_connection_get_setting_by_name()) or by type (with
-nm_connection_get_setting()).  The settings describe the actual parameters
-with which the network devices are configured, including device-specific
-parameters (MTU, SSID, APN, channel, rate, etc) and IP-level parameters
-(addresses, routes, addressing methods, etc).
-

-

 

-
Details

-

-
enum NMConnectionError

-
typedef enum {
-	NM_CONNECTION_ERROR_UNKNOWN = 0,                  /*< nick=UnknownError >*/
-	NM_CONNECTION_ERROR_CONNECTION_SETTING_NOT_FOUND, /*< nick=ConnectionSettingNotFound >*/
-	NM_CONNECTION_ERROR_CONNECTION_TYPE_INVALID,      /*< nick=ConnectionTypeInvalid >*/
-	NM_CONNECTION_ERROR_SETTING_NOT_FOUND             /*< nick=SettingNotFound >*/
-} NMConnectionError;
-

-

-Describes errors that may result from operations involving a NMConnection.
-

-

+
Functions

+
--++
-
-
+
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

 




 
 
 
NM_CONNECTION_ERROR_UNKNOWN
unknown or unclassified error
+
+GQuark
+
+nm_connection_error_quark ()
 
 

 
NM_CONNECTION_ERROR_CONNECTION_SETTING_NOT_FOUND
the NMConnection object
-  did not contain the required NMSettingConnection object, which must be
-  present for all connections
+
+NMConnection *
+
+nm_connection_new ()
 
 

 
NM_CONNECTION_ERROR_CONNECTION_TYPE_INVALID
the 'type' property of the
-  'connection' setting did not point to a valid connection base type; ie
-  it was not a hardware-related setting like NMSettingWired or
-  NMSettingWireless.
+
+NMConnection *
+
+nm_connection_new_from_hash ()
+

+NMConnection *
+
+nm_connection_duplicate ()
+

+NMSetting *
+
+nm_connection_create_setting ()
+

+void
+
+nm_connection_add_setting ()
+

+void
+
+nm_connection_remove_setting ()
+

+NMSetting *
+
+nm_connection_get_setting ()
+

+NMSetting *
+
+nm_connection_get_setting_by_name ()
+

+gboolean
+
+nm_connection_replace_settings ()
+

+gboolean
+
+nm_connection_compare ()
+

+gboolean
+
+nm_connection_diff ()
+

+gboolean
+
+nm_connection_verify ()
+
const char *
+
+nm_connection_need_secrets ()
+

+void
+
+nm_connection_clear_secrets ()
+

+void
+
+nm_connection_clear_secrets_with_flags ()
+

+gboolean
+
+nm_connection_update_secrets ()
+

+void
+
+nm_connection_set_path ()
+
const char *
+
+nm_connection_get_path ()
+
const char *
+
+nm_connection_get_virtual_iface_name ()
+

+gboolean
+
+nm_connection_is_type ()
+

+void
+
+nm_connection_for_each_setting_value ()
+

+GHashTable *
+
+nm_connection_to_hash ()
+

+void
+
+nm_connection_dump ()
+

+GType
+
+nm_connection_lookup_setting_type ()
+

+GType
+
+nm_connection_lookup_setting_type_by_quark ()
+
const char *
+
+nm_connection_get_uuid ()
+
const char *
+
+nm_connection_get_id ()
+

+NMSetting8021x *
+
+nm_connection_get_setting_802_1x ()
+

+NMSettingBluetooth *
+
+nm_connection_get_setting_bluetooth ()
+

+NMSettingBond *
+
+nm_connection_get_setting_bond ()
+

+NMSettingBridge *
+
+nm_connection_get_setting_bridge ()
+

+NMSettingBridgePort *
+
+nm_connection_get_setting_bridge_port ()
+

+NMSettingCdma *
+
+nm_connection_get_setting_cdma ()
 
 

 
NM_CONNECTION_ERROR_SETTING_NOT_FOUND
the NMConnection object
-  did not contain the specified NMSetting object
+
+NMSettingConnection *
+
+nm_connection_get_setting_connection ()
+

+NMSettingGsm *
+
+nm_connection_get_setting_gsm ()
+

+NMSettingInfiniband *
+
+nm_connection_get_setting_infiniband ()
+

+NMSettingIP4Config *
+
+nm_connection_get_setting_ip4_config ()
+

+NMSettingIP6Config *
+
+nm_connection_get_setting_ip6_config ()
+

+NMSettingOlpcMesh *
+
+nm_connection_get_setting_olpc_mesh ()
+

+NMSettingPPP *
+
+nm_connection_get_setting_ppp ()
+

+NMSettingPPPOE *
+
+nm_connection_get_setting_pppoe ()
+

+NMSettingSerial *
+
+nm_connection_get_setting_serial ()
+

+NMSettingVPN *
+
+nm_connection_get_setting_vpn ()
+

+NMSettingWimax *
+
+nm_connection_get_setting_wimax ()
+

+NMSettingAdsl *
+
+nm_connection_get_setting_adsl ()
+

+NMSettingWired *
+
+nm_connection_get_setting_wired ()
+

+NMSettingWireless *
+
+nm_connection_get_setting_wireless ()
+

+NMSettingWirelessSecurity *
+
+nm_connection_get_setting_wireless_security ()
+

+NMSettingVlan *
+
+nm_connection_get_setting_vlan ()
 
 

 
 

 

-

-

-
NM_CONNECTION_ERROR

-
#define NM_CONNECTION_ERROR nm_connection_error_quark ()
-

-

-

-

-

-

-
nm_connection_error_quark ()

-
GQuark              nm_connection_error_quark           (void);

-

-Registers an error quark for NMConnection if necessary.
-

-

+

+
Properties

+
--+++
-
-
+
+
+

 





 
 
Returns :
the error quark used for NMConnection errors.
+gchar *pathRead / Write / Construct
 

 

 

-

-

-
NM_CONNECTION_PATH

-
#define NM_CONNECTION_PATH "path"
-

-

-

-

-

-

-
NMConnection

-
typedef struct _NMConnection NMConnection;

-

-The NMConnection struct contains only private data.
-It should only be accessed through the functions described below.
-

-

-

-

-
NMConnectionClass

-
typedef struct {
-	GObjectClass parent;
-
-	/* Signals */
-	void (*secrets_updated) (NMConnection *connection, const char * setting);
-} NMConnectionClass;
-

-

-

-

-

-

-
nm_connection_new ()

-
NMConnection *      nm_connection_new                   (void);

-

-Creates a new NMConnection object with no NMSetting objects.
-

-

+

+
Signals

+
--+++
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+

 





 
Returns :
the new empty NMConnection object
voidsecrets-clearedRun First
voidsecrets-updatedRun First

 

 

-

-

-
nm_connection_new_from_hash ()

-
NMConnection *      nm_connection_new_from_hash         (GHashTable *hash,
-                                                         GError **error);

-

-Creates a new NMConnection from a hash table describing the connection.  See
-nm_connection_to_hash() for a description of the expected hash table.
-

-

+

+
Types and Values

+
--++
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+

 




 
 
 
hash :
the GHashTable describing
-the connection. [element-type utf8 GLib.HashTable]
-enumNMConnectionError
 

 
error :
on unsuccessful return, an error#defineNM_CONNECTION_ERROR
 

 
Returns :
the new NMConnection object, populated with settings created
-from the values in the hash table, or NULL if the connection failed to
-validate#defineNM_CONNECTION_PATH
 NMConnection
 

 
 

 

+

+
Object Hierarchy

+
    GEnum
+    ╰── NMConnectionError
+    GObject
+    ╰── NMConnection
+

+

+

+
Includes

+
#include <nm-connection.h>
+

+

+

+
Description

+
An NMConnection describes all the settings and configuration values that
+are necessary to configure network devices for operation on a specific
+network.  Connections are the fundamental operating object for
+NetworkManager; no device is connected without a NMConnection, or
+disconnected without having been connected with a NMConnection.

+
Each NMConnection contains a list of NMSetting objects usually referenced
+by name (using nm_connection_get_setting_by_name()) or by type (with
+nm_connection_get_setting()).  The settings describe the actual parameters
+with which the network devices are configured, including device-specific
+parameters (MTU, SSID, APN, channel, rate, etc) and IP-level parameters
+(addresses, routes, addressing methods, etc).

+

+

+
Functions

+

+
nm_connection_error_quark ()

+
GQuark
+nm_connection_error_quark (void);

+
Registers an error quark for NMConnection if necessary.

+

+
Returns

+
 the error quark used for NMConnection errors.

+

+

+

 

 

-
nm_connection_duplicate ()

-
NMConnection *      nm_connection_duplicate             (NMConnection *connection);

-

-Duplicates a NMConnection.
-

-

+
nm_connection_new ()

+
NMConnection *
+nm_connection_new (void);

+
Creates a new NMConnection object with no NMSetting objects.

+

+
Returns

+
 the new empty NMConnection object

+

+

+
+

+

+
nm_connection_new_from_hash ()

+
NMConnection *
+nm_connection_new_from_hash (GHashTable *hash,
+                             GError **error);

+
Creates a new NMConnection from a hash table describing the connection.  See
+nm_connection_to_hash() for a description of the expected hash table.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
connection :
the NMConnection to duplicate
hash
 the GHashTable describing
+the connection. 
[element-type utf8 GLib.HashTable]
 

 
Returns :
a new NMConnection containing the same settings and properties
-as the source NMConnection. [transfer full]
-
error
on unsuccessful return, an error
 
 

 
 

 

+

+
Returns

+
 the new NMConnection object, populated with settings created
+from the values in the hash table, or NULL if the connection failed to
+validate

+

+

+

 

 

-
nm_connection_create_setting ()

-
NMSetting *         nm_connection_create_setting        (const char *name);

-

-Create a new NMSetting object of the desired type, given a setting name.
-

-

+
nm_connection_duplicate ()

+
NMConnection *
+nm_connection_duplicate (NMConnection *connection);

+
Duplicates a NMConnection.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
name :
a setting name
Returns :
the new setting object, or NULL if the setting name was unknown. [transfer full]
-
connection
the NMConnection to duplicate
 

 

 

+

+
Returns

+
 a new NMConnection containing the same settings and properties
+as the source NMConnection. 

+
[transfer full]

+

+

 

 

-
nm_connection_add_setting ()

-
void                nm_connection_add_setting           (NMConnection *connection,
-                                                         NMSetting *setting);

-

-Adds a NMSetting to the connection, replacing any previous NMSetting of the
+
nm_connection_create_setting ()

+
NMSetting *
+nm_connection_create_setting (const char *name);

+
Create a new NMSetting object of the desired type, given a setting name.

+

+
Parameters

+

+++++
+
+
+
+
+
+





name
a setting name
 

+

+

+
Returns

+
 the new setting object, or NULL if the setting name was unknown. 

+
[transfer full]

+

+

+

+

+
nm_connection_add_setting ()

+
void
+nm_connection_add_setting (NMConnection *connection,
+                           NMSetting *setting);

+
Adds a NMSetting to the connection, replacing any previous NMSetting of the
 same name which has previously been added to the NMConnection.  The
 connection takes ownership of the NMSetting object and does not increase
-the setting object's reference count.
-

-

+the setting object's reference count.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
connection :
a NMConnection
-
connection
a NMConnection
 
 

 
setting :
the NMSetting to add to the connection object. [transfer full]
-
setting
 the NMSetting to add to the connection object. 
[transfer full]
 

 
 

 

+

 

 

-
nm_connection_remove_setting ()

-
void                nm_connection_remove_setting        (NMConnection *connection,
-                                                         GType setting_type);

-

-Removes the NMSetting with the given GType from the NMConnection.  This
-operation dereferences the NMSetting object.
-

-

+
nm_connection_remove_setting ()

+
void
+nm_connection_remove_setting (NMConnection *connection,
+                              GType setting_type);

+
Removes the NMSetting with the given GType from the NMConnection.  This
+operation dereferences the NMSetting object.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
connection :
a NMConnection
-
connection
a NMConnection
 
 

 
setting_type :
the GType of the setting object to remove
setting_type
the GType of the setting object to remove
 
 

 
 

 

+

 

 

-
nm_connection_get_setting ()

-
NMSetting *         nm_connection_get_setting           (NMConnection *connection,
-                                                         GType setting_type);

-

-Gets the NMSetting with the given GType, if one has been previously added
-to the NMConnection.
-

-

+
nm_connection_get_setting ()

+
NMSetting *
+nm_connection_get_setting (NMConnection *connection,
+                           GType setting_type);

+
Gets the NMSetting with the given GType, if one has been previously added
+to the NMConnection.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
-
-
-
-
+
+
+

 





 
 
 
connection :
a NMConnection
-
connection
a NMConnection
 
 

 
setting_type :
the GType of the setting object to return
Returns :
the NMSetting, or NULL if no setting of that type was previously
-added to the NMConnection. [transfer none]
-
setting_type
the GType of the setting object to return
 
 

 
 

 

+

+
Returns

+
 the NMSetting, or NULL if no setting of that type was previously
+added to the NMConnection. 

+
[transfer none]

+

+

 

 

-
nm_connection_get_setting_by_name ()

-
NMSetting *         nm_connection_get_setting_by_name   (NMConnection *connection,
-                                                         const char *name);

-

-Gets the NMSetting with the given name, if one has been previously added
-the the NMConnection.
-

-

+
nm_connection_get_setting_by_name ()

+
NMSetting *
+nm_connection_get_setting_by_name (NMConnection *connection,
+                                   const char *name);

+
Gets the NMSetting with the given name, if one has been previously added
+the the NMConnection.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
-
-
-
-
+
+
+

 





 
 
 
connection :
a NMConnection
-
connection
a NMConnection
 
 

 
name :
a setting name
Returns :
the NMSetting, or NULL if no setting with that name was previously
-added to the NMConnection. [transfer none]
-
name
a setting name
 
 

 
 

 

+

+
Returns

+
 the NMSetting, or NULL if no setting with that name was previously
+added to the NMConnection. 

+
[transfer none]

+

+

 

 

-
nm_connection_replace_settings ()

-
gboolean            nm_connection_replace_settings      (NMConnection *connection,
-                                                         GHashTable *new_settings,
-                                                         GError **error);

-

+
nm_connection_replace_settings ()

+
gboolean
+nm_connection_replace_settings (NMConnection *connection,
+                                GHashTable *new_settings,
+                                GError **error);

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+

 





 
 
 
connection :
a NMConnection
-
new_settings :
a GHashTable of settings. [element-type utf8 GLib.HashTable]
-
connection
a NMConnection
 
 

 
error :
location to store error, or NULL
-
new_settings
 a GHashTable of settings. 
[element-type utf8 GLib.HashTable]
 

 
Returns :

-TRUE if the settings were valid and added to the connection, FALSE
-if they were not
error
location to store error, or NULL
 
 

 
 

 

+

+
Returns

+
 TRUE if the settings were valid and added to the connection, FALSE
+if they were not

+

+

+
 

-

-
nm_connection_compare ()

-
gboolean            nm_connection_compare               (NMConnection *a,
-                                                         NMConnection *b,
-                                                         NMSettingCompareFlags flags);

-

-Compares two NMConnection objects for similarity, with comparison behavior
-modified by a set of flags.  See nm_setting_compare() for a description of
-each flag's behavior.
-

-

+

+
nm_connection_compare ()

+
gboolean
+nm_connection_compare (NMConnection *a,
+                       NMConnection *b,
+                       NMSettingCompareFlags flags);

+
Compares two NMConnection objects for similarity, with comparison behavior
+modified by a set of flags.  See nm_setting_compare() for a description of
+each flag's behavior.

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+

 





 
 
 
a :
a NMConnection
-
b :
a second NMConnection to compare with the first
a
a NMConnection
 
 

 
flags :
compare flags, e.g. NM_SETTING_COMPARE_FLAG_EXACT
-
b
a second NMConnection to compare with the first
 
 

 
Returns :

-TRUE if the comparison succeeds, FALSE if it does not
flags
compare flags, e.g. NM_SETTING_COMPARE_FLAG_EXACT
 
 

 
 

 

+

+
Returns

+
 TRUE if the comparison succeeds, FALSE if it does not

+

+

+
 

 

-
nm_connection_diff ()

-
gboolean            nm_connection_diff                  (NMConnection *a,
-                                                         NMConnection *b,
-                                                         NMSettingCompareFlags flags,
-                                                         GHashTable **out_settings);

-

-Compares two NMConnection objects for similarity, with comparison behavior
-modified by a set of flags.  See nm_setting_compare() for a description of
+
nm_connection_diff ()

+
gboolean
+nm_connection_diff (NMConnection *a,
+                    NMConnection *b,
+                    NMSettingCompareFlags flags,
+                    GHashTable **out_settings);

+
Compares two NMConnection objects for similarity, with comparison behavior
+modified by a set of flags.  See nm_setting_compare() for a description of
 each flag's behavior.  If the connections differ, settings and keys within
-each setting that differ are added to the returned out_settings hash table.
-No values are returned, only key names.
-

-

+each setting that differ are added to the returned out_settings
+ hash table.
+No values are returned, only key names.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
-
-
-
-
+differ mapped to one or more of NMSettingDiffResult as a bitfield. 

+

 





 
 
 
a :
a NMConnection
-
a
a NMConnection
 
 

 
b :
a second NMConnection to compare with the first
b
a second NMConnection to compare with the first
 
 

 
flags :
compare flags, e.g. NM_SETTING_COMPARE_FLAG_EXACT
-
flags
compare flags, e.g. NM_SETTING_COMPARE_FLAG_EXACT
 
 

 
out_settings :
if the
+
out_settings
 if the
 connections differ, on return a hash table mapping setting names to
 second-level GHashTable (utf8 to guint32), which contains the key names that
-differ mapped to one or more of NMSettingDiffResult as a bitfield. [element-type utf8 GLib.HashTable]
-
Returns :

-TRUE if the connections contain the same values, FALSE if they do
-not[element-type utf8 GLib.HashTable]
 

 
 

 

+

+
Returns

+
 TRUE if the connections contain the same values, FALSE if they do
+not

+

+

+
 

 

-
nm_connection_verify ()

-
gboolean            nm_connection_verify                (NMConnection *connection,
-                                                         GError **error);

-

-Validates the connection and all its settings.  Each setting's properties
+
nm_connection_verify ()

+
gboolean
+nm_connection_verify (NMConnection *connection,
+                      GError **error);

+
Validates the connection and all its settings.  Each setting's properties
 have allowed values, and some values are dependent on other values.  For
 example, if a WiFi connection is security enabled, the NMSettingWireless
 setting object's 'security' property must contain the setting name of the
@@ -651,1145 +943,1305 @@ setting object's 'security' property must contain the setting name of the
 connection for the connection to be valid.  As another example, the
 NMSettingWired object's 'mac-address' property must be a validly formatted
 MAC address.  The returned GError contains information about which
-setting and which property failed validation, and how it failed validation.
-

-

+setting and which property failed validation, and how it failed validation.

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+

 





 
 
 
connection :
the NMConnection to verify
error :
location to store error, or NULL
-
connection
the NMConnection to verify
 
 

 
Returns :

-TRUE if the connection is valid, FALSE if it is not
error
location to store error, or NULL
 
 

 
 

 

+

+
Returns

+
 TRUE if the connection is valid, FALSE if it is not

+

+

+
 

 

-
nm_connection_need_secrets ()

-
const char *        nm_connection_need_secrets          (NMConnection *connection,
-                                                         GPtrArray **hints);

-

-Returns the name of the first setting object in the connection which would
+
nm_connection_need_secrets ()

+
const char *
+nm_connection_need_secrets (NMConnection *connection,
+                            GPtrArray **hints);

+
Returns the name of the first setting object in the connection which would
 need secrets to make a successful connection.  The returned hints are only
 intended as a guide to what secrets may be required, because in some
 circumstances, there is no way to conclusively determine exactly which
-secrets are needed.
-

-

+secrets are needed.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
-
-
-
-
+elements. 

+

 





 
 
 
connection :
the NMConnection
-
connection
the NMConnection
 
 

 
hints :
the address of a pointer to a GPtrArray, initialized to NULL, which on
+
hints
  the address of a pointer to a GPtrArray, initialized to NULL, which on
 return points to an allocated GPtrArray containing the property names of
 secrets of the NMSetting which may be required; the caller owns the array
 and must free the array itself with g_ptr_array_free(), but not free its
-elements. [out][element-type utf8][allow-none][transfer container]
-
Returns :
the setting name of the NMSetting object which has invalid or
-missing secrets[out][element-type utf8][allow-none][transfer container]
 

 
 

 

+

+
Returns

+
 the setting name of the NMSetting object which has invalid or
+missing secrets

+

+

+
 

 

-
nm_connection_clear_secrets ()

-
void                nm_connection_clear_secrets         (NMConnection *connection);

-

-Clears and frees any secrets that may be stored in the connection, to avoid
-keeping secret data in memory when not needed.
-

-

+
nm_connection_clear_secrets ()

+
void
+nm_connection_clear_secrets (NMConnection *connection);

+
Clears and frees any secrets that may be stored in the connection, to avoid
+keeping secret data in memory when not needed.

+

+
Parameters

+
--+++
-
-
+
+
+

 





 
 
connection :
the NMConnection
-
connection
the NMConnection
 
 

 

 

+
 

 

-
nm_connection_clear_secrets_with_flags ()

-
void                nm_connection_clear_secrets_with_flags
-                                                        (NMConnection *connection,
-                                                         NMSettingClearSecretsWithFlagsFn func,
-                                                         gpointer user_data);

-

-Clears and frees secrets determined by func.
-

-

+
nm_connection_clear_secrets_with_flags ()

+
void
+nm_connection_clear_secrets_with_flags
+                               (NMConnection *connection,
+                                NMSettingClearSecretsWithFlagsFn func,
+                                gpointer user_data);

+
Clears and frees secrets determined by func
+.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+

 





 
 
 
connection :
the NMConnection
-
connection
the NMConnection
 
 

 
func :
function to be called to determine whether a
-specific secret should be cleared or not. [scope call]
-
func
 function to be called to determine whether a
+specific secret should be cleared or not. 
[scope call]
 

 
user_data :
caller-supplied data passed to func
-
user_data
caller-supplied data passed to func
+
 
 

 
 

 

+
 

 

-
nm_connection_update_secrets ()

-
gboolean            nm_connection_update_secrets        (NMConnection *connection,
-                                                         const char *setting_name,
-                                                         GHashTable *secrets,
-                                                         GError **error);

-

-Update the specified setting's secrets, given a hash table of secrets
+
nm_connection_update_secrets ()

+
gboolean
+nm_connection_update_secrets (NMConnection *connection,
+                              const char *setting_name,
+                              GHashTable *secrets,
+                              GError **error);

+
Update the specified setting's secrets, given a hash table of secrets
 intended for that setting (deserialized from D-Bus for example).  Will also
 extract the given setting's secrets hash if given a hash of hashes, as would
-be returned from nm_connection_to_hash().  If setting_name is NULL, expects
-a fully serialized NMConnection as returned by nm_connection_to_hash() and
-will update all secrets from all settings contained in secrets.
-

-

+be returned from nm_connection_to_hash().  If setting_name
+ is NULL, expects
+a fully serialized NMConnection as returned by nm_connection_to_hash() and
+will update all secrets from all settings contained in secrets
+.

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+

 





 
 
 
connection :
the NMConnection
-
setting_name :
the setting object name to which the secrets apply
connection
the NMConnection
 
 

 
secrets :
a GHashTable mapping
-string:GValue of setting property names and secrets of the given setting_name. [element-type utf8 GObject.Value]
-
setting_name
the setting object name to which the secrets apply
 
 

 
error :
location to store error, or NULL
-
secrets
 a GHashTable mapping
+string:GValue of setting property names and secrets of the given setting_name
+. 
[element-type utf8 GObject.Value]
 

 
Returns :

-TRUE if the secrets were successfully updated, FALSE if the update
-failed (tried to update secrets for a setting that doesn't exist, etc)
error
location to store error, or NULL
 
 

 
 

 

+

+
Returns

+
 TRUE if the secrets were successfully updated, FALSE if the update
+failed (tried to update secrets for a setting that doesn't exist, etc)

+

+

+
 

 

-
nm_connection_set_path ()

-
void                nm_connection_set_path              (NMConnection *connection,
-                                                         const char *path);

-

-Sets the D-Bus path of the connection.  This property is not serialized, and
-is only for the reference of the caller.  Sets the "path"
-property.
-

-

+
nm_connection_set_path ()

+
void
+nm_connection_set_path (NMConnection *connection,
+                        const char *path);

+
Sets the D-Bus path of the connection.  This property is not serialized, and
+is only for the reference of the caller.  Sets the “path”
+property.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
connection :
the NMConnection
-
connection
the NMConnection
 
 

 
path :
the D-Bus path of the connection as given by the settings service
-which provides the connection
path
the D-Bus path of the connection as given by the settings service
+which provides the connection
 
 

 
 

 

+
 

 

-
nm_connection_get_path ()

-
const char *        nm_connection_get_path              (NMConnection *connection);

-

-Returns the connection's D-Bus path.
-

-

+
nm_connection_get_path ()

+
const char *
+nm_connection_get_path (NMConnection *connection);

+
Returns the connection's D-Bus path.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
connection :
the NMConnection
-
Returns :
the D-Bus path of the connection, previously set by a call to
-nm_connection_set_path().
connection
the NMConnection
 

 

 

+

+
Returns

+
 the D-Bus path of the connection, previously set by a call to
+nm_connection_set_path().

+

+

+
 

 

-
nm_connection_get_virtual_iface_name ()

-
const char *        nm_connection_get_virtual_iface_name
-                                                        (NMConnection *connection);

-

-Returns the name of the virtual kernel interface which the connection
+
nm_connection_get_virtual_iface_name ()

+
const char *
+nm_connection_get_virtual_iface_name (NMConnection *connection);

+
Returns the name of the virtual kernel interface which the connection
 needs to use if specified in the settings. This function abstracts all
 connection types which require this functionality. For all other
-connection types, this function will return NULL.
-

-

+connection types, this function will return NULL.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
connection :
The NMConnection
-
Returns :
Name of the kernel interface or NULL
-
connection
The NMConnection
 

 

 

+

+
Returns

+
 Name of the kernel interface or NULL

+

+

+
 

 

-
nm_connection_is_type ()

-
gboolean            nm_connection_is_type               (NMConnection *connection,
-                                                         const char *type);

-

-A convenience function to check if the given connection is a particular
-type (ie wired, wifi, ppp, etc). Checks the "type"
-property of the connection and matches that against type.
-

-

+
nm_connection_is_type ()

+
gboolean
+nm_connection_is_type (NMConnection *connection,
+                       const char *type);

+
A convenience function to check if the given connection
+ is a particular
+type (ie wired, wifi, ppp, etc). Checks the “type”
+property of the connection and matches that against type
+.

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+

 





 
 
 
connection :
the NMConnection
-
type :
a setting name to check the connection's type against (like
-NM_SETTING_WIRELESS_SETTING_NAME or NM_SETTING_WIRED_SETTING_NAME)
connection
the NMConnection
 
 

 
Returns :

-TRUE if the connection is of the given type, FALSE if not
type
a setting name to check the connection's type against (like
+NM_SETTING_WIRELESS_SETTING_NAME or NM_SETTING_WIRED_SETTING_NAME)
 
 

 
 

 

+

+
Returns

+
 TRUE if the connection is of the given type
+, FALSE if not

+

+

+
 

 

-
nm_connection_for_each_setting_value ()

-
void                nm_connection_for_each_setting_value
-                                                        (NMConnection *connection,
-                                                         NMSettingValueIterFn func,
-                                                         gpointer user_data);

-

-Iterates over the properties of each NMSetting object in the NMConnection,
-calling the supplied user function for each property.
-

-

+
nm_connection_for_each_setting_value ()

+
void
+nm_connection_for_each_setting_value (NMConnection *connection,
+                                      NMSettingValueIterFn func,
+                                      gpointer user_data);

+
Iterates over the properties of each NMSetting object in the NMConnection,
+calling the supplied user function for each property.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+

 





 
 
 
connection :
the NMConnection
-
connection
the NMConnection
 
 

 
func :
user-supplied function called for each setting's property. [scope call]
-
func
 user-supplied function called for each setting's property. 
[scope call]
 

 
user_data :
user data passed to func at each invocation
user_data
user data passed to func
+at each invocation
 
 

 
 

 

+
 

 

-
nm_connection_to_hash ()

-
GHashTable *        nm_connection_to_hash               (NMConnection *connection,
-                                                         NMSettingHashFlags flags);

-

-Converts the NMConnection into a GHashTable describing the connection,
+
nm_connection_to_hash ()

+
GHashTable *
+nm_connection_to_hash (NMConnection *connection,
+                       NMSettingHashFlags flags);

+
Converts the NMConnection into a GHashTable describing the connection,
 suitable for marshalling over D-Bus or serializing.  The hash table mapping
 is string:GHashTable with each element in the returned hash representing
 a NMSetting object.  The keys are setting object names, and the values
 are GHashTables mapping string:GValue, each of which represents the
-properties of the NMSetting object.
-

-

+properties of the NMSetting object.

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+

 





 
 
 
connection :
the NMConnection
-
flags :
hash flags, e.g. NM_SETTING_HASH_FLAG_ALL
-
connection
the NMConnection
 
 

 
Returns :
a new
-GHashTable describing the connection, its settings, and each setting's
-properties.  The caller owns the hash table and must unref the hash table
-with g_hash_table_unref() when it is no longer needed. [transfer full][element-type utf8 GLib.HashTable]
-
flags
hash flags, e.g. NM_SETTING_HASH_FLAG_ALL
 
 

 
 

 

+

+
Returns

+
 a new
+GHashTable describing the connection, its settings, and each setting's
+properties.  The caller owns the hash table and must unref the hash table
+with g_hash_table_unref() when it is no longer needed. 

+
[transfer full][element-type utf8 GLib.HashTable]

+

+
 

 

-
nm_connection_dump ()

-
void                nm_connection_dump                  (NMConnection *connection);

-

-Print the connection to stdout.  For debugging purposes ONLY, should NOT
+
nm_connection_dump ()

+
void
+nm_connection_dump (NMConnection *connection);

+
Print the connection to stdout.  For debugging purposes ONLY, should NOT
 be used for serialization of the connection or machine-parsed in any way. The
-output format is not guaranteed to be stable and may change at any time.
-

-

+output format is not guaranteed to be stable and may change at any time.

+

+
Parameters

+
--+++
-
-
+
+
+

 





 
 
connection :
the NMConnection
-
connection
the NMConnection
 
 

 

 

+
 

 

-
nm_connection_lookup_setting_type ()

-
GType               nm_connection_lookup_setting_type   (const char *name);

-

-Returns the GType of the setting's class for a given setting name.
-

-

+
nm_connection_lookup_setting_type ()

+
GType
+nm_connection_lookup_setting_type (const char *name);

+
Returns the GType of the setting's class for a given setting name.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
name :
a setting name
Returns :
the GType of the setting's class
name
a setting name
 

 

 

+

+
Returns

+
 the GType of the setting's class

+

+

+
 

 

-
nm_connection_lookup_setting_type_by_quark ()

-
GType               nm_connection_lookup_setting_type_by_quark
-                                                        (GQuark error_quark);

-

-Returns the GType of the setting's class for a given setting error quark.
-Useful for figuring out which setting a returned error is for.
-

-

+
nm_connection_lookup_setting_type_by_quark ()

+
GType
+nm_connection_lookup_setting_type_by_quark
+                               (GQuark error_quark);

+
Returns the GType of the setting's class for a given setting error quark.
+Useful for figuring out which setting a returned error is for.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
error_quark :
a setting error quark
Returns :
the GType of the setting's class
error_quark
a setting error quark
 

 

 

+

+
Returns

+
 the GType of the setting's class

+

+

+
 

 

-
nm_connection_get_uuid ()

-
const char *        nm_connection_get_uuid              (NMConnection *connection);

-

-A shortcut to return the UUID from the connection's NMSettingConnection.
-

-

+
nm_connection_get_uuid ()

+
const char *
+nm_connection_get_uuid (NMConnection *connection);

+
A shortcut to return the UUID from the connection's NMSettingConnection.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
connection :
the NMConnection
-
Returns :
the UUID from the connection's 'connection' setting
connection
the NMConnection
 

 

 

+

+
Returns

+
 the UUID from the connection's 'connection' setting

+

+

+
 

 

-
nm_connection_get_id ()

-
const char *        nm_connection_get_id                (NMConnection *connection);

-

-A shortcut to return the ID from the connection's NMSettingConnection.
-

-

+
nm_connection_get_id ()

+
const char *
+nm_connection_get_id (NMConnection *connection);

+
A shortcut to return the ID from the connection's NMSettingConnection.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
connection :
the NMConnection
-
Returns :
the ID from the connection's 'connection' setting
connection
the NMConnection
 

 

 

+

+
Returns

+
 the ID from the connection's 'connection' setting

+

+

+
 

 

-
nm_connection_get_setting_802_1x ()

-
NMSetting8021x *    nm_connection_get_setting_802_1x    (NMConnection *connection);

-

-A shortcut to return any NMSetting8021x the connection might contain.
-

-

+
nm_connection_get_setting_802_1x ()

+
NMSetting8021x *
+nm_connection_get_setting_802_1x (NMConnection *connection);

+
A shortcut to return any NMSetting8021x the connection might contain.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
connection :
the NMConnection
-
Returns :
an NMSetting8021x if the connection contains one, otherwise NULL. [transfer none]
-
connection
the NMConnection
 

 

 

+

+
Returns

+
 an NMSetting8021x if the connection contains one, otherwise NULL. 

+
[transfer none]

+

+
 

 

-
nm_connection_get_setting_bluetooth ()

-
NMSettingBluetooth * nm_connection_get_setting_bluetooth
-                                                        (NMConnection *connection);

-

-A shortcut to return any NMSettingBluetooth the connection might contain.
-

-

+
nm_connection_get_setting_bluetooth ()

+
NMSettingBluetooth *
+nm_connection_get_setting_bluetooth (NMConnection *connection);

+
A shortcut to return any NMSettingBluetooth the connection might contain.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
connection :
the NMConnection
-
Returns :
an NMSettingBluetooth if the connection contains one, otherwise NULL. [transfer none]
-
connection
the NMConnection
 

 

 

+

+
Returns

+
 an NMSettingBluetooth if the connection contains one, otherwise NULL. 

+
[transfer none]

+

+
 

 

-
nm_connection_get_setting_bond ()

-
NMSettingBond *     nm_connection_get_setting_bond      (NMConnection *connection);

-

-A shortcut to return any NMSettingBond the connection might contain.
-

-

+
nm_connection_get_setting_bond ()

+
NMSettingBond *
+nm_connection_get_setting_bond (NMConnection *connection);

+
A shortcut to return any NMSettingBond the connection might contain.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
connection :
the NMConnection
-
Returns :
an NMSettingBond if the connection contains one, otherwise NULL. [transfer none]
-
connection
the NMConnection
 

 

 

+

+
Returns

+
 an NMSettingBond if the connection contains one, otherwise NULL. 

+
[transfer none]

+

+
 

 

-
nm_connection_get_setting_bridge ()

-
NMSettingBridge *   nm_connection_get_setting_bridge    (NMConnection *connection);

-

-A shortcut to return any NMSettingBridge the connection might contain.
-

-

+
nm_connection_get_setting_bridge ()

+
NMSettingBridge *
+nm_connection_get_setting_bridge (NMConnection *connection);

+
A shortcut to return any NMSettingBridge the connection might contain.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+

 





 
connection :
the NMConnection
-
Returns :
an NMSettingBridge if the connection contains one, otherwise NULL. [transfer none]
-
connection
the NMConnection
 

+

+

+
Returns

+
 an NMSettingBridge if the connection contains one, otherwise NULL. 

+
[transfer none]

+

+
+

+

+
nm_connection_get_setting_bridge_port ()

+
NMSettingBridgePort *
+nm_connection_get_setting_bridge_port (NMConnection *connection);

+
A shortcut to return any NMSettingBridgePort the connection might contain.

+

+
Parameters

+

+++++
+
+
+
+
+





connection
the NMConnection
 

 

 

+

+
Returns

+
 an NMSettingBridgePort if the connection contains one, otherwise NULL. 

+
[transfer none]

+

+

+

+

+
nm_connection_get_setting_cdma ()

+
NMSettingCdma *
+nm_connection_get_setting_cdma (NMConnection *connection);

+
A shortcut to return any NMSettingCdma the connection might contain.

+

+
Parameters

+

+++++
+
+
+
+
+
+





connection
the NMConnection
 

+

+

+
Returns

+
 an NMSettingCdma if the connection contains one, otherwise NULL. 

+
[transfer none]

+

+

+

+

+
nm_connection_get_setting_connection ()

+
NMSettingConnection *
+nm_connection_get_setting_connection (NMConnection *connection);

+
A shortcut to return any NMSettingConnection the connection might contain.

+

+
Parameters

+

+++++
+
+
+
+
+
+





connection
the NMConnection
 

+

+

+
Returns

+
 an NMSettingConnection if the connection contains one, otherwise NULL. 

+
[transfer none]

+

+

+

+

+
nm_connection_get_setting_gsm ()

+
NMSettingGsm *
+nm_connection_get_setting_gsm (NMConnection *connection);

+
A shortcut to return any NMSettingGsm the connection might contain.

+

+
Parameters

+

+++++
+
+
+
+
+
+





connection
the NMConnection
 

+

+

+
Returns

+
 an NMSettingGsm if the connection contains one, otherwise NULL. 

+
[transfer none]

+

+

 

 

-
nm_connection_get_setting_bridge_port ()

-
NMSettingBridgePort * nm_connection_get_setting_bridge_port
-                                                        (NMConnection *connection);

-

-A shortcut to return any NMSettingBridgePort the connection might contain.
-

-

+
nm_connection_get_setting_infiniband ()

+
NMSettingInfiniband *
+nm_connection_get_setting_infiniband (NMConnection *connection);

+
A shortcut to return any NMSettingInfiniband the connection might contain.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
connection :
the NMConnection
-
Returns :
an NMSettingBridgePort if the connection contains one, otherwise NULL. [transfer none]
-
connection
the NMConnection
 

 

 

+

+
Returns

+
 an NMSettingInfiniband if the connection contains one, otherwise NULL. 

+
[transfer none]

+

+
 

 

-
nm_connection_get_setting_cdma ()

-
NMSettingCdma *     nm_connection_get_setting_cdma      (NMConnection *connection);

-

-A shortcut to return any NMSettingCdma the connection might contain.
-

-

+
nm_connection_get_setting_ip4_config ()

+
NMSettingIP4Config *
+nm_connection_get_setting_ip4_config (NMConnection *connection);

+
A shortcut to return any NMSettingIP4Config the connection might contain.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
connection :
the NMConnection
-
Returns :
an NMSettingCdma if the connection contains one, otherwise NULL. [transfer none]
-
connection
the NMConnection
 

 

 

+

+
Returns

+
 an NMSettingIP4Config if the connection contains one, otherwise NULL. 

+
[transfer none]

+

+
 

 

-
nm_connection_get_setting_connection ()

-
NMSettingConnection * nm_connection_get_setting_connection
-                                                        (NMConnection *connection);

-

-A shortcut to return any NMSettingConnection the connection might contain.
-

-

+
nm_connection_get_setting_ip6_config ()

+
NMSettingIP6Config *
+nm_connection_get_setting_ip6_config (NMConnection *connection);

+
A shortcut to return any NMSettingIP6Config the connection might contain.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
connection :
the NMConnection
-
Returns :
an NMSettingConnection if the connection contains one, otherwise NULL. [transfer none]
-
connection
the NMConnection
 

 

 

+

+
Returns

+
 an NMSettingIP6Config if the connection contains one, otherwise NULL. 

+
[transfer none]

+

+
 

 

-
nm_connection_get_setting_gsm ()

-
NMSettingGsm *      nm_connection_get_setting_gsm       (NMConnection *connection);

-

-A shortcut to return any NMSettingGsm the connection might contain.
-

-

+
nm_connection_get_setting_olpc_mesh ()

+
NMSettingOlpcMesh *
+nm_connection_get_setting_olpc_mesh (NMConnection *connection);

+
A shortcut to return any NMSettingOlpcMesh the connection might contain.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
connection :
the NMConnection
-
Returns :
an NMSettingGsm if the connection contains one, otherwise NULL. [transfer none]
-
connection
the NMConnection
 

 

 

+

+
Returns

+
 an NMSettingOlpcMesh if the connection contains one, otherwise NULL. 

+
[transfer none]

+

+
 

 

-
nm_connection_get_setting_infiniband ()

-
NMSettingInfiniband * nm_connection_get_setting_infiniband
-                                                        (NMConnection *connection);

-

-A shortcut to return any NMSettingInfiniband the connection might contain.
-

-

+
nm_connection_get_setting_ppp ()

+
NMSettingPPP *
+nm_connection_get_setting_ppp (NMConnection *connection);

+
A shortcut to return any NMSettingPPP the connection might contain.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
connection :
the NMConnection
-
Returns :
an NMSettingInfiniband if the connection contains one, otherwise NULL. [transfer none]
-
connection
the NMConnection
 

 

 

+

+
Returns

+
 an NMSettingPPP if the connection contains one, otherwise NULL. 

+
[transfer none]

+

+
 

 

-
nm_connection_get_setting_ip4_config ()

-
NMSettingIP4Config * nm_connection_get_setting_ip4_config
-                                                        (NMConnection *connection);

-

-A shortcut to return any NMSettingIP4Config the connection might contain.
-

-

+
nm_connection_get_setting_pppoe ()

+
NMSettingPPPOE *
+nm_connection_get_setting_pppoe (NMConnection *connection);

+
A shortcut to return any NMSettingPPPOE the connection might contain.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
connection :
the NMConnection
-
Returns :
an NMSettingIP4Config if the connection contains one, otherwise NULL. [transfer none]
-
connection
the NMConnection
 

 

 

+

+
Returns

+
 an NMSettingPPPOE if the connection contains one, otherwise NULL. 

+
[transfer none]

+

+
 

 

-
nm_connection_get_setting_ip6_config ()

-
NMSettingIP6Config * nm_connection_get_setting_ip6_config
-                                                        (NMConnection *connection);

-

-A shortcut to return any NMSettingIP6Config the connection might contain.
-

-

+
nm_connection_get_setting_serial ()

+
NMSettingSerial *
+nm_connection_get_setting_serial (NMConnection *connection);

+
A shortcut to return any NMSettingSerial the connection might contain.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
connection :
the NMConnection
-
Returns :
an NMSettingIP6Config if the connection contains one, otherwise NULL. [transfer none]
-
connection
the NMConnection
 

 

 

+

+
Returns

+
 an NMSettingSerial if the connection contains one, otherwise NULL. 

+
[transfer none]

+

+
 

 

-
nm_connection_get_setting_olpc_mesh ()

-
NMSettingOlpcMesh * nm_connection_get_setting_olpc_mesh (NMConnection *connection);

-

-A shortcut to return any NMSettingOlpcMesh the connection might contain.
-

-

+
nm_connection_get_setting_vpn ()

+
NMSettingVPN *
+nm_connection_get_setting_vpn (NMConnection *connection);

+
A shortcut to return any NMSettingVPN the connection might contain.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
connection :
the NMConnection
-
Returns :
an NMSettingOlpcMesh if the connection contains one, otherwise NULL. [transfer none]
-
connection
the NMConnection
 

 

 

+

+
Returns

+
 an NMSettingVPN if the connection contains one, otherwise NULL. 

+
[transfer none]

+

+
 

 

-
nm_connection_get_setting_ppp ()

-
NMSettingPPP *      nm_connection_get_setting_ppp       (NMConnection *connection);

-

-A shortcut to return any NMSettingPPP the connection might contain.
-

-

+
nm_connection_get_setting_wimax ()

+
NMSettingWimax *
+nm_connection_get_setting_wimax (NMConnection *connection);

+
A shortcut to return any NMSettingWimax the connection might contain.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
connection :
the NMConnection
-
Returns :
an NMSettingPPP if the connection contains one, otherwise NULL. [transfer none]
-
connection
the NMConnection
 

 

 

+

+
Returns

+
 an NMSettingWimax if the connection contains one, otherwise NULL. 

+
[transfer none]

+

+
 

 

-
nm_connection_get_setting_pppoe ()

-
NMSettingPPPOE *    nm_connection_get_setting_pppoe     (NMConnection *connection);

-

-A shortcut to return any NMSettingPPPOE the connection might contain.
-

-

+
nm_connection_get_setting_adsl ()

+
NMSettingAdsl *
+nm_connection_get_setting_adsl (NMConnection *connection);

+
A shortcut to return any NMSettingAdsl the connection might contain.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
connection :
the NMConnection
-
Returns :
an NMSettingPPPOE if the connection contains one, otherwise NULL. [transfer none]
-
connection
the NMConnection
 

 

 

+

+
Returns

+
 an NMSettingAdsl if the connection contains one, otherwise NULL. 

+
[transfer none]

+

+
 

 

-
nm_connection_get_setting_serial ()

-
NMSettingSerial *   nm_connection_get_setting_serial    (NMConnection *connection);

-

-A shortcut to return any NMSettingSerial the connection might contain.
-

-

+
nm_connection_get_setting_wired ()

+
NMSettingWired *
+nm_connection_get_setting_wired (NMConnection *connection);

+
A shortcut to return any NMSettingWired the connection might contain.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
connection :
the NMConnection
-
Returns :
an NMSettingSerial if the connection contains one, otherwise NULL. [transfer none]
-
connection
the NMConnection
 

 

 

+

+
Returns

+
 an NMSettingWired if the connection contains one, otherwise NULL. 

+
[transfer none]

+

+
 

 

-
nm_connection_get_setting_vpn ()

-
NMSettingVPN *      nm_connection_get_setting_vpn       (NMConnection *connection);

-

-A shortcut to return any NMSettingVPN the connection might contain.
-

-

+
nm_connection_get_setting_wireless ()

+
NMSettingWireless *
+nm_connection_get_setting_wireless (NMConnection *connection);

+
A shortcut to return any NMSettingWireless the connection might contain.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
connection :
the NMConnection
-
Returns :
an NMSettingVPN if the connection contains one, otherwise NULL. [transfer none]
-
connection
the NMConnection
 

 

 

+

+
Returns

+
 an NMSettingWireless if the connection contains one, otherwise NULL. 

+
[transfer none]

+

+
 

 

-
nm_connection_get_setting_wimax ()

-
NMSettingWimax *    nm_connection_get_setting_wimax     (NMConnection *connection);

-

-A shortcut to return any NMSettingWimax the connection might contain.
-

-

+
nm_connection_get_setting_wireless_security ()

+
NMSettingWirelessSecurity *
+nm_connection_get_setting_wireless_security
+                               (NMConnection *connection);

+
A shortcut to return any NMSettingWirelessSecurity the connection might contain.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
connection :
the NMConnection
-
Returns :
an NMSettingWimax if the connection contains one, otherwise NULL. [transfer none]
-
connection
the NMConnection
 

 

 

+

+
Returns

+
 an NMSettingWirelessSecurity if the connection contains one, otherwise NULL. 

+
[transfer none]

+

+
 

 

-
nm_connection_get_setting_adsl ()

-
NMSettingAdsl *     nm_connection_get_setting_adsl      (NMConnection *connection);

-

-A shortcut to return any NMSettingAdsl the connection might contain.
-

-

+
nm_connection_get_setting_vlan ()

+
NMSettingVlan *
+nm_connection_get_setting_vlan (NMConnection *connection);

+
A shortcut to return any NMSettingVlan the connection might contain.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
connection :
the NMConnection
-
Returns :
an NMSettingAdsl if the connection contains one, otherwise NULL. [transfer none]
-
connection
the NMConnection
 

 

 

-

+

+
Returns

+
 an NMSettingVlan if the connection contains one, otherwise NULL. 

+
[transfer none]

+

+
+
+

+
Types and Values

 

-
nm_connection_get_setting_wired ()

-
NMSettingWired *    nm_connection_get_setting_wired     (NMConnection *connection);

-

-A shortcut to return any NMSettingWired the connection might contain.
-

-

+
enum NMConnectionError

+
Describes errors that may result from operations involving a NMConnection.

+

+
Members

+
--+++
-
-
+
+
-
-
+
+
-
-

 





 
 
 
connection :
the NMConnection
+
NM_CONNECTION_ERROR_UNKNOWN

+
unknown or unclassified error

 		 
 

 
Returns :
an NMSettingWired if the connection contains one, otherwise NULL. [transfer none]
+
NM_CONNECTION_ERROR_CONNECTION_SETTING_NOT_FOUND

+
the NMConnection object
+  did not contain the required NMSettingConnection object, which must be
+  present for all connections

 		 
 

-

-

-

-
nm_connection_get_setting_wireless ()

-
NMSettingWireless * nm_connection_get_setting_wireless  (NMConnection *connection);

-

-A shortcut to return any NMSettingWireless the connection might contain.
-

-

----
-
-
-
+
+
-
-
+
+




 
connection :
the NMConnection
+
NM_CONNECTION_ERROR_CONNECTION_TYPE_INVALID

+
the 'type' property of the
+  'connection' setting did not point to a valid connection base type; ie
+  it was not a hardware-related setting like NMSettingWired or
+  NMSettingWireless.

 		 
 

 
Returns :
an NMSettingWireless if the connection contains one, otherwise NULL. [transfer none]
+
NM_CONNECTION_ERROR_SETTING_NOT_FOUND

+
the NMConnection object
+  did not contain the specified NMSetting object

 		 
 

 
 

 

+

 

 

-
nm_connection_get_setting_wireless_security ()

-
NMSettingWirelessSecurity * nm_connection_get_setting_wireless_security
-                                                        (NMConnection *connection);

+
NM_CONNECTION_ERROR

+
#define NM_CONNECTION_ERROR nm_connection_error_quark ()
+

 

-A shortcut to return any NMSettingWirelessSecurity the connection might contain.
 

-

----
-
-
-
-
-
-
-
-
-
-
-




connection :
the NMConnection
-
Returns :
an NMSettingWirelessSecurity if the connection contains one, otherwise NULL. [transfer none]
-

 

 

 

-
nm_connection_get_setting_vlan ()

-
NMSettingVlan *     nm_connection_get_setting_vlan      (NMConnection *connection);

+
NM_CONNECTION_PATH

+
#define NM_CONNECTION_PATH "path"
+

 

-A shortcut to return any NMSettingVlan the connection might contain.
 

-

----
-
-
-
-
-
-
-
-
-
-
-




connection :
the NMConnection
-
Returns :
an NMSettingVlan if the connection contains one, otherwise NULL. [transfer none]
-

+

+

+

+
NMConnection

+
typedef struct _NMConnection NMConnection;

+
The NMConnection struct contains only private data.
+It should only be accessed through the functions described below.

 

 
 

 
Property Details

 

-
The "path" property

-
  "path"                     gchar*                : Read / Write / Construct

-

-The connection's D-Bus path, used only by the calling process as a record
-of the D-Bus path of the connection as provided by a settings service.
-

+
The “path” property

+
  “path”                     gchar *

+
The connection's D-Bus path, used only by the calling process as a record
+of the D-Bus path of the connection as provided by a settings service.

+
Flags: Read / Write / Construct

 
Default value: NULL

 

 

 

 
Signal Details

 

-
The "secrets-cleared" signal

-
void                user_function                      (NMConnection *connection,
-                                                        gpointer      user_data)       : Run First

-

-The ::secrets-cleared signal is emitted when the secrets of a connection
-are cleared.
-

-

+
The “secrets-cleared” signal

+
void
+user_function (NMConnection *connection,
+               gpointer      user_data)

+
The ::secrets-cleared signal is emitted when the secrets of a connection
+are cleared.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
connection :
the object on which the signal is emitted
connection
the object on which the signal is emitted
 
 

 
user_data :
user data set when the signal handler was connected.
user_data
user data set when the signal handler was connected.
 
 

 
 

 

+
Flags: Run First

+

 

 

-
The "secrets-updated" signal

-
void                user_function                      (NMConnection *connection,
-                                                        gchar        *setting_name,
-                                                        gpointer      user_data)         : Run First

-

-The ::secrets-updated signal is emitted when the secrets of a setting
-have been changed.
-

-

+
The “secrets-updated” signal

+
void
+user_function (NMConnection *connection,
+               gchar        *setting_name,
+               gpointer      user_data)

+
The ::secrets-updated signal is emitted when the secrets of a setting
+have been changed.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+

 





 
 
 
connection :
the object on which the signal is emitted
connection
the object on which the signal is emitted
 
 

 
setting_name :
the setting name of the NMSetting for which secrets were
-updated
setting_name
the setting name of the NMSetting for which secrets were
+updated
 
 

 
user_data :
user data set when the signal handler was connected.
user_data
user data set when the signal handler was connected.
 
 

 
 

 

+
Flags: Run First

+
 
 
 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.20
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSetting.html b/docs/libnm-util/html/NMSetting.html
index a44ef38f..ae62da3e 100644
--- a/docs/libnm-util/html/NMSetting.html
+++ b/docs/libnm-util/html/NMSetting.html
@@ -2,34 +2,28 @@
 
 
 
-NMSetting
+libnm-util Reference Manual: NMSetting
 
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
 

 

 

@@ -37,215 +31,305 @@
 
NMSetting
NMSetting — Describes related configuration information

-
+

 
 
 

-

-
Synopsis

-
-#include <nm-setting.h>
-
-enum                NMSettingError;
-#define             NM_SETTING_ERROR
-GQuark              nm_setting_error_quark              (void);
-#define             NM_SETTING_PARAM_SERIALIZE
-#define             NM_SETTING_PARAM_REQUIRED
-#define             NM_SETTING_PARAM_SECRET
-#define             NM_SETTING_PARAM_FUZZY_IGNORE
-#define             NM_SETTING_NAME
-enum                NMSettingSecretFlags;
-enum                NMSettingCompareFlags;
-                    NMSetting;
-gboolean            (*NMSettingClearSecretsWithFlagsFn) (NMSetting *setting,
-                                                         const char *secret,
-                                                         NMSettingSecretFlags flags,
-                                                         gpointer user_data);
-                    NMSettingClass;
-void                (*NMSettingValueIterFn)             (NMSetting *setting,
-                                                         const char *key,
-                                                         const GValue *value,
-                                                         GParamFlags flags,
-                                                         gpointer user_data);
-enum                NMSettingHashFlags;
-GHashTable *        nm_setting_to_hash                  (NMSetting *setting,
-                                                         NMSettingHashFlags flags);
-NMSetting *         nm_setting_new_from_hash            (GType setting_type,
-                                                         GHashTable *hash);
-NMSetting *         nm_setting_duplicate                (NMSetting *setting);
-const char *        nm_setting_get_name                 (NMSetting *setting);
-gboolean            nm_setting_verify                   (NMSetting *setting,
-                                                         GSList *all_settings,
-                                                         GError **error);
-gboolean            nm_setting_compare                  (NMSetting *a,
-                                                         NMSetting *b,
-                                                         NMSettingCompareFlags flags);
-enum                NMSettingDiffResult;
-gboolean            nm_setting_diff                     (NMSetting *a,
-                                                         NMSetting *b,
-                                                         NMSettingCompareFlags flags,
-                                                         gboolean invert_results,
-                                                         GHashTable **results);
-void                nm_setting_enumerate_values         (NMSetting *setting,
-                                                         NMSettingValueIterFn func,
-                                                         gpointer user_data);
-char *              nm_setting_to_string                (NMSetting *setting);
-void                nm_setting_clear_secrets            (NMSetting *setting);
-void                nm_setting_clear_secrets_with_flags (NMSetting *setting,
-                                                         NMSettingClearSecretsWithFlagsFn func,
-                                                         gpointer user_data);
-GPtrArray *         nm_setting_need_secrets             (NMSetting *setting);
-gboolean            nm_setting_update_secrets           (NMSetting *setting,
-                                                         GHashTable *secrets,
-                                                         GError **error);
-gboolean            nm_setting_get_secret_flags         (NMSetting *setting,
-                                                         const char *secret_name,
-                                                         NMSettingSecretFlags *out_flags,
-                                                         GError **error);
-gboolean            nm_setting_set_secret_flags         (NMSetting *setting,
-                                                         const char *secret_name,
-                                                         NMSettingSecretFlags flags,
-                                                         GError **error);
-const char *        nm_setting_get_virtual_iface_name   (NMSetting *setting);
-

-

 

-
Object Hierarchy

-
-  GEnum
-   +----NMSettingError
-

-
-  GEnum
-   +----NMSettingSecretFlags
-

-
-  GEnum
-   +----NMSettingCompareFlags
-

-
-  GObject
-   +----NMSetting
-         +----NMSetting8021x
-         +----NMSettingAdsl
-         +----NMSettingBluetooth
-         +----NMSettingBond
-         +----NMSettingBridge
-         +----NMSettingBridgePort
-         +----NMSettingConnection
-         +----NMSettingInfiniband
-         +----NMSettingIP4Config
-         +----NMSettingVlan
-         +----NMSettingIP6Config
-         +----NMSettingPPP
-         +----NMSettingPPPOE
-         +----NMSettingSerial
-         +----NMSettingGsm
-         +----NMSettingCdma
-         +----NMSettingOlpcMesh
-         +----NMSettingWimax
-         +----NMSettingWired
-         +----NMSettingWireless
-         +----NMSettingWirelessSecurity
-         +----NMSettingVPN
-

-
-  GEnum
-   +----NMSettingHashFlags
-

-
-  GEnum
-   +----NMSettingDiffResult
-

-

-

-
Properties

-
-  "name"                     gchar*                : Read / Write
-

-

-

-
Description

-

-Each NMSetting contains properties that describe configuration that applies
-to a specific network layer (like IPv4 or IPv6 configuration) or device type
-(like Ethernet, or WiFi).  A collection of individual settings together
-make up an NMConnection. Each property is strongly typed and usually has
-a number of allowed values.  See each NMSetting subclass for a description
-of properties and allowed values.
-

-

-

-
Details

-

-
enum NMSettingError

-
typedef enum {
-	NM_SETTING_ERROR_UNKNOWN = 0,           /*< nick=UnknownError >*/
-	NM_SETTING_ERROR_PROPERTY_NOT_FOUND,    /*< nick=PropertyNotFound >*/
-	NM_SETTING_ERROR_PROPERTY_NOT_SECRET,   /*< nick=PropertyNotSecret >*/
-	NM_SETTING_ERROR_PROPERTY_TYPE_MISMATCH /*< nick=PropertyTypeMismatch >*/
-} NMSettingError;
-

-

-Describes errors that may result from operations involving a NMSetting.
-

-

+
Functions

+
--++
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

 




 
 
 
NM_SETTING_ERROR_UNKNOWN
unknown or unclassified error
+
+GQuark
 
+nm_setting_error_quark ()
+
#defineNM_SETTING_PARAM_SERIALIZE
#defineNM_SETTING_PARAM_REQUIRED
#defineNM_SETTING_PARAM_SECRET
 

 
NM_SETTING_ERROR_PROPERTY_NOT_FOUND
a property required by the operation
-  was not found; for example, an attempt to update an invalid secret
+#defineNM_SETTING_PARAM_FUZZY_IGNORE

+gboolean
+
+(*NMSettingClearSecretsWithFlagsFn) ()
 
 

 
NM_SETTING_ERROR_PROPERTY_NOT_SECRET
an operation which requires a secret
-  was attempted on a non-secret property
+
+void
+
+(*NMSettingValueIterFn) ()
 
 

 
NM_SETTING_ERROR_PROPERTY_TYPE_MISMATCH
the operation requires a property
-  of a specific type, or the value couldn't be transformed to the same type
-  as the property being acted upon
+
+GHashTable *
+
+nm_setting_to_hash ()
+

+NMSetting *
+
+nm_setting_new_from_hash ()
+

+NMSetting *
+
+nm_setting_duplicate ()
+
const char *
+
+nm_setting_get_name ()
+

+gboolean
+
+nm_setting_verify ()
+

+gboolean
+
+nm_setting_compare ()
+

+gboolean
+
+nm_setting_diff ()
+

+void
+
+nm_setting_enumerate_values ()
+

+char *
+
+nm_setting_to_string ()
+

+void
+
+nm_setting_clear_secrets ()
+

+void
+
+nm_setting_clear_secrets_with_flags ()
+

+GPtrArray *
+
+nm_setting_need_secrets ()
+

+gboolean
+
+nm_setting_update_secrets ()
+

+gboolean
+
+nm_setting_get_secret_flags ()
+

+gboolean
+
+nm_setting_set_secret_flags ()
+
const char *
+
+nm_setting_get_virtual_iface_name ()
 
 

 
 

 

-

-

-
NM_SETTING_ERROR

-
#define NM_SETTING_ERROR nm_setting_error_quark ()
-

-

-

-

-

-

-
nm_setting_error_quark ()

-
GQuark              nm_setting_error_quark              (void);

-

-Registers an error quark for NMSetting if necessary.
-

-

+

+
Properties

+
--+++
-
-
+
+
+

 





 
 
Returns :
the error quark used for NMSetting errors.
+gchar *nameRead / Write
 

 

 

+

+
Types and Values

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+




enumNMSettingError
#defineNM_SETTING_ERROR
#defineNM_SETTING_NAME
enumNMSettingSecretFlags
enumNMSettingCompareFlags
 NMSetting
enumNMSettingHashFlags
enumNMSettingDiffResult

+

+

+
Object Hierarchy

+
    GEnum
+    ├── NMSettingCompareFlags
+    ├── NMSettingDiffResult
+    ├── NMSettingError
+    ├── NMSettingHashFlags
+    ╰── NMSettingSecretFlags
+    GObject
+    ╰── NMSetting
+        ├── NMSetting8021x
+        ├── NMSettingAdsl
+        ├── NMSettingBluetooth
+        ├── NMSettingBond
+        ├── NMSettingBridge
+        ├── NMSettingBridgePort
+        ├── NMSettingConnection
+        ├── NMSettingInfiniband
+        ├── NMSettingIP4Config
+        ├── NMSettingVlan
+        ├── NMSettingIP6Config
+        ├── NMSettingPPP
+        ├── NMSettingPPPOE
+        ├── NMSettingSerial
+        ├── NMSettingGsm
+        ├── NMSettingCdma
+        ├── NMSettingOlpcMesh
+        ├── NMSettingWimax
+        ├── NMSettingWired
+        ├── NMSettingWireless
+        ├── NMSettingWirelessSecurity
+        ╰── NMSettingVPN
+

+

+

+
Includes

+
#include <nm-setting.h>
+

+

+

+
Description

+
Each NMSetting contains properties that describe configuration that applies
+to a specific network layer (like IPv4 or IPv6 configuration) or device type
+(like Ethernet, or WiFi).  A collection of individual settings together
+make up an NMConnection. Each property is strongly typed and usually has
+a number of allowed values.  See each NMSetting subclass for a description
+of properties and allowed values.

+

+

+
Functions

+

+
nm_setting_error_quark ()

+
GQuark
+nm_setting_error_quark (void);

+
Registers an error quark for NMSetting if necessary.

+

+
Returns

+
 the error quark used for NMSetting errors.

+

+

+

 

 

 
NM_SETTING_PARAM_SERIALIZE

@@ -280,920 +364,1012 @@ Registers an error quark for 
-
NM_SETTING_NAME

-
#define NM_SETTING_NAME "name"
-

-

-

-

-

-

-
enum NMSettingSecretFlags

-
typedef enum {
-	NM_SETTING_SECRET_FLAG_NONE         = 0x00000000,
-	NM_SETTING_SECRET_FLAG_AGENT_OWNED  = 0x00000001,
-	NM_SETTING_SECRET_FLAG_NOT_SAVED    = 0x00000002,
-	NM_SETTING_SECRET_FLAG_NOT_REQUIRED = 0x00000004
-
-	/* NOTE: if adding flags, update nm-setting-private.h as well */
-} NMSettingSecretFlags;
-

-

-These flags indicate specific behavior related to handling of a secret.  Each
-secret has a corresponding set of these flags which indicate how the secret
-is to be stored and/or requested when it is needed.
-

-

+
NMSettingClearSecretsWithFlagsFn ()

+
gboolean
+(*NMSettingClearSecretsWithFlagsFn) (NMSetting *setting,
+                                     const char *secret,
+                                     NMSettingSecretFlags flags,
+                                     gpointer user_data);

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+

 





 
 
 
NM_SETTING_SECRET_FLAG_NONE
the system is responsible for providing and
-storing this secret (default)
-
setting
The setting for which secrets are being iterated
 
 

 
NM_SETTING_SECRET_FLAG_AGENT_OWNED
a user secret agent is responsible
-for providing and storing this secret; when it is required agents will be
-asked to retrieve it
-
secret
The secret's name
 
 

 
NM_SETTING_SECRET_FLAG_NOT_SAVED
this secret should not be saved, but
-should be requested from the user each time it is needed
-
flags
The secret's flags, eg NM_SETTING_SECRET_FLAG_AGENT_OWNED
 
 

 
NM_SETTING_SECRET_FLAG_NOT_REQUIRED
in situations where it cannot be
-automatically determined that the secret is required (some VPNs and PPP
-providers dont require all secrets) this flag indicates that the specific
-secret is not required
-
user_data
User data passed to nm_connection_clear_secrets_with_flags()
 
 

 
 

 

+

+
Returns

+
 TRUE to clear the secret, FALSE to not clear the secret

+

+

+

 

 

-
enum NMSettingCompareFlags

-
typedef enum {
-	NM_SETTING_COMPARE_FLAG_EXACT = 0x00000000,
-	NM_SETTING_COMPARE_FLAG_FUZZY = 0x00000001,
-	NM_SETTING_COMPARE_FLAG_IGNORE_ID = 0x00000002,
-	NM_SETTING_COMPARE_FLAG_IGNORE_SECRETS = 0x00000004,
-	NM_SETTING_COMPARE_FLAG_IGNORE_AGENT_OWNED_SECRETS = 0x00000008,
-	NM_SETTING_COMPARE_FLAG_IGNORE_NOT_SAVED_SECRETS = 0x00000010
-} NMSettingCompareFlags;
-

-

-These flags modify the comparison behavior when comparing two settings or
-two connections.
-

-

+
NMSettingValueIterFn ()

+
void
+(*NMSettingValueIterFn) (NMSetting *setting,
+                         const char *key,
+                         const GValue *value,
+                         GParamFlags flags,
+                         gpointer user_data);

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
-
-
-
-
+
+
+

 





 
 
 
NM_SETTING_COMPARE_FLAG_EXACT
match all properties exactly
-
setting
The setting for which properties are being iterated, given to
+nm_setting_enumerate_values()
 
 

 
NM_SETTING_COMPARE_FLAG_FUZZY
match only important attributes, like SSID,
-  type, security settings, etc.  Does not match, for example, connection ID
-  or UUID.
-
key
The value/property name
 
 

 
NM_SETTING_COMPARE_FLAG_IGNORE_ID
ignore the connection's ID
-
value
The property's value
 
 

 
NM_SETTING_COMPARE_FLAG_IGNORE_SECRETS
ignore all secrets
-
flags
The property's flags, like NM_SETTING_PARAM_SECRET
 
 

 
NM_SETTING_COMPARE_FLAG_IGNORE_AGENT_OWNED_SECRETS
ignore secrets for which
-the secret's flags indicate the secret is owned by a user secret agent
-(ie, the secret's flag includes NM_SETTING_SECRET_FLAG_AGENT_OWNED)
-
NM_SETTING_COMPARE_FLAG_IGNORE_NOT_SAVED_SECRETS
ignore secrets for which
-the secret's flags indicate the secret should not be saved to persistent
-storage (ie, the secret's flag includes NM_SETTING_SECRET_FLAG_NOT_SAVED)
-
user_data
User data passed to nm_setting_enumerate_values()
 
 

 
 

 

-

-

-
NMSetting

-
typedef struct _NMSetting NMSetting;

-

-The NMSetting struct contains only private data.
-It should only be accessed through the functions described below.
-

 

 

 

-
NMSettingClearSecretsWithFlagsFn ()

-
gboolean            (*NMSettingClearSecretsWithFlagsFn) (NMSetting *setting,
-                                                         const char *secret,
-                                                         NMSettingSecretFlags flags,
-                                                         gpointer user_data);

-

+
nm_setting_to_hash ()

+
GHashTable *
+nm_setting_to_hash (NMSetting *setting,
+                    NMSettingHashFlags flags);

+
Converts the NMSetting into a GHashTable mapping each setting property
+name to a GValue describing that property, suitable for marshalling over
+D-Bus or serializing.  The mapping is string to GValue.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+

 





 
 
 
setting :
The setting for which secrets are being iterated
setting
the NMSetting
 
 

 
secret :
The secret's name
flags :
The secret's flags, eg NM_SETTING_SECRET_FLAG_AGENT_OWNED
-
flags
hash flags, e.g. NM_SETTING_HASH_FLAG_ALL
 
 

+

+

+
Returns

+
 a new GHashTable
+describing the setting's properties. 

+
[transfer full][element-type utf8 GObject.Value]

+

+

+

+

+
nm_setting_new_from_hash ()

+
NMSetting *
+nm_setting_new_from_hash (GType setting_type,
+                          GHashTable *hash);

+
Creates a new NMSetting object and populates that object with the properties
+contained in the hash table, using each hash key as the property to set,
+and each hash value as the value to set that property to.  Setting properties
+are strongly typed, thus the GValue type of the hash value must be correct.
+See the documentation on each NMSetting object subclass for the correct
+property names and value types.

+

+
Parameters

+

+++++
+
-
-
+
+
+
-
-
+
+
+





 
user_data :
User data passed to nm_connection_clear_secrets_with_flags()
-
setting_type
the NMSetting type which the hash contains properties for
 
 

 
Returns :

-TRUE to clear the secret, FALSE to not clear the secret
hash
 the GHashTable containing a
+string to GValue mapping of properties that apply to the setting. 
[element-type utf8 GObject.Value]
 

 
 

 

+

+
Returns

+
 a new NMSetting object populated with the properties from the
+hash table, or NULL on failure

+

+

+

 

 

-
NMSettingClass

-
typedef struct {
-	GObjectClass parent;
-
-	/* Virtual functions */
-	gboolean    (*verify)            (NMSetting  *setting,
-	                                  GSList     *all_settings,
-	                                  GError     **error);
-
-	GPtrArray  *(*need_secrets)      (NMSetting  *setting);
-
-	gboolean    (*update_one_secret) (NMSetting  *setting,
-	                                  const char *key,
-	                                  GValue     *value,
-	                                  GError    **error);
-
-	gboolean    (*get_secret_flags)  (NMSetting  *setting,
-	                                  const char *secret_name,
-	                                  gboolean verify_secret,
-	                                  NMSettingSecretFlags *out_flags,
-	                                  GError **error);
-
-	gboolean    (*set_secret_flags)  (NMSetting  *setting,
-	                                  const char *secret_name,
-	                                  gboolean verify_secret,
-	                                  NMSettingSecretFlags flags,
-	                                  GError **error);
-
-	/* Returns TRUE if the given property contains the same value in both settings */
-	gboolean    (*compare_property)  (NMSetting *setting,
-	                                  NMSetting *other,
-	                                  const GParamSpec *prop_spec,
-	                                  NMSettingCompareFlags flags);
-
-	void        (*clear_secrets_with_flags) (NMSetting *setting,
-	                                         GParamSpec *pspec,
-	                                         NMSettingClearSecretsWithFlagsFn func,
-	                                         gpointer user_data);
-
-	const char *(*get_virtual_iface_name) (NMSetting *setting);
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-} NMSettingClass;
-

-

-

+
nm_setting_duplicate ()

+
NMSetting *
+nm_setting_duplicate (NMSetting *setting);

+
Duplicates a NMSetting.

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSetting to duplicate
 

+

+

+
Returns

+
 a new NMSetting containing the same properties and values as the
+source NMSetting. 

+
[transfer full]

+

+

+

+

+
nm_setting_get_name ()

+
const char *
+nm_setting_get_name (NMSetting *setting);

+
Returns the type name of the NMSetting object

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSetting
 

+

+

+
Returns

+
 a string containing the type name of the NMSetting object,
+like 'ppp' or 'wireless' or 'wired'.

+

+

 

 

 

-
NMSettingValueIterFn ()

-
void                (*NMSettingValueIterFn)             (NMSetting *setting,
-                                                         const char *key,
-                                                         const GValue *value,
-                                                         GParamFlags flags,
-                                                         gpointer user_data);

-

+
nm_setting_verify ()

+
gboolean
+nm_setting_verify (NMSetting *setting,
+                   GSList *all_settings,
+                   GError **error);

+
Validates the setting.  Each setting's properties have allowed values, and
+some are dependent on other values (hence the need for all_settings
+).  The
+returned GError contains information about which property of the setting
+failed validation, and in what way that property failed validation.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+

 





 
 
 
setting :
The setting for which properties are being iterated, given to
-nm_setting_enumerate_values()
-
setting
the NMSetting to verify
 
 

 
key :
The value/property name
all_settings
 a GSList of all settings
+in the connection from which setting
+came. 
[element-type NMSetting]
 

 
value :
The property's value
flags :
The property's flags, like NM_SETTING_PARAM_SECRET
-
user_data :
User data passed to nm_setting_enumerate_values()
-
error
location to store error, or NULL
 
 

 
 

 

+

+
Returns

+
 TRUE if the setting is valid, FALSE if it is not

+

+

+

 

 

-
enum NMSettingHashFlags

-
typedef enum {
-	NM_SETTING_HASH_FLAG_ALL = 0x00000000,
-	NM_SETTING_HASH_FLAG_NO_SECRETS = 0x00000001,
-	NM_SETTING_HASH_FLAG_ONLY_SECRETS = 0x00000002,
-} NMSettingHashFlags;
-

-

-These flags determine which properties are added to the resulting hash
-when calling nm_setting_to_hash().
-

-

+
nm_setting_compare ()

+
gboolean
+nm_setting_compare (NMSetting *a,
+                    NMSetting *b,
+                    NMSettingCompareFlags flags);

+
Compares two NMSetting objects for similarity, with comparison behavior
+modified by a set of flags.  See the documentation for NMSettingCompareFlags
+for a description of each flag's behavior.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+

 





 
 
 
NM_SETTING_HASH_FLAG_ALL
hash all properties (including secrets)
-
a
a NMSetting
 
 

 
NM_SETTING_HASH_FLAG_NO_SECRETS
do not include secrets
-
b
a second NMSetting to compare with the first
 
 

 
NM_SETTING_HASH_FLAG_ONLY_SECRETS
only hash secrets
-
flags
compare flags, e.g. NM_SETTING_COMPARE_FLAG_EXACT
 
 

 
 

 

+

+
Returns

+
 TRUE if the comparison succeeds, FALSE if it does not

+

+

+
 

 

-
nm_setting_to_hash ()

-
GHashTable *        nm_setting_to_hash                  (NMSetting *setting,
-                                                         NMSettingHashFlags flags);

-

-Converts the NMSetting into a GHashTable mapping each setting property
-name to a GValue describing that property, suitable for marshalling over
-D-Bus or serializing.  The mapping is string to GValue.
-

-

+
nm_setting_diff ()

+
gboolean
+nm_setting_diff (NMSetting *a,
+                 NMSetting *b,
+                 NMSettingCompareFlags flags,
+                 gboolean invert_results,
+                 GHashTable **results);

+
Compares two NMSetting objects for similarity, with comparison behavior
+modified by a set of flags.  See the documentation for NMSettingCompareFlags
+for a description of each flag's behavior.  If the settings differ, the keys
+of each setting that differ from the other are added to results
+, mapped to
+one or more NMSettingDiffResult values.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+

 





 
 
 
setting :
the NMSetting
-
a
a NMSetting
 
 

 
flags :
hash flags, e.g. NM_SETTING_HASH_FLAG_ALL
-
b
a second NMSetting to compare with the first
 
 

 
Returns :
a new GHashTable
-describing the setting's properties. [transfer full][element-type utf8 GObject.Value]
-
flags
compare flags, e.g. NM_SETTING_COMPARE_FLAG_EXACT
 
invert_results
this parameter is used internally by libnm-util and should
+be set to FALSE.  If TRUE inverts the meaning of the NMSettingDiffResult.
 
results
 if the
+settings differ, on return a hash table mapping the differing keys to one or
+more NMSettingDiffResult values OR-ed together.  If the settings do not
+differ, any hash table passed in is unmodified.  If no hash table is passed
+in and the settings differ, a new one is created and returned. 
[inout][transfer full][element-type utf8 guint32]
 

 
 

 

+

+
Returns

+
 TRUE if the settings contain the same values, FALSE if they do not

+

+

+
 

 

-
nm_setting_new_from_hash ()

-
NMSetting *         nm_setting_new_from_hash            (GType setting_type,
-                                                         GHashTable *hash);

-

-Creates a new NMSetting object and populates that object with the properties
-contained in the hash table, using each hash key as the property to set,
-and each hash value as the value to set that property to.  Setting properties
-are strongly typed, thus the GValue type of the hash value must be correct.
-See the documentation on each NMSetting object subclass for the correct
-property names and value types.
-

-

+
nm_setting_enumerate_values ()

+
void
+nm_setting_enumerate_values (NMSetting *setting,
+                             NMSettingValueIterFn func,
+                             gpointer user_data);

+
Iterates over each property of the NMSetting object, calling the supplied
+user function for each property.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting_type :
the NMSetting type which the hash contains properties for
setting
the NMSetting
 
 

 
hash :
the GHashTable containing a
-string to GValue mapping of properties that apply to the setting. [element-type utf8 GObject.Value]
-
func
 user-supplied function called for each property of the setting. 
[scope call]
 

 
Returns :
a new NMSetting object populated with the properties from the
-hash table, or NULL on failure
user_data
user data passed to func
+at each invocation
 
 

 
 

 

+
 

 

-
nm_setting_duplicate ()

-
NMSetting *         nm_setting_duplicate                (NMSetting *setting);

-

-Duplicates a NMSetting.
-

-

+
nm_setting_to_string ()

+
char *
+nm_setting_to_string (NMSetting *setting);

+
Convert the setting into a string.  For debugging purposes ONLY, should NOT
+be used for serialization of the setting, or machine-parsed in any way. The
+output format is not guaranteed to be stable and may change at any time.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSetting to duplicate
Returns :
a new NMSetting containing the same properties and values as the
-source NMSetting. [transfer full]
-
setting
the NMSetting
 

 

 

+

+
Returns

+
 an allocated string containing a textual representation of the
+setting's properties and values (including secrets!), which the caller should
+free with g_free()

+

+

+
 

 

-
nm_setting_get_name ()

-
const char *        nm_setting_get_name                 (NMSetting *setting);

-

-Returns the type name of the NMSetting object
-

-

+
nm_setting_clear_secrets ()

+
void
+nm_setting_clear_secrets (NMSetting *setting);

+
Resets and clears any secrets in the setting.  Secrets should be added to the
+setting only when needed, and cleared immediately after use to prevent
+leakage of information.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSetting
-
Returns :
a string containing the type name of the NMSetting object,
-like 'ppp' or 'wireless' or 'wired'.
setting
the NMSetting
 

 

 

+
 

 

-
nm_setting_verify ()

-
gboolean            nm_setting_verify                   (NMSetting *setting,
-                                                         GSList *all_settings,
-                                                         GError **error);

-

-Validates the setting.  Each setting's properties have allowed values, and
-some are dependent on other values (hence the need for all_settings).  The
-returned GError contains information about which property of the setting
-failed validation, and in what way that property failed validation.
-

-

+
nm_setting_clear_secrets_with_flags ()

+
void
+nm_setting_clear_secrets_with_flags (NMSetting *setting,
+                                     NMSettingClearSecretsWithFlagsFn func,
+                                     gpointer user_data);

+
Clears and frees secrets determined by func
+.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
-
-
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSetting to verify
setting
the NMSetting
 
 

 
all_settings :
a GSList of all settings
-in the connection from which setting came. [element-type NMSetting]
-
error :
location to store error, or NULL
-
func
 function to be called to determine whether a
+specific secret should be cleared or not. 
[scope call]
 

 
Returns :

-TRUE if the setting is valid, FALSE if it is not
user_data
caller-supplied data passed to func
+
 
 

 
 

 

+
 

 

-
nm_setting_compare ()

-
gboolean            nm_setting_compare                  (NMSetting *a,
-                                                         NMSetting *b,
-                                                         NMSettingCompareFlags flags);

-

-Compares two NMSetting objects for similarity, with comparison behavior
-modified by a set of flags.  See the documentation for NMSettingCompareFlags
-for a description of each flag's behavior.
-

-

+
nm_setting_need_secrets ()

+
GPtrArray *
+nm_setting_need_secrets (NMSetting *setting);

+
Returns an array of property names for each secret which may be required
+to make a successful connection.  The returned hints are only intended as a
+guide to what secrets may be required, because in some circumstances, there
+is no way to conclusively determine exactly which secrets are needed.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
a :
a NMSetting
-
b :
a second NMSetting to compare with the first
flags :
compare flags, e.g. NM_SETTING_COMPARE_FLAG_EXACT
-
Returns :

-TRUE if the comparison succeeds, FALSE if it does not
setting
the NMSetting
 

 

 

+

+
Returns

+
 a GPtrArray containing
+the property names of secrets of the NMSetting which may be required; the
+caller owns the array and must free it with g_ptr_array_free(), but must not
+free the elements. 

+
[transfer container][element-type utf8]

+

+
 

 

-
enum NMSettingDiffResult

-
typedef enum {
-	NM_SETTING_DIFF_RESULT_UNKNOWN = 0x00000000,
-	NM_SETTING_DIFF_RESULT_IN_A =    0x00000001,
-	NM_SETTING_DIFF_RESULT_IN_B =    0x00000002,
-} NMSettingDiffResult;
-

-

-These values indicate the result of a setting difference operation.
-

-

+
nm_setting_update_secrets ()

+
gboolean
+nm_setting_update_secrets (NMSetting *setting,
+                           GHashTable *secrets,
+                           GError **error);

+
Update the setting's secrets, given a hash table of secrets intended for that
+setting (deserialized from D-Bus for example).

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+

 





 
 
 
NM_SETTING_DIFF_RESULT_UNKNOWN
unknown result
-
setting
the NMSetting
 
 

 
NM_SETTING_DIFF_RESULT_IN_A
the property is present in setting A
-
secrets
 a GHashTable mapping
+string to GValue of setting property names and secrets. 
[element-type utf8 GObject.Value]
 

 
NM_SETTING_DIFF_RESULT_IN_B
the property is present in setting B
-
error
location to store error, or NULL
 
 

 
 

 

+

+
Returns

+
 TRUE if the secrets were successfully updated, FALSE on failure to
+update one or more of the secrets.

+

+

+
 

 

-
nm_setting_diff ()

-
gboolean            nm_setting_diff                     (NMSetting *a,
-                                                         NMSetting *b,
-                                                         NMSettingCompareFlags flags,
-                                                         gboolean invert_results,
-                                                         GHashTable **results);

-

-Compares two NMSetting objects for similarity, with comparison behavior
-modified by a set of flags.  See the documentation for NMSettingCompareFlags
-for a description of each flag's behavior.  If the settings differ, the keys
-of each setting that differ from the other are added to results, mapped to
-one or more NMSettingDiffResult values.
-

-

+
nm_setting_get_secret_flags ()

+
gboolean
+nm_setting_get_secret_flags (NMSetting *setting,
+                             const char *secret_name,
+                             NMSettingSecretFlags *out_flags,
+                             GError **error);

+
For a given secret, retrieves the NMSettingSecretFlags describing how to
+handle that secret.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+

 





 
 
 
a :
a NMSetting
-
setting
the NMSetting
 
 

 
b :
a second NMSetting to compare with the first
secret_name
the secret key name to get flags for
 
 

 
flags :
compare flags, e.g. NM_SETTING_COMPARE_FLAG_EXACT
-
out_flags
on success, the NMSettingSecretFlags for the secret
 
 

 
invert_results :
this parameter is used internally by libnm-util and should
-be set to FALSE.  If TRUE inverts the meaning of the NMSettingDiffResult.
results :
if the
-settings differ, on return a hash table mapping the differing keys to one or
-more NMSettingDiffResult values OR-ed together.  If the settings do not
-differ, any hash table passed in is unmodified.  If no hash table is passed
-in and the settings differ, a new one is created and returned. [inout][transfer full][element-type utf8 guint32]
-
Returns :

-TRUE if the settings contain the same values, FALSE if they do not
error
location to store error, or NULL
 
 

 
 

 

+

+
Returns

+
 TRUE on success (if the given secret name was a valid property of
+this setting, and if that property is secret), FALSE if not

+

+

+
 

 

-
nm_setting_enumerate_values ()

-
void                nm_setting_enumerate_values         (NMSetting *setting,
-                                                         NMSettingValueIterFn func,
-                                                         gpointer user_data);

-

-Iterates over each property of the NMSetting object, calling the supplied
-user function for each property.
-

-

+
nm_setting_set_secret_flags ()

+
gboolean
+nm_setting_set_secret_flags (NMSetting *setting,
+                             const char *secret_name,
+                             NMSettingSecretFlags flags,
+                             GError **error);

+
For a given secret, retrieves the NMSettingSecretFlags describing how to
+handle that secret.

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+
-
-

 





 
 
 
setting :
the NMSetting
-
func :
user-supplied function called for each property of the setting. [scope call]
-
setting
the NMSetting
 
 

 
user_data :
user data passed to func at each invocation
secret_name
the secret key name to set flags for
 
 

-

-

-

-
nm_setting_to_string ()

-
char *              nm_setting_to_string                (NMSetting *setting);

-

-Convert the setting into a string.  For debugging purposes ONLY, should NOT
-be used for serialization of the setting, or machine-parsed in any way. The
-output format is not guaranteed to be stable and may change at any time.
-

-

----
-
-
-
+
+
+
-
-
+
+
+




 
setting :
the NMSetting
-
flags
the NMSettingSecretFlags for the secret
 
 

 
Returns :
an allocated string containing a textual representation of the
-setting's properties and values (including secrets!), which the caller should
-free with g_free()
-
error
location to store error, or NULL
 
 

 
 

 

+

+
Returns

+
 TRUE on success (if the given secret name was a valid property of
+this setting, and if that property is secret), FALSE if not

+

+

+
 

 

-
nm_setting_clear_secrets ()

-
void                nm_setting_clear_secrets            (NMSetting *setting);

-

-Resets and clears any secrets in the setting.  Secrets should be added to the
-setting only when needed, and cleared immediately after use to prevent
-leakage of information.
-

-

+
nm_setting_get_virtual_iface_name ()

+
const char *
+nm_setting_get_virtual_iface_name (NMSetting *setting);

+
Returns the name of the virtual kernel interface which the connection
+needs to use if specified in the settings.

+

+
Parameters

+
--+++
-
-
+
+
+

 





 
 
setting :
the NMSetting
-
setting
the NMSetting
 
 

 

 

-

+

+
Returns

+
 Name of the virtual interface or NULL if the setting does not
+support this feature

+

+

+
+
+

+
Types and Values

 

-
nm_setting_clear_secrets_with_flags ()

-
void                nm_setting_clear_secrets_with_flags (NMSetting *setting,
-                                                         NMSettingClearSecretsWithFlagsFn func,
-                                                         gpointer user_data);

-

-Clears and frees secrets determined by func.
-

-

+
enum NMSettingError

+
Describes errors that may result from operations involving a NMSetting.

+

+
Members

+
--+++
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+

 





 
 
 
setting :
the NMSetting
+
NM_SETTING_ERROR_UNKNOWN

+
unknown or unclassified error

 		 
 

 
func :
function to be called to determine whether a
-specific secret should be cleared or not. [scope call]
+
NM_SETTING_ERROR_PROPERTY_NOT_FOUND

+
a property required by the operation
+  was not found; for example, an attempt to update an invalid secret

 		 
 

 
user_data :
caller-supplied data passed to func
+
NM_SETTING_ERROR_PROPERTY_NOT_SECRET

+
an operation which requires a secret
+  was attempted on a non-secret property

 		 
NM_SETTING_ERROR_PROPERTY_TYPE_MISMATCH

+
the operation requires a property
+  of a specific type, or the value couldn't be transformed to the same type
+  as the property being acted upon

+		 
 

 
 

 

+

 

 

-
nm_setting_need_secrets ()

-
GPtrArray *         nm_setting_need_secrets             (NMSetting *setting);

+
NM_SETTING_ERROR

+
#define NM_SETTING_ERROR nm_setting_error_quark ()
+

 

-Returns an array of property names for each secret which may be required
-to make a successful connection.  The returned hints are only intended as a
-guide to what secrets may be required, because in some circumstances, there
-is no way to conclusively determine exactly which secrets are needed.
 

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSetting
-
Returns :
a GPtrArray containing
-the property names of secrets of the NMSetting which may be required; the
-caller owns the array and must free it with g_ptr_array_free(), but must not
-free the elements. [transfer container][element-type utf8]
-

 

 

 

-
nm_setting_update_secrets ()

-
gboolean            nm_setting_update_secrets           (NMSetting *setting,
-                                                         GHashTable *secrets,
-                                                         GError **error);

+
NM_SETTING_NAME

+
#define NM_SETTING_NAME "name"
+

 

-Update the setting's secrets, given a hash table of secrets intended for that
-setting (deserialized from D-Bus for example).
 

-

+
+

+

+
enum NMSettingSecretFlags

+
These flags indicate specific behavior related to handling of a secret.  Each
+secret has a corresponding set of these flags which indicate how the secret
+is to be stored and/or requested when it is needed.

+

+
Members

+
--+++
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSetting
+
NM_SETTING_SECRET_FLAG_NONE

+
the system is responsible for providing and
+storing this secret (default)

 		 
 

 
secrets :
a GHashTable mapping
-string to GValue of setting property names and secrets. [element-type utf8 GObject.Value]
+
NM_SETTING_SECRET_FLAG_AGENT_OWNED

+
a user secret agent is responsible
+for providing and storing this secret; when it is required agents will be
+asked to retrieve it

 		 
 

 
error :
location to store error, or NULL
+
NM_SETTING_SECRET_FLAG_NOT_SAVED

+
this secret should not be saved, but
+should be requested from the user each time it is needed

 		 
 

 
Returns :

-TRUE if the secrets were successfully updated, FALSE on failure to
-update one or more of the secrets.
NM_SETTING_SECRET_FLAG_NOT_REQUIRED

+
in situations where it cannot be
+automatically determined that the secret is required (some VPNs and PPP
+providers dont require all secrets) this flag indicates that the specific
+secret is not required

+		 
 

 
 

 

+
 

 

-
nm_setting_get_secret_flags ()

-
gboolean            nm_setting_get_secret_flags         (NMSetting *setting,
-                                                         const char *secret_name,
-                                                         NMSettingSecretFlags *out_flags,
-                                                         GError **error);

-

-For a given secret, retrieves the NMSettingSecretFlags describing how to
-handle that secret.
-

-

+
enum NMSettingCompareFlags

+
These flags modify the comparison behavior when comparing two settings or
+two connections.

+

+
Members

+
--+++
-
-
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+

 





 
 
 
setting :
the NMSetting
+
NM_SETTING_COMPARE_FLAG_EXACT

+
match all properties exactly

 		 
 

 
secret_name :
the secret key name to get flags for
NM_SETTING_COMPARE_FLAG_FUZZY

+
match only important attributes, like SSID,
+  type, security settings, etc.  Does not match, for example, connection ID
+  or UUID.

+		 
 

 
out_flags :
on success, the NMSettingSecretFlags for the secret
NM_SETTING_COMPARE_FLAG_IGNORE_ID

+
ignore the connection's ID

+		 
 

 
error :
location to store error, or NULL
+
NM_SETTING_COMPARE_FLAG_IGNORE_SECRETS

+
ignore all secrets

 		 
 

 
Returns :
TRUE on success (if the given secret name was a valid property of
-this setting, and if that property is secret), FALSE if not
NM_SETTING_COMPARE_FLAG_IGNORE_AGENT_OWNED_SECRETS

+
ignore secrets for which
+the secret's flags indicate the secret is owned by a user secret agent
+(ie, the secret's flag includes NM_SETTING_SECRET_FLAG_AGENT_OWNED
+)

+		 
NM_SETTING_COMPARE_FLAG_IGNORE_NOT_SAVED_SECRETS

+
ignore secrets for which
+the secret's flags indicate the secret should not be saved to persistent
+storage (ie, the secret's flag includes NM_SETTING_SECRET_FLAG_NOT_SAVED
+)

+		 
 

 
 

 

+
 

 

-
nm_setting_set_secret_flags ()

-
gboolean            nm_setting_set_secret_flags         (NMSetting *setting,
-                                                         const char *secret_name,
-                                                         NMSettingSecretFlags flags,
-                                                         GError **error);

-

-For a given secret, retrieves the NMSettingSecretFlags describing how to
-handle that secret.
-

-

+
NMSetting

+
typedef struct _NMSetting NMSetting;

+
The NMSetting struct contains only private data.
+It should only be accessed through the functions described below.

+
+

+

+
enum NMSettingHashFlags

+
These flags determine which properties are added to the resulting hash
+when calling nm_setting_to_hash().

+

+
Members

+
--+++
-
-
+
+
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSetting
+
NM_SETTING_HASH_FLAG_ALL

+
hash all properties (including secrets)

 		 
 

 
secret_name :
the secret key name to set flags for
flags :
the NMSettingSecretFlags for the secret
error :
location to store error, or NULL
+
NM_SETTING_HASH_FLAG_NO_SECRETS

+
do not include secrets

 		 
 

 
Returns :
TRUE on success (if the given secret name was a valid property of
-this setting, and if that property is secret), FALSE if not
NM_SETTING_HASH_FLAG_ONLY_SECRETS

+
only hash secrets

+		 
 

 
 

 

+
 

 

-
nm_setting_get_virtual_iface_name ()

-
const char *        nm_setting_get_virtual_iface_name   (NMSetting *setting);

-

-Returns the name of the virtual kernel interface which the connection
-needs to use if specified in the settings.
-

-

+
enum NMSettingDiffResult

+
These values indicate the result of a setting difference operation.

+

+
Members

+
--+++
-
-
+
+
-
-
+
+
+
+
+
+
+
+

 





 
 
 
setting :
the NMSetting
+
NM_SETTING_DIFF_RESULT_UNKNOWN

+
unknown result

 		 
 

 
Returns :
Name of the virtual interface or NULL if the setting does not
-support this feature
NM_SETTING_DIFF_RESULT_IN_A

+
the property is present in setting A

+		 
NM_SETTING_DIFF_RESULT_IN_B

+
the property is present in setting B

+		 
 

 
 

 

 
+
 

 
Property Details

 

-
The "name" property

-
  "name"                     gchar*                : Read / Write

-

-The setting's name, which uniquely identifies the setting within the
+
The “name” property

+
  “name”                     gchar *

+
The setting's name, which uniquely identifies the setting within the
 connection.  Each setting type has a name unique to that type, for
-example 'ppp' or 'wireless' or 'wired'.
-

+example 'ppp' or 'wireless' or 'wired'.

+
Flags: Read / Write

 
Default value: NULL

 

 

 
 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.20
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSetting8021x.html b/docs/libnm-util/html/NMSetting8021x.html
index 0078c61b..67162ead 100644
--- a/docs/libnm-util/html/NMSetting8021x.html
+++ b/docs/libnm-util/html/NMSetting8021x.html
@@ -2,34 +2,28 @@
 
 
 
-NMSetting8021x
+libnm-util Reference Manual: NMSetting8021x
 
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
 

 

 

@@ -37,3091 +31,3780 @@
 
NMSetting8021x
NMSetting8021x — Describes 802.1x-authenticated connection properties

-
+

 
 
 

-

-
Synopsis

-
-#include <nm-setting-8021x.h>
-
-enum                NMSetting8021xCKFormat;
-enum                NMSetting8021xCKScheme;
-#define             NM_SETTING_802_1X_SETTING_NAME
-enum                NMSetting8021xError;
-#define             NM_SETTING_802_1X_ERROR
-GQuark              nm_setting_802_1x_error_quark       (void);
-#define             NM_SETTING_802_1X_EAP
-#define             NM_SETTING_802_1X_IDENTITY
-#define             NM_SETTING_802_1X_ANONYMOUS_IDENTITY
-#define             NM_SETTING_802_1X_PAC_FILE
-#define             NM_SETTING_802_1X_CA_CERT
-#define             NM_SETTING_802_1X_CA_PATH
-#define             NM_SETTING_802_1X_SUBJECT_MATCH
-#define             NM_SETTING_802_1X_ALTSUBJECT_MATCHES
-#define             NM_SETTING_802_1X_CLIENT_CERT
-#define             NM_SETTING_802_1X_PHASE1_PEAPVER
-#define             NM_SETTING_802_1X_PHASE1_PEAPLABEL
-#define             NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING
-#define             NM_SETTING_802_1X_PHASE2_AUTH
-#define             NM_SETTING_802_1X_PHASE2_AUTHEAP
-#define             NM_SETTING_802_1X_PHASE2_CA_CERT
-#define             NM_SETTING_802_1X_PHASE2_CA_PATH
-#define             NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH
-#define             NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES
-#define             NM_SETTING_802_1X_PHASE2_CLIENT_CERT
-#define             NM_SETTING_802_1X_PASSWORD
-#define             NM_SETTING_802_1X_PASSWORD_FLAGS
-#define             NM_SETTING_802_1X_PASSWORD_RAW
-#define             NM_SETTING_802_1X_PASSWORD_RAW_FLAGS
-#define             NM_SETTING_802_1X_PRIVATE_KEY
-#define             NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD
-#define             NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS
-#define             NM_SETTING_802_1X_PHASE2_PRIVATE_KEY
-#define             NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD
-#define             NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS
-#define             NM_SETTING_802_1X_PIN
-#define             NM_SETTING_802_1X_PIN_FLAGS
-#define             NM_SETTING_802_1X_SYSTEM_CA_CERTS
-                    NMSetting8021x;
-                    NMSetting8021xClass;
-NMSetting *         nm_setting_802_1x_new               (void);
-guint32             nm_setting_802_1x_get_num_eap_methods
-                                                        (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_eap_method    (NMSetting8021x *setting,
-                                                         guint32 i);
-gboolean            nm_setting_802_1x_add_eap_method    (NMSetting8021x *setting,
-                                                         const char *eap);
-void                nm_setting_802_1x_remove_eap_method (NMSetting8021x *setting,
-                                                         guint32 i);
-void                nm_setting_802_1x_clear_eap_methods (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_identity      (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_anonymous_identity
-                                                        (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_pac_file      (NMSetting8021x *setting);
-gboolean            nm_setting_802_1x_get_system_ca_certs
-                                                        (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_ca_path       (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_phase2_ca_path
-                                                        (NMSetting8021x *setting);
-NMSetting8021xCKScheme nm_setting_802_1x_get_ca_cert_scheme
-                                                        (NMSetting8021x *setting);
-const GByteArray *  nm_setting_802_1x_get_ca_cert_blob  (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_ca_cert_path  (NMSetting8021x *setting);
-gboolean            nm_setting_802_1x_set_ca_cert       (NMSetting8021x *setting,
-                                                         const char *cert_path,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
-                                                         GError **error);
-const char *        nm_setting_802_1x_get_subject_match (NMSetting8021x *setting);
-guint32             nm_setting_802_1x_get_num_altsubject_matches
-                                                        (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_altsubject_match
-                                                        (NMSetting8021x *setting,
-                                                         guint32 i);
-gboolean            nm_setting_802_1x_add_altsubject_match
-                                                        (NMSetting8021x *setting,
-                                                         const char *altsubject_match);
-void                nm_setting_802_1x_remove_altsubject_match
-                                                        (NMSetting8021x *setting,
-                                                         guint32 i);
-void                nm_setting_802_1x_clear_altsubject_matches
-                                                        (NMSetting8021x *setting);
-NMSetting8021xCKScheme nm_setting_802_1x_get_client_cert_scheme
-                                                        (NMSetting8021x *setting);
-const GByteArray *  nm_setting_802_1x_get_client_cert_blob
-                                                        (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_client_cert_path
-                                                        (NMSetting8021x *setting);
-gboolean            nm_setting_802_1x_set_client_cert   (NMSetting8021x *setting,
-                                                         const char *cert_path,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
-                                                         GError **error);
-const char *        nm_setting_802_1x_get_phase1_peapver
-                                                        (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_phase1_peaplabel
-                                                        (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_phase1_fast_provisioning
-                                                        (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_phase2_auth   (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_phase2_autheap
-                                                        (NMSetting8021x *setting);
-NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_ca_cert_scheme
-                                                        (NMSetting8021x *setting);
-const GByteArray *  nm_setting_802_1x_get_phase2_ca_cert_blob
-                                                        (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_phase2_ca_cert_path
-                                                        (NMSetting8021x *setting);
-gboolean            nm_setting_802_1x_set_phase2_ca_cert
-                                                        (NMSetting8021x *setting,
-                                                         const char *cert_path,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
-                                                         GError **error);
-const char *        nm_setting_802_1x_get_phase2_subject_match
-                                                        (NMSetting8021x *setting);
-guint32             nm_setting_802_1x_get_num_phase2_altsubject_matches
-                                                        (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_phase2_altsubject_match
-                                                        (NMSetting8021x *setting,
-                                                         guint32 i);
-gboolean            nm_setting_802_1x_add_phase2_altsubject_match
-                                                        (NMSetting8021x *setting,
-                                                         const char *phase2_altsubject_match);
-void                nm_setting_802_1x_remove_phase2_altsubject_match
-                                                        (NMSetting8021x *setting,
-                                                         guint32 i);
-void                nm_setting_802_1x_clear_phase2_altsubject_matches
-                                                        (NMSetting8021x *setting);
-NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_client_cert_scheme
-                                                        (NMSetting8021x *setting);
-const GByteArray *  nm_setting_802_1x_get_phase2_client_cert_blob
-                                                        (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_phase2_client_cert_path
-                                                        (NMSetting8021x *setting);
-gboolean            nm_setting_802_1x_set_phase2_client_cert
-                                                        (NMSetting8021x *setting,
-                                                         const char *cert_path,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
-                                                         GError **error);
-const char *        nm_setting_802_1x_get_password      (NMSetting8021x *setting);
-NMSettingSecretFlags nm_setting_802_1x_get_password_flags
-                                                        (NMSetting8021x *setting);
-const GByteArray *  nm_setting_802_1x_get_password_raw  (NMSetting8021x *setting);
-NMSettingSecretFlags nm_setting_802_1x_get_password_raw_flags
-                                                        (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_pin           (NMSetting8021x *setting);
-NMSettingSecretFlags nm_setting_802_1x_get_pin_flags    (NMSetting8021x *setting);
-NMSetting8021xCKScheme nm_setting_802_1x_get_private_key_scheme
-                                                        (NMSetting8021x *setting);
-const GByteArray *  nm_setting_802_1x_get_private_key_blob
-                                                        (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_private_key_path
-                                                        (NMSetting8021x *setting);
-gboolean            nm_setting_802_1x_set_private_key   (NMSetting8021x *setting,
-                                                         const char *key_path,
-                                                         const char *password,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
-                                                         GError **error);
-const char *        nm_setting_802_1x_get_private_key_password
-                                                        (NMSetting8021x *setting);
-NMSettingSecretFlags nm_setting_802_1x_get_private_key_password_flags
-                                                        (NMSetting8021x *setting);
-NMSetting8021xCKFormat nm_setting_802_1x_get_private_key_format
-                                                        (NMSetting8021x *setting);
-NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_private_key_scheme
-                                                        (NMSetting8021x *setting);
-const GByteArray *  nm_setting_802_1x_get_phase2_private_key_blob
-                                                        (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_phase2_private_key_path
-                                                        (NMSetting8021x *setting);
-gboolean            nm_setting_802_1x_set_phase2_private_key
-                                                        (NMSetting8021x *setting,
-                                                         const char *key_path,
-                                                         const char *password,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
-                                                         GError **error);
-const char *        nm_setting_802_1x_get_phase2_private_key_password
-                                                        (NMSetting8021x *setting);
-NMSettingSecretFlags nm_setting_802_1x_get_phase2_private_key_password_flags
-                                                        (NMSetting8021x *setting);
-NMSetting8021xCKFormat nm_setting_802_1x_get_phase2_private_key_format
-                                                        (NMSetting8021x *setting);
-

-

 

-
Object Hierarchy

-
-  GEnum
-   +----NMSetting8021xCKFormat
-

-
-  GEnum
-   +----NMSetting8021xCKScheme
-

-
-  GEnum
-   +----NMSetting8021xError
-

-
-  GObject
-   +----NMSetting
-         +----NMSetting8021x
-

+
Functions

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





+GQuark
+
+nm_setting_802_1x_error_quark ()
+

+NMSetting *
+
+nm_setting_802_1x_new ()
+

+guint32
+
+nm_setting_802_1x_get_num_eap_methods ()
+
const char *
+
+nm_setting_802_1x_get_eap_method ()
+

+gboolean
+
+nm_setting_802_1x_add_eap_method ()
+

+void
+
+nm_setting_802_1x_remove_eap_method ()
+

+void
+
+nm_setting_802_1x_clear_eap_methods ()
+
const char *
+
+nm_setting_802_1x_get_identity ()
+
const char *
+
+nm_setting_802_1x_get_anonymous_identity ()
+
const char *
+
+nm_setting_802_1x_get_pac_file ()
+

+gboolean
+
+nm_setting_802_1x_get_system_ca_certs ()
+
const char *
+
+nm_setting_802_1x_get_ca_path ()
+
const char *
+
+nm_setting_802_1x_get_phase2_ca_path ()
+

+NMSetting8021xCKScheme
+
+nm_setting_802_1x_get_ca_cert_scheme ()
+
const GByteArray *
+
+nm_setting_802_1x_get_ca_cert_blob ()
+
const char *
+
+nm_setting_802_1x_get_ca_cert_path ()
+

+gboolean
+
+nm_setting_802_1x_set_ca_cert ()
+
const char *
+
+nm_setting_802_1x_get_subject_match ()
+

+guint32
+
+nm_setting_802_1x_get_num_altsubject_matches ()
+
const char *
+
+nm_setting_802_1x_get_altsubject_match ()
+

+gboolean
+
+nm_setting_802_1x_add_altsubject_match ()
+

+void
+
+nm_setting_802_1x_remove_altsubject_match ()
+

+void
+
+nm_setting_802_1x_clear_altsubject_matches ()
+

+NMSetting8021xCKScheme
+
+nm_setting_802_1x_get_client_cert_scheme ()
+
const GByteArray *
+
+nm_setting_802_1x_get_client_cert_blob ()
+
const char *
+
+nm_setting_802_1x_get_client_cert_path ()
+

+gboolean
+
+nm_setting_802_1x_set_client_cert ()
+
const char *
+
+nm_setting_802_1x_get_phase1_peapver ()
+
const char *
+
+nm_setting_802_1x_get_phase1_peaplabel ()
+
const char *
+
+nm_setting_802_1x_get_phase1_fast_provisioning ()
+
const char *
+
+nm_setting_802_1x_get_phase2_auth ()
+
const char *
+
+nm_setting_802_1x_get_phase2_autheap ()
+

+NMSetting8021xCKScheme
+
+nm_setting_802_1x_get_phase2_ca_cert_scheme ()
+
const GByteArray *
+
+nm_setting_802_1x_get_phase2_ca_cert_blob ()
+
const char *
+
+nm_setting_802_1x_get_phase2_ca_cert_path ()
+

+gboolean
+
+nm_setting_802_1x_set_phase2_ca_cert ()
+
const char *
+
+nm_setting_802_1x_get_phase2_subject_match ()
+

+guint32
+
+nm_setting_802_1x_get_num_phase2_altsubject_matches ()
+
const char *
+
+nm_setting_802_1x_get_phase2_altsubject_match ()
+

+gboolean
+
+nm_setting_802_1x_add_phase2_altsubject_match ()
+

+void
+
+nm_setting_802_1x_remove_phase2_altsubject_match ()
+

+void
+
+nm_setting_802_1x_clear_phase2_altsubject_matches ()
+

+NMSetting8021xCKScheme
+
+nm_setting_802_1x_get_phase2_client_cert_scheme ()
+
const GByteArray *
+
+nm_setting_802_1x_get_phase2_client_cert_blob ()
+
const char *
+
+nm_setting_802_1x_get_phase2_client_cert_path ()
+

+gboolean
+
+nm_setting_802_1x_set_phase2_client_cert ()
+
const char *
+
+nm_setting_802_1x_get_password ()
+

+NMSettingSecretFlags
+
+nm_setting_802_1x_get_password_flags ()
+
const GByteArray *
+
+nm_setting_802_1x_get_password_raw ()
+

+NMSettingSecretFlags
+
+nm_setting_802_1x_get_password_raw_flags ()
+
const char *
+
+nm_setting_802_1x_get_pin ()
+

+NMSettingSecretFlags
+
+nm_setting_802_1x_get_pin_flags ()
+

+NMSetting8021xCKScheme
+
+nm_setting_802_1x_get_private_key_scheme ()
+
const GByteArray *
+
+nm_setting_802_1x_get_private_key_blob ()
+
const char *
+
+nm_setting_802_1x_get_private_key_path ()
+

+gboolean
+
+nm_setting_802_1x_set_private_key ()
+
const char *
+
+nm_setting_802_1x_get_private_key_password ()
+

+NMSettingSecretFlags
+
+nm_setting_802_1x_get_private_key_password_flags ()
+

+NMSetting8021xCKFormat
+
+nm_setting_802_1x_get_private_key_format ()
+

+NMSetting8021xCKScheme
+
+nm_setting_802_1x_get_phase2_private_key_scheme ()
+
const GByteArray *
+
+nm_setting_802_1x_get_phase2_private_key_blob ()
+
const char *
+
+nm_setting_802_1x_get_phase2_private_key_path ()
+

+gboolean
+
+nm_setting_802_1x_set_phase2_private_key ()
+
const char *
+
+nm_setting_802_1x_get_phase2_private_key_password ()
+

+NMSettingSecretFlags
+
+nm_setting_802_1x_get_phase2_private_key_password_flags ()
+

+NMSetting8021xCKFormat
+
+nm_setting_802_1x_get_phase2_private_key_format ()
+

 

 

 
Properties

-
-  "altsubject-matches"       GSList_gchararray_*   : Read / Write
-  "anonymous-identity"       gchar*                : Read / Write
-  "ca-cert"                  GArray_guchar_*       : Read / Write
-  "ca-path"                  gchar*                : Read / Write
-  "client-cert"              GArray_guchar_*       : Read / Write
-  "eap"                      GSList_gchararray_*   : Read / Write
-  "identity"                 gchar*                : Read / Write
-  "pac-file"                 gchar*                : Read / Write
-  "password"                 gchar*                : Read / Write
-  "password-flags"           guint                 : Read / Write
-  "password-raw"             GArray_guchar_*       : Read / Write
-  "password-raw-flags"       guint                 : Read / Write
-  "phase1-fast-provisioning" gchar*                : Read / Write
-  "phase1-peaplabel"         gchar*                : Read / Write
-  "phase1-peapver"           gchar*                : Read / Write
-  "phase2-altsubject-matches" GSList_gchararray_*   : Read / Write
-  "phase2-auth"              gchar*                : Read / Write
-  "phase2-autheap"           gchar*                : Read / Write
-  "phase2-ca-cert"           GArray_guchar_*       : Read / Write
-  "phase2-ca-path"           gchar*                : Read / Write
-  "phase2-client-cert"       GArray_guchar_*       : Read / Write
-  "phase2-private-key"       GArray_guchar_*       : Read / Write
-  "phase2-private-key-password" gchar*                : Read / Write
-  "phase2-private-key-password-flags" guint                 : Read / Write
-  "phase2-subject-match"     gchar*                : Read / Write
-  "pin"                      gchar*                : Read / Write
-  "pin-flags"                guint                 : Read / Write
-  "private-key"              GArray_guchar_*       : Read / Write
-  "private-key-password"     gchar*                : Read / Write
-  "private-key-password-flags" guint                 : Read / Write
-  "subject-match"            gchar*                : Read / Write
-  "system-ca-certs"          gboolean              : Read / Write / Construct
-

-

-

-
Description

-

-The NMSetting8021x object is a NMSetting subclass that describes
-properties necessary for connection to 802.1x-authenticated networks, such as
-WPA and WPA2 Enterprise WiFi networks and wired 802.1x networks.  802.1x
-connections typically use certificates and/or EAP authentication methods to
-securely verify, identify, and authenticate the client to the network itself,
-instead of simply relying on a widely shared static key.
-

-

-It's a good idea to read up on wpa_supplicant configuration before using this
-setting extensively, since most of the options here correspond closely with
-the relevant wpa_supplicant configuration options.
-

-

-Furthermore, to get a good idea of 802.1x, EAP, TLS, TTLS, etc and their
-applications to WiFi and wired networks, you'll want to get copies of the
-following books.
-

-

- 802.11 Wireless Networks: The Definitive Guide, Second Edition
-      Author: Matthew Gast
-      ISBN: 978-0596100520
-

-

- Cisco Wireless LAN Security
-      Authors: Krishna Sankar, Sri Sundaralingam, Darrin Miller, and Andrew Balinsky
-      ISBN: 978-1587051548
-

+

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+






+GSList_gchararray_ *altsubject-matchesRead / Write

+gchar *anonymous-identityRead / Write

+GArray_guchar_ *ca-certRead / Write

+gchar *ca-pathRead / Write

+GArray_guchar_ *client-certRead / Write

+GSList_gchararray_ *eapRead / Write

+gchar *identityRead / Write

+gchar *pac-fileRead / Write

+gchar *passwordRead / Write
guintpassword-flagsRead / Write

+GArray_guchar_ *password-rawRead / Write
guintpassword-raw-flagsRead / Write

+gchar *phase1-fast-provisioningRead / Write

+gchar *phase1-peaplabelRead / Write

+gchar *phase1-peapverRead / Write

+GSList_gchararray_ *phase2-altsubject-matchesRead / Write

+gchar *phase2-authRead / Write

+gchar *phase2-autheapRead / Write

+GArray_guchar_ *phase2-ca-certRead / Write

+gchar *phase2-ca-pathRead / Write

+GArray_guchar_ *phase2-client-certRead / Write

+GArray_guchar_ *phase2-private-keyRead / Write

+gchar *phase2-private-key-passwordRead / Write
guintphase2-private-key-password-flagsRead / Write

+gchar *phase2-subject-matchRead / Write

+gchar *pinRead / Write
guintpin-flagsRead / Write

+GArray_guchar_ *private-keyRead / Write

+gchar *private-key-passwordRead / Write
guintprivate-key-password-flagsRead / Write

+gchar *subject-matchRead / Write
gbooleansystem-ca-certsRead / Write / Construct

 

 

-
Details

-

-
enum NMSetting8021xCKFormat

-
typedef enum {
- /*< underscore_name=nm_setting_802_1x_ck_format >*/
-	NM_SETTING_802_1X_CK_FORMAT_UNKNOWN = 0,
-	NM_SETTING_802_1X_CK_FORMAT_X509,
-	NM_SETTING_802_1X_CK_FORMAT_RAW_KEY,
-	NM_SETTING_802_1X_CK_FORMAT_PKCS12
-} NMSetting8021xCKFormat;
-

-

-NMSetting8021xCKFormat values indicate the general type of a certificate
-or private key
-

-

+
Types and Values

+
--++
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-

 




 
 
 
NM_SETTING_802_1X_CK_FORMAT_UNKNOWN
unknown file format
-enumNMSetting8021xCKFormat
enumNMSetting8021xCKScheme
#defineNM_SETTING_802_1X_SETTING_NAME
enumNMSetting8021xError
#defineNM_SETTING_802_1X_ERROR
#defineNM_SETTING_802_1X_EAP
#defineNM_SETTING_802_1X_IDENTITY
#defineNM_SETTING_802_1X_ANONYMOUS_IDENTITY
#defineNM_SETTING_802_1X_PAC_FILE
#defineNM_SETTING_802_1X_CA_CERT
#defineNM_SETTING_802_1X_CA_PATH
#defineNM_SETTING_802_1X_SUBJECT_MATCH
#defineNM_SETTING_802_1X_ALTSUBJECT_MATCHES
#defineNM_SETTING_802_1X_CLIENT_CERT
#defineNM_SETTING_802_1X_PHASE1_PEAPVER
#defineNM_SETTING_802_1X_PHASE1_PEAPLABEL
#defineNM_SETTING_802_1X_PHASE1_FAST_PROVISIONING
#defineNM_SETTING_802_1X_PHASE2_AUTH
#defineNM_SETTING_802_1X_PHASE2_AUTHEAP
 

 
NM_SETTING_802_1X_CK_FORMAT_X509
file contains an X.509 format certificate
-#defineNM_SETTING_802_1X_PHASE2_CA_CERT
 

 
NM_SETTING_802_1X_CK_FORMAT_RAW_KEY
file contains an old-style OpenSSL PEM
-or DER private key
-#defineNM_SETTING_802_1X_PHASE2_CA_PATH
 

 
NM_SETTING_802_1X_CK_FORMAT_PKCS12
file contains a PKCS12 certificate
-and private key
-#defineNM_SETTING_802_1X_PHASE2_SUBJECT_MATCH
 

-

-

-

-
enum NMSetting8021xCKScheme

-
typedef enum {
- /*< underscore_name=nm_setting_802_1x_ck_scheme >*/
-	NM_SETTING_802_1X_CK_SCHEME_UNKNOWN = 0,
-	NM_SETTING_802_1X_CK_SCHEME_BLOB,
-	NM_SETTING_802_1X_CK_SCHEME_PATH
-} NMSetting8021xCKScheme;
-

-

-NMSetting8021xCKScheme values indicate how a certificate or private key is
-stored in the setting properties, either as a blob of the item's data, or as
-a path to a certificate or private key file on the filesystem
-

-

----
-
-
-
+
+
-
-
+
+
-
-
+
+
-
-




 
NM_SETTING_802_1X_CK_SCHEME_UNKNOWN
unknown certificate or private key
-scheme
-#defineNM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES
 

 
NM_SETTING_802_1X_CK_SCHEME_BLOB
certificate or key is stored as the raw
-item data
-#defineNM_SETTING_802_1X_PHASE2_CLIENT_CERT
 

 
NM_SETTING_802_1X_CK_SCHEME_PATH
certificate or key is stored as a path
-to a file containing the certificate or key data
-#defineNM_SETTING_802_1X_PASSWORD
 

-

-

-

-
NM_SETTING_802_1X_SETTING_NAME

-
#define NM_SETTING_802_1X_SETTING_NAME "802-1x"
-

-

-

-

-

-

-
enum NMSetting8021xError

-
typedef enum {
- /*< underscore_name=nm_setting_802_1x_error >*/
-	NM_SETTING_802_1X_ERROR_UNKNOWN = 0,      /*< nick=UnknownError >*/
-	NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, /*< nick=InvalidProperty >*/
-	NM_SETTING_802_1X_ERROR_MISSING_PROPERTY  /*< nick=MissingProperty >*/
-} NMSetting8021xError;
-

-

----
-
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+




 
NM_SETTING_802_1X_ERROR_UNKNOWN
unknown or unclassified error
-#defineNM_SETTING_802_1X_PASSWORD_FLAGS
 

 
NM_SETTING_802_1X_ERROR_INVALID_PROPERTY
the property was invalid
-#defineNM_SETTING_802_1X_PASSWORD_RAW
 

 
NM_SETTING_802_1X_ERROR_MISSING_PROPERTY
the property was missing and is
-required
-#defineNM_SETTING_802_1X_PASSWORD_RAW_FLAGS
#defineNM_SETTING_802_1X_PRIVATE_KEY
#defineNM_SETTING_802_1X_PRIVATE_KEY_PASSWORD
#defineNM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS
#defineNM_SETTING_802_1X_PHASE2_PRIVATE_KEY
#defineNM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD
#defineNM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS
#defineNM_SETTING_802_1X_PIN
#defineNM_SETTING_802_1X_PIN_FLAGS
#defineNM_SETTING_802_1X_SYSTEM_CA_CERTS
 

 
 

 

-

-

-
NM_SETTING_802_1X_ERROR

-
#define NM_SETTING_802_1X_ERROR nm_setting_802_1x_error_quark ()
-

-

-

-

-

-

-
nm_setting_802_1x_error_quark ()

-
GQuark              nm_setting_802_1x_error_quark       (void);

-

-Registers an error quark for NMSetting8021x if necessary.
-

-

----
-
-
-
-
-




Returns :
the error quark used for NMSetting8021x errors.

-

-

-

-
NM_SETTING_802_1X_EAP

-
#define NM_SETTING_802_1X_EAP "eap"
-

-

-

-

-

-

-
NM_SETTING_802_1X_IDENTITY

-
#define NM_SETTING_802_1X_IDENTITY "identity"
-

-

-

-

-

-

-
NM_SETTING_802_1X_ANONYMOUS_IDENTITY

-
#define NM_SETTING_802_1X_ANONYMOUS_IDENTITY "anonymous-identity"
-

-

-

-

-

-

-
NM_SETTING_802_1X_PAC_FILE

-
#define NM_SETTING_802_1X_PAC_FILE "pac-file"
-

-

-

-

-

-

-
NM_SETTING_802_1X_CA_CERT

-
#define NM_SETTING_802_1X_CA_CERT "ca-cert"
-

-

-

-

-

-

-
NM_SETTING_802_1X_CA_PATH

-
#define NM_SETTING_802_1X_CA_PATH "ca-path"
-

-

-

-

-

-

-
NM_SETTING_802_1X_SUBJECT_MATCH

-
#define NM_SETTING_802_1X_SUBJECT_MATCH "subject-match"
-

-

-

-

-

-

-
NM_SETTING_802_1X_ALTSUBJECT_MATCHES

-
#define NM_SETTING_802_1X_ALTSUBJECT_MATCHES "altsubject-matches"
-

-

-

-

-

-

-
NM_SETTING_802_1X_CLIENT_CERT

-
#define NM_SETTING_802_1X_CLIENT_CERT "client-cert"
-

-

-

-

-

-

-
NM_SETTING_802_1X_PHASE1_PEAPVER

-
#define NM_SETTING_802_1X_PHASE1_PEAPVER "phase1-peapver"
-

-

-

-

-

-

-
NM_SETTING_802_1X_PHASE1_PEAPLABEL

-
#define NM_SETTING_802_1X_PHASE1_PEAPLABEL "phase1-peaplabel"
-

-

-

-

-

-

-
NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING

-
#define NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING "phase1-fast-provisioning"
+

+
Object Hierarchy

+
    GEnum
+    ├── NMSetting8021xCKFormat
+    ├── NMSetting8021xCKScheme
+    ╰── NMSetting8021xError
+    GObject
+    ╰── NMSetting
+        ╰── NMSetting8021x
 

-

-

 

-

-

-
NM_SETTING_802_1X_PHASE2_AUTH

-
#define NM_SETTING_802_1X_PHASE2_AUTH "phase2-auth"
+

+
Includes

+
#include <nm-setting-8021x.h>
 

-

-

 

-

-

-
NM_SETTING_802_1X_PHASE2_AUTHEAP

-
#define NM_SETTING_802_1X_PHASE2_AUTHEAP "phase2-autheap"
-

-

-

+

+
Description

+
The NMSetting8021x object is a NMSetting subclass that describes
+properties necessary for connection to 802.1x-authenticated networks, such as
+WPA and WPA2 Enterprise WiFi networks and wired 802.1x networks.  802.1x
+connections typically use certificates and/or EAP authentication methods to
+securely verify, identify, and authenticate the client to the network itself,
+instead of simply relying on a widely shared static key.

+
It's a good idea to read up on wpa_supplicant configuration before using this
+setting extensively, since most of the options here correspond closely with
+the relevant wpa_supplicant configuration options.

+
Furthermore, to get a good idea of 802.1x, EAP, TLS, TTLS, etc and their
+applications to WiFi and wired networks, you'll want to get copies of the
+following books.

+
 802.11 Wireless Networks: The Definitive Guide, Second Edition
+      Author: Matthew Gast
+      ISBN: 978-0596100520

+
 Cisco Wireless LAN Security
+      Authors: Krishna Sankar, Sri Sundaralingam, Darrin Miller, and Andrew Balinsky
+      ISBN: 978-1587051548

 

-

+

+
Functions

 

-
NM_SETTING_802_1X_PHASE2_CA_CERT

-
#define NM_SETTING_802_1X_PHASE2_CA_CERT "phase2-ca-cert"
-

-

-

+
nm_setting_802_1x_error_quark ()

+
GQuark
+nm_setting_802_1x_error_quark (void);

+
Registers an error quark for NMSetting8021x if necessary.

+

+
Returns

+
 the error quark used for NMSetting8021x errors.

+

 

-

-

-
NM_SETTING_802_1X_PHASE2_CA_PATH

-
#define NM_SETTING_802_1X_PHASE2_CA_PATH "phase2-ca-path"
-

-

-

 

 

 

-
NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH

-
#define NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH "phase2-subject-match"
-

-

-

+
nm_setting_802_1x_new ()

+
NMSetting *
+nm_setting_802_1x_new (void);

+
Creates a new NMSetting8021x object with default values.

+

+
Returns

+
 the new empty NMSetting8021x object

+

 

-

-

-
NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES

-
#define NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES "phase2-altsubject-matches"
-

-

-

 

 

 

-
NM_SETTING_802_1X_PHASE2_CLIENT_CERT

-
#define NM_SETTING_802_1X_PHASE2_CLIENT_CERT "phase2-client-cert"
-

-

-

+
nm_setting_802_1x_get_num_eap_methods ()

+
guint32
+nm_setting_802_1x_get_num_eap_methods (NMSetting8021x *setting);

+
Returns the number of eap methods allowed for use when connecting to the
+network.  Generally only one EAP method is used.  Use the functions
+nm_setting_802_1x_get_eap_method(), nm_setting_802_1x_add_eap_method(),
+and nm_setting_802_1x_remove_eap_method() for adding, removing, and retrieving
+allowed EAP methods.

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSetting8021x
 

 

-

-

-
NM_SETTING_802_1X_PASSWORD

-
#define NM_SETTING_802_1X_PASSWORD "password"
-

-

-

+

+
Returns

+
 the number of allowed EAP methods

+

 

-

-

-
NM_SETTING_802_1X_PASSWORD_FLAGS

-
#define NM_SETTING_802_1X_PASSWORD_FLAGS "password-flags"
-

-

-

 

 

 

-
NM_SETTING_802_1X_PASSWORD_RAW

-
#define NM_SETTING_802_1X_PASSWORD_RAW "password-raw"
-

-

-

+
nm_setting_802_1x_get_eap_method ()

+
const char *
+nm_setting_802_1x_get_eap_method (NMSetting8021x *setting,
+                                  guint32 i);

+
Returns the name of the allowed EAP method at index i
+.

+

+
Parameters

+

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+





setting
the NMSetting8021x
 
i
the index of the EAP method name to return
 

 

-

-

-
NM_SETTING_802_1X_PASSWORD_RAW_FLAGS

-
#define NM_SETTING_802_1X_PASSWORD_RAW_FLAGS "password-raw-flags"
-

-

+

+
Returns

+
 the name of the allowed EAP method at index i
 

+

+

 

 

 

-
NM_SETTING_802_1X_PRIVATE_KEY

-
#define NM_SETTING_802_1X_PRIVATE_KEY "private-key"
-

-

-

+
nm_setting_802_1x_add_eap_method ()

+
gboolean
+nm_setting_802_1x_add_eap_method (NMSetting8021x *setting,
+                                  const char *eap);

+
Adds an allowed EAP method.  The setting is not valid until at least one
+EAP method has been added.  See “eap” property for a list of
+allowed EAP methods.

+

+
Parameters

+

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+





setting
the NMSetting8021x
 
eap
the name of the EAP method to allow for this connection
 

+

+

+
Returns

+
 TRUE if the EAP method was successfully added, FALSE if it was
+not a valid method or if it was already allowed.

+

+

 

 

 

-
NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD

-
#define NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD "private-key-password"
-

-

-

+
nm_setting_802_1x_remove_eap_method ()

+
void
+nm_setting_802_1x_remove_eap_method (NMSetting8021x *setting,
+                                     guint32 i);

+
Removes the allowed EAP method at the specified index.

+

+
Parameters

+

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+





setting
the NMSetting8021x
 
i
the index of the EAP method to remove
 

+

 

 

 

-
NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS

-
#define NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS "private-key-password-flags"
-

-

-

+
nm_setting_802_1x_clear_eap_methods ()

+
void
+nm_setting_802_1x_clear_eap_methods (NMSetting8021x *setting);

+
Clears all allowed EAP methods.

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSetting8021x
 

+

 

 

 

-
NM_SETTING_802_1X_PHASE2_PRIVATE_KEY

-
#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY "phase2-private-key"
-

-

-

+
nm_setting_802_1x_get_identity ()

+
const char *
+nm_setting_802_1x_get_identity (NMSetting8021x *setting);

+
Returns the identifier used by some EAP methods (like TLS) to
+authenticate the user.  Often this is a username or login name.

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSetting8021x
 

+

+

+
Returns

+
 the user identifier

+

+

 

 

 

-
NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD

-
#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD "phase2-private-key-password"
-

-

-

+
nm_setting_802_1x_get_anonymous_identity ()

+
const char *
+nm_setting_802_1x_get_anonymous_identity
+                               (NMSetting8021x *setting);

+
Returns the anonymous identifier used by some EAP methods (like TTLS) to
+authenticate the user in the outer unencrypted "phase 1" authentication.  The
+inner "phase 2" authentication will use the “identity” in
+a secure form, if applicable for that EAP method.

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSetting8021x
 

+

+

+
Returns

+
 the anonymous identifier

+

+

 

 

 

-
NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS

-
#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS "phase2-private-key-password-flags"
-

-

-

+
nm_setting_802_1x_get_pac_file ()

+
const char *
+nm_setting_802_1x_get_pac_file (NMSetting8021x *setting);

+
Returns the file containing PAC credentials used by EAP-FAST method.

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSetting8021x
 

+

+

+
Returns

+
 the PAC file

+

+

 

 

 

-
NM_SETTING_802_1X_PIN

-
#define NM_SETTING_802_1X_PIN "pin"
-

-

-

+
nm_setting_802_1x_get_system_ca_certs ()

+
gboolean
+nm_setting_802_1x_get_system_ca_certs (NMSetting8021x *setting);

+
Sets the “system-ca-certs” property. The
+“ca-path” and “phase2-ca-path”
+properties are ignored if the “system-ca-certs” property is
+TRUE, in which case a system-wide CA certificate directory specified at
+compile time (using the --system-ca-path configure option) is used in place
+of these properties.

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSetting8021x
 

+

+

+
Returns

+
 TRUE if a system CA certificate path should be used, FALSE if not

+

+

 

 

 

-
NM_SETTING_802_1X_PIN_FLAGS

-
#define NM_SETTING_802_1X_PIN_FLAGS "pin-flags"
-

-

-

+
nm_setting_802_1x_get_ca_path ()

+
const char *
+nm_setting_802_1x_get_ca_path (NMSetting8021x *setting);

+
Returns the path of the CA certificate directory if previously set.  Systems
+will often have a directory that contains multiple individual CA certificates
+which the supplicant can then add to the verification chain.  This may be
+used in addition to the “ca-cert” property to add more CA
+certificates for verifying the network to client.

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSetting8021x
 

+

+

+
Returns

+
 the CA certificate directory path

+

+

 

 

 

-
NM_SETTING_802_1X_SYSTEM_CA_CERTS

-
#define NM_SETTING_802_1X_SYSTEM_CA_CERTS "system-ca-certs"
-

-

-

+
nm_setting_802_1x_get_phase2_ca_path ()

+
const char *
+nm_setting_802_1x_get_phase2_ca_path (NMSetting8021x *setting);

+
Returns the path of the "phase 2" CA certificate directory if previously set.
+Systems will often have a directory that contains multiple individual CA
+certificates which the supplicant can then add to the verification chain.
+This may be used in addition to the “phase2-ca-cert” property
+to add more CA certificates for verifying the network to client.

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSetting8021x
 

+

+

+
Returns

+
 the "phase 2" CA certificate directory path

+

+

 

 

 

-
NMSetting8021x

-
typedef struct _NMSetting8021x NMSetting8021x;

-

-

+
nm_setting_802_1x_get_ca_cert_scheme ()

+
NMSetting8021xCKScheme
+nm_setting_802_1x_get_ca_cert_scheme (NMSetting8021x *setting);

+
Returns the scheme used to store the CA certificate.  If the returned scheme
+is NM_SETTING_802_1X_CK_SCHEME_BLOB, use nm_setting_802_1x_get_ca_cert_blob();
+if NM_SETTING_802_1X_CK_SCHEME_PATH, use nm_setting_802_1x_get_ca_cert_path().

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSetting8021x
 

+

+

+
Returns

+
 scheme used to store the CA certificate (blob or path)

+

+

 

 

 

-
NMSetting8021xClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSetting8021xClass;
-

-

-

+
nm_setting_802_1x_get_ca_cert_blob ()

+
const GByteArray *
+nm_setting_802_1x_get_ca_cert_blob (NMSetting8021x *setting);

+
Returns the CA certificate blob if the CA certificate is stored using the
+NM_SETTING_802_1X_CK_SCHEME_BLOB scheme.  Not all EAP methods use a
+CA certificate (LEAP for example), and those that can take advantage of the
+CA certificate allow it to be unset.  Note that lack of a CA certificate
+reduces security by allowing man-in-the-middle attacks, because the identity
+of the network cannot be confirmed by the client.

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSetting8021x
 

+

+

+
Returns

+
 the CA certificate data

+

+

 

 

 

-
nm_setting_802_1x_new ()

-
NMSetting *         nm_setting_802_1x_new               (void);

-

-Creates a new NMSetting8021x object with default values.
-

-

+
nm_setting_802_1x_get_ca_cert_path ()

+
const char *
+nm_setting_802_1x_get_ca_cert_path (NMSetting8021x *setting);

+
Returns the CA certificate path if the CA certificate is stored using the
+NM_SETTING_802_1X_CK_SCHEME_PATH scheme.  Not all EAP methods use a
+CA certificate (LEAP for example), and those that can take advantage of the
+CA certificate allow it to be unset.  Note that lack of a CA certificate
+reduces security by allowing man-in-the-middle attacks, because the identity
+of the network cannot be confirmed by the client.

+

+
Parameters

+
--+++
-
-
+
+
+

 





 
 
Returns :
the new empty NMSetting8021x object
setting
the NMSetting8021x
 
 

 

 

+

+
Returns

+
 path to the CA certificate file

+

+

+

 

 

-
nm_setting_802_1x_get_num_eap_methods ()

-
guint32             nm_setting_802_1x_get_num_eap_methods
-                                                        (NMSetting8021x *setting);

-

-Returns the number of eap methods allowed for use when connecting to the
-network.  Generally only one EAP method is used.  Use the functions
-nm_setting_802_1x_get_eap_method(), nm_setting_802_1x_add_eap_method(),
-and nm_setting_802_1x_remove_eap_method() for adding, removing, and retrieving
-allowed EAP methods.
-

-

+
nm_setting_802_1x_set_ca_cert ()

+
gboolean
+nm_setting_802_1x_set_ca_cert (NMSetting8021x *setting,
+                               const char *cert_path,
+                               NMSetting8021xCKScheme scheme,
+                               NMSetting8021xCKFormat *out_format,
+                               GError **error);

+
Reads a certificate from disk and sets the “ca-cert” property
+with the raw certificate data if using the NM_SETTING_802_1X_CK_SCHEME_BLOB
+scheme, or with the path to the certificate file if using the
+NM_SETTING_802_1X_CK_SCHEME_PATH scheme.

+

+
Parameters

+
--+++
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+

 





 
 
 
setting :
the NMSetting8021x
-
setting
the NMSetting8021x
 
cert_path
when scheme
+is set to either NM_SETTING_802_1X_CK_SCHEME_PATH
+or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the CA certificate
+file (PEM or DER format).  The path must be UTF-8 encoded; use
+g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
+clears the CA certificate.
 
scheme
desired storage scheme for the certificate
 
 

 
Returns :
the number of allowed EAP methods
out_format
on successful return, the type of the certificate added
 
error
on unsuccessful return, an error
 
 

 
 

 

+

+
Returns

+
 TRUE if the operation succeeded, FALSE if it was unsuccessful

+

+

+

 

 

-
nm_setting_802_1x_get_eap_method ()

-
const char *        nm_setting_802_1x_get_eap_method    (NMSetting8021x *setting,
-                                                         guint32 i);

-

-Returns the name of the allowed EAP method at index i.
-

-

+
nm_setting_802_1x_get_subject_match ()

+
const char *
+nm_setting_802_1x_get_subject_match (NMSetting8021x *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSetting8021x
 

+

+

+
Returns

+
 the “subject-match” property. This is the
+substring to be matched against the subject of the authentication
+server certificate, or NULL no subject verification is to be
+performed.

+

+

+

+

+

+
nm_setting_802_1x_get_num_altsubject_matches ()

+
guint32
+nm_setting_802_1x_get_num_altsubject_matches
+                               (NMSetting8021x *setting);

+
Returns the number of entries in the
+“altsubject-matches” property of this setting.

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSetting8021x
 

+

+

+
Returns

+
 the number of altsubject-matches entries.

+

+

+

+

+

+
nm_setting_802_1x_get_altsubject_match ()

+
const char *
+nm_setting_802_1x_get_altsubject_match
+                               (NMSetting8021x *setting,
+                                guint32 i);

+
Returns the altSubjectName match at index i
+.

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSetting8021x
-
i :
the index of the EAP method name to return
setting
the NMSettingConnection
 
 

 
Returns :
the name of the allowed EAP method at index i
-
i
the zero-based index of the array of altSubjectName matches
 
 

 
 

 

+

+
Returns

+
 the altSubjectName match at index i
+

+

+

+

 

 

-
nm_setting_802_1x_add_eap_method ()

-
gboolean            nm_setting_802_1x_add_eap_method    (NMSetting8021x *setting,
-                                                         const char *eap);

-

-Adds an allowed EAP method.  The setting is not valid until at least one
-EAP method has been added.  See "eap" property for a list of
-allowed EAP methods.
-

-

+
nm_setting_802_1x_add_altsubject_match ()

+
gboolean
+nm_setting_802_1x_add_altsubject_match
+                               (NMSetting8021x *setting,
+                                const char *altsubject_match);

+
Adds an allowed alternate subject name match.  Until at least one
+match is added, the altSubjectName of the remote authentication
+server is not verified.

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSetting8021x
-
eap :
the name of the EAP method to allow for this connection
setting
the NMSetting8021x
 
 

 
Returns :
TRUE if the EAP method was successfully added, FALSE if it was
-not a valid method or if it was already allowed.
altsubject_match
the altSubjectName to allow for this connection
 
 

 
 

 

+

+
Returns

+
 TRUE if the alternative subject name match was
+successfully added, FALSE if it was already allowed.

+

+

+

 

 

-
nm_setting_802_1x_remove_eap_method ()

-
void                nm_setting_802_1x_remove_eap_method (NMSetting8021x *setting,
-                                                         guint32 i);

-

-Removes the allowed EAP method at the specified index.
-

-

+
nm_setting_802_1x_remove_altsubject_match ()

+
void
+nm_setting_802_1x_remove_altsubject_match
+                               (NMSetting8021x *setting,
+                                guint32 i);

+
Removes the allowed altSubjectName at the specified index.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSetting8021x
-
setting
the NMSetting8021x
 
 

 
i :
the index of the EAP method to remove
i
the index of the altSubjectName match to remove
 
 

 
 

 

+

 

 

-
nm_setting_802_1x_clear_eap_methods ()

-
void                nm_setting_802_1x_clear_eap_methods (NMSetting8021x *setting);

-

-Clears all allowed EAP methods.
-

-

+
nm_setting_802_1x_clear_altsubject_matches ()

+
void
+nm_setting_802_1x_clear_altsubject_matches
+                               (NMSetting8021x *setting);

+
Clears all altSubjectName matches.

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSetting8021x
 

+

+

+

+

+
nm_setting_802_1x_get_client_cert_scheme ()

+
NMSetting8021xCKScheme
+nm_setting_802_1x_get_client_cert_scheme
+                               (NMSetting8021x *setting);

+
Returns the scheme used to store the client certificate.  If the returned scheme
+is NM_SETTING_802_1X_CK_SCHEME_BLOB, use nm_setting_802_1x_get_client_cert_blob();
+if NM_SETTING_802_1X_CK_SCHEME_PATH, use nm_setting_802_1x_get_client_cert_path().

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSetting8021x
 

+

+

+
Returns

+
 scheme used to store the client certificate (blob or path)

+

+

+

+

+

+
nm_setting_802_1x_get_client_cert_blob ()

+
const GByteArray *
+nm_setting_802_1x_get_client_cert_blob
+                               (NMSetting8021x *setting);

+
Client certificates are used to identify the connecting client to the network
+when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
+authentication method.

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSetting8021x
 

+

+

+
Returns

+
 the client certificate data

+

+

+

+

+

+
nm_setting_802_1x_get_client_cert_path ()

+
const char *
+nm_setting_802_1x_get_client_cert_path
+                               (NMSetting8021x *setting);

+
Client certificates are used to identify the connecting client to the network
+when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
+authentication method.

+

+
Parameters

+
--+++
-
-
+
+
+

 





 
 
setting :
the NMSetting8021x
-
setting
the NMSetting8021x
 
 

 

 

+

+
Returns

+
 path to the client certificate file

+

+

+

 

 

-
nm_setting_802_1x_get_identity ()

-
const char *        nm_setting_802_1x_get_identity      (NMSetting8021x *setting);

-

-Returns the identifier used by some EAP methods (like TLS) to
-authenticate the user.  Often this is a username or login name.
-

-

+
nm_setting_802_1x_set_client_cert ()

+
gboolean
+nm_setting_802_1x_set_client_cert (NMSetting8021x *setting,
+                                   const char *cert_path,
+                                   NMSetting8021xCKScheme scheme,
+                                   NMSetting8021xCKFormat *out_format,
+                                   GError **error);

+
Reads a certificate from disk and sets the “client-cert”
+property with the raw certificate data if using the
+NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate
+file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.

+
Client certificates are used to identify the connecting client to the network
+when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
+authentication method.

+

+
Parameters

+
--+++
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+

 





 
 
 
setting :
the NMSetting8021x
-
setting
the NMSetting8021x
 
cert_path
when scheme
+is set to either NM_SETTING_802_1X_CK_SCHEME_PATH
+or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the client
+certificate file (PEM, DER, or PKCS12 format).  The path must be UTF-8
+encoded; use g_filename_to_utf8() to convert if needed.  Passing NULL with
+any scheme
+clears the client certificate.
 
scheme
desired storage scheme for the certificate
 
 

 
Returns :
the user identifier
out_format
on successful return, the type of the certificate added
 
error
on unsuccessful return, an error
 
 

 
 

 

+

+
Returns

+
 TRUE if the operation succeeded, FALSE if it was unsuccessful

+

+

+

 

 

-
nm_setting_802_1x_get_anonymous_identity ()

-
const char *        nm_setting_802_1x_get_anonymous_identity
-                                                        (NMSetting8021x *setting);

-

-Returns the anonymous identifier used by some EAP methods (like TTLS) to
-authenticate the user in the outer unencrypted "phase 1" authentication.  The
-inner "phase 2" authentication will use the "identity" in
-a secure form, if applicable for that EAP method.
-

-

+
nm_setting_802_1x_get_phase1_peapver ()

+
const char *
+nm_setting_802_1x_get_phase1_peapver (NMSetting8021x *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSetting8021x
-
Returns :
the anonymous identifier
setting
the NMSetting8021x
 

 

 

+

+
Returns

+
 the "phase 1" PEAP version to be used when authenticating with
+EAP-PEAP as contained in the “phase1-peapver” property.  Valid
+values are NULL (unset), "0" (PEAP version 0), and "1" (PEAP version 1).

+

+

+

 

 

-
nm_setting_802_1x_get_pac_file ()

-
const char *        nm_setting_802_1x_get_pac_file      (NMSetting8021x *setting);

-

-Returns the file containing PAC credentials used by EAP-FAST method.
-

-

+
nm_setting_802_1x_get_phase1_peaplabel ()

+
const char *
+nm_setting_802_1x_get_phase1_peaplabel
+                               (NMSetting8021x *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSetting8021x
-
Returns :
the PAC file
setting
the NMSetting8021x
 

 

 

+

+
Returns

+
 whether the "phase 1" PEAP label is new-style or old-style, to be
+used when authenticating with EAP-PEAP, as contained in the
+“phase1-peaplabel” property.  Valid values are NULL (unset),
+"0" (use old-style label), and "1" (use new-style label).  See the
+wpa_supplicant documentation for more details.

+

+

+

 

 

-
nm_setting_802_1x_get_system_ca_certs ()

-
gboolean            nm_setting_802_1x_get_system_ca_certs
-                                                        (NMSetting8021x *setting);

-

-Sets the "system-ca-certs" property. The
-"ca-path" and "phase2-ca-path"
-properties are ignored if the "system-ca-certs" property is
-TRUE, in which case a system-wide CA certificate directory specified at
-compile time (using the --system-ca-path configure option) is used in place
-of these properties.
-

-

+
nm_setting_802_1x_get_phase1_fast_provisioning ()

+
const char *
+nm_setting_802_1x_get_phase1_fast_provisioning
+                               (NMSetting8021x *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSetting8021x
-
Returns :
TRUE if a system CA certificate path should be used, FALSE if not
setting
the NMSetting8021x
 

 

 

+

+
Returns

+
 whether "phase 1" PEAP fast provisioning should be used, as specified
+by the “phase1-fast-provisioning” property.  See the
+wpa_supplicant documentation for more details.

+

+

+

 

 

-
nm_setting_802_1x_get_ca_path ()

-
const char *        nm_setting_802_1x_get_ca_path       (NMSetting8021x *setting);

-

-Returns the path of the CA certificate directory if previously set.  Systems
-will often have a directory that contains multiple individual CA certificates
-which the supplicant can then add to the verification chain.  This may be
-used in addition to the "ca-cert" property to add more CA
-certificates for verifying the network to client.
-

-

+
nm_setting_802_1x_get_phase2_auth ()

+
const char *
+nm_setting_802_1x_get_phase2_auth (NMSetting8021x *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSetting8021x
-
Returns :
the CA certificate directory path
setting
the NMSetting8021x
 

 

 

+

+
Returns

+
 the "phase 2" non-EAP (ex MD5) allowed authentication method as
+specified by the “phase2-auth” property.

+

+

+

 

 

-
nm_setting_802_1x_get_phase2_ca_path ()

-
const char *        nm_setting_802_1x_get_phase2_ca_path
-                                                        (NMSetting8021x *setting);

-

-Returns the path of the "phase 2" CA certificate directory if previously set.
-Systems will often have a directory that contains multiple individual CA
-certificates which the supplicant can then add to the verification chain.
-This may be used in addition to the "phase2-ca-cert" property
-to add more CA certificates for verifying the network to client.
-

-

+
nm_setting_802_1x_get_phase2_autheap ()

+
const char *
+nm_setting_802_1x_get_phase2_autheap (NMSetting8021x *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSetting8021x
-
Returns :
the "phase 2" CA certificate directory path
setting
the NMSetting8021x
 

 

 

+

+
Returns

+
 the "phase 2" EAP-based (ex TLS) allowed authentication method as
+specified by the “phase2-autheap” property.

+

+

+
 

 

-
nm_setting_802_1x_get_ca_cert_scheme ()

-
NMSetting8021xCKScheme nm_setting_802_1x_get_ca_cert_scheme
-                                                        (NMSetting8021x *setting);

-

-Returns the scheme used to store the CA certificate.  If the returned scheme
-is NM_SETTING_802_1X_CK_SCHEME_BLOB, use nm_setting_802_1x_get_ca_cert_blob();
-if NM_SETTING_802_1X_CK_SCHEME_PATH, use nm_setting_802_1x_get_ca_cert_path().
-

-

+
nm_setting_802_1x_get_phase2_ca_cert_scheme ()

+
NMSetting8021xCKScheme
+nm_setting_802_1x_get_phase2_ca_cert_scheme
+                               (NMSetting8021x *setting);

+
Returns the scheme used to store the "phase 2" CA certificate.  If the
+returned scheme is NM_SETTING_802_1X_CK_SCHEME_BLOB, use
+nm_setting_802_1x_get_ca_cert_blob(); if NM_SETTING_802_1X_CK_SCHEME_PATH,
+use nm_setting_802_1x_get_ca_cert_path().

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSetting8021x
-
Returns :
scheme used to store the CA certificate (blob or path)
setting
the NMSetting8021x
 

 

 

+

+
Returns

+
 scheme used to store the "phase 2" CA certificate (blob or path)

+

+

+
 

 

-
nm_setting_802_1x_get_ca_cert_blob ()

-
const GByteArray *  nm_setting_802_1x_get_ca_cert_blob  (NMSetting8021x *setting);

-

-Returns the CA certificate blob if the CA certificate is stored using the
-NM_SETTING_802_1X_CK_SCHEME_BLOB scheme.  Not all EAP methods use a
-CA certificate (LEAP for example), and those that can take advantage of the
+
nm_setting_802_1x_get_phase2_ca_cert_blob ()

+
const GByteArray *
+nm_setting_802_1x_get_phase2_ca_cert_blob
+                               (NMSetting8021x *setting);

+
Returns the "phase 2" CA certificate blob if the CA certificate is stored
+using the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme.  Not all EAP methods use
+a CA certificate (LEAP for example), and those that can take advantage of the
 CA certificate allow it to be unset.  Note that lack of a CA certificate
 reduces security by allowing man-in-the-middle attacks, because the identity
-of the network cannot be confirmed by the client.
-

-

+of the network cannot be confirmed by the client.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSetting8021x
-
Returns :
the CA certificate data
setting
the NMSetting8021x
 

 

 

+

+
Returns

+
 the "phase 2" CA certificate data

+

+

+
 

 

-
nm_setting_802_1x_get_ca_cert_path ()

-
const char *        nm_setting_802_1x_get_ca_cert_path  (NMSetting8021x *setting);

-

-Returns the CA certificate path if the CA certificate is stored using the
-NM_SETTING_802_1X_CK_SCHEME_PATH scheme.  Not all EAP methods use a
-CA certificate (LEAP for example), and those that can take advantage of the
+
nm_setting_802_1x_get_phase2_ca_cert_path ()

+
const char *
+nm_setting_802_1x_get_phase2_ca_cert_path
+                               (NMSetting8021x *setting);

+
Returns the "phase 2" CA certificate path if the CA certificate is stored
+using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.  Not all EAP methods use
+a CA certificate (LEAP for example), and those that can take advantage of the
 CA certificate allow it to be unset.  Note that lack of a CA certificate
 reduces security by allowing man-in-the-middle attacks, because the identity
-of the network cannot be confirmed by the client.
-

-

+of the network cannot be confirmed by the client.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSetting8021x
-
Returns :
path to the CA certificate file
setting
the NMSetting8021x
 

 

 

+

+
Returns

+
 path to the "phase 2" CA certificate file

+

+

+
 

 

-
nm_setting_802_1x_set_ca_cert ()

-
gboolean            nm_setting_802_1x_set_ca_cert       (NMSetting8021x *setting,
-                                                         const char *cert_path,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
-                                                         GError **error);

-

-Reads a certificate from disk and sets the "ca-cert" property
-with the raw certificate data if using the NM_SETTING_802_1X_CK_SCHEME_BLOB
-scheme, or with the path to the certificate file if using the
-NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
-

-

+
nm_setting_802_1x_set_phase2_ca_cert ()

+
gboolean
+nm_setting_802_1x_set_phase2_ca_cert (NMSetting8021x *setting,
+                                      const char *cert_path,
+                                      NMSetting8021xCKScheme scheme,
+                                      NMSetting8021xCKFormat *out_format,
+                                      GError **error);

+
Reads a certificate from disk and sets the “phase2-ca-cert”
+property with the raw certificate data if using the
+NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate
+file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+clears the "phase2" CA certificate.

+
-
-
+
+
+
-
-
+
+
+
-
-
-
-
-
-
+
+
+

 





 
 
 
setting :
the NMSetting8021x
-
setting
the NMSetting8021x
 
 

 
cert_path :
when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH
-or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the CA certificate
-file (PEM or DER format).  The path must be UTF-8 encoded; use
+
cert_path
when scheme
+is set to either NM_SETTING_802_1X_CK_SCHEME_PATH
+or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" CA
+certificate file (PEM or DER format).  The path must be UTF-8 encoded; use
 g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
-clears the CA certificate.
 
 

 
scheme :
desired storage scheme for the certificate
scheme
desired storage scheme for the certificate
 
 

 
out_format :
on successful return, the type of the certificate added
out_format
on successful return, the type of the certificate added
 
 

 
error :
on unsuccessful return, an error
Returns :
TRUE if the operation succeeded, FALSE if it was unsuccessful
error
on unsuccessful return, an error
 
 

 
 

 

+

+
Returns

+
 TRUE if the operation succeeded, FALSE if it was unsuccessful

+

+

+
 

 

-
nm_setting_802_1x_get_subject_match ()

-
const char *        nm_setting_802_1x_get_subject_match (NMSetting8021x *setting);

-

+
nm_setting_802_1x_get_phase2_subject_match ()

+
const char *
+nm_setting_802_1x_get_phase2_subject_match
+                               (NMSetting8021x *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSetting8021x
-
Returns :
the "subject-match" property. This is the
-substring to be matched against the subject of the authentication
-server certificate, or NULL no subject verification is to be
-performed.
setting
the NMSetting8021x
 

 

 

+

+
Returns

+
 the “phase2-subject-match” property. This is
+the substring to be matched against the subject of the "phase 2"
+authentication server certificate, or NULL no subject verification
+is to be performed.

+

+

+
 

 

-
nm_setting_802_1x_get_num_altsubject_matches ()

-
guint32             nm_setting_802_1x_get_num_altsubject_matches
-                                                        (NMSetting8021x *setting);

-

-Returns the number of entries in the
-"altsubject-matches" property of this setting.
-

-

+
nm_setting_802_1x_get_num_phase2_altsubject_matches ()

+
guint32
+nm_setting_802_1x_get_num_phase2_altsubject_matches
+                               (NMSetting8021x *setting);

+
Returns the number of entries in the
+“phase2-altsubject-matches” property of this setting.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSetting8021x
-
Returns :
the number of altsubject-matches entries.
setting
the NMSetting8021x
 

 

 

+

+
Returns

+
 the number of phase2-altsubject-matches entries.

+

+

+
 

 

-
nm_setting_802_1x_get_altsubject_match ()

-
const char *        nm_setting_802_1x_get_altsubject_match
-                                                        (NMSetting8021x *setting,
-                                                         guint32 i);

-

-Returns the altSubjectName match at index i.
-

-

+
nm_setting_802_1x_get_phase2_altsubject_match ()

+
const char *
+nm_setting_802_1x_get_phase2_altsubject_match
+                               (NMSetting8021x *setting,
+                                guint32 i);

+
Returns the "phase 2" altSubjectName match at index i
+.

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingConnection
-
i :
the zero-based index of the array of altSubjectName matches
setting
the NMSettingConnection
 
 

 
Returns :
the altSubjectName match at index i
-
i
the zero-based index of the array of "phase 2" altSubjectName matches
 
 

 
 

 

+

+
Returns

+
 the "phase 2" altSubjectName match at index i
+

+

+

+
 

 

-
nm_setting_802_1x_add_altsubject_match ()

-
gboolean            nm_setting_802_1x_add_altsubject_match
-                                                        (NMSetting8021x *setting,
-                                                         const char *altsubject_match);

-

-Adds an allowed alternate subject name match.  Until at least one
-match is added, the altSubjectName of the remote authentication
-server is not verified.
-

-

+
nm_setting_802_1x_add_phase2_altsubject_match ()

+
gboolean
+nm_setting_802_1x_add_phase2_altsubject_match
+                               (NMSetting8021x *setting,
+                                const char *phase2_altsubject_match);

+
Adds an allowed alternate subject name match for "phase 2".  Until
+at least one match is added, the altSubjectName of the "phase 2"
+remote authentication server is not verified.

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSetting8021x
-
altsubject_match :
the altSubjectName to allow for this connection
setting
the NMSetting8021x
 
 

 
Returns :
TRUE if the alternative subject name match was
-successfully added, FALSE if it was already allowed.
phase2_altsubject_match
the "phase 2" altSubjectName to allow for this
+connection
 
 

 
 

 

+

+
Returns

+
 TRUE if the "phase 2" alternative subject name match was
+successfully added, FALSE if it was already allowed.

+

+

+
 

 

-
nm_setting_802_1x_remove_altsubject_match ()

-
void                nm_setting_802_1x_remove_altsubject_match
-                                                        (NMSetting8021x *setting,
-                                                         guint32 i);

-

-Removes the allowed altSubjectName at the specified index.
-

-

+
nm_setting_802_1x_remove_phase2_altsubject_match ()

+
void
+nm_setting_802_1x_remove_phase2_altsubject_match
+                               (NMSetting8021x *setting,
+                                guint32 i);

+
Removes the allowed "phase 2" altSubjectName at the specified index.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSetting8021x
-
setting
the NMSetting8021x
 
 

 
i :
the index of the altSubjectName match to remove
i
the index of the "phase 2" altSubjectName match to remove
 
 

 
 

 

+
 

 

-
nm_setting_802_1x_clear_altsubject_matches ()

-
void                nm_setting_802_1x_clear_altsubject_matches
-                                                        (NMSetting8021x *setting);

-

-Clears all altSubjectName matches.
-

-

+
nm_setting_802_1x_clear_phase2_altsubject_matches ()

+
void
+nm_setting_802_1x_clear_phase2_altsubject_matches
+                               (NMSetting8021x *setting);

+
Clears all "phase 2" altSubjectName matches.

+

+
Parameters

+
--+++
-
-
+
+
+

 





 
 
setting :
the NMSetting8021x
-
setting
the NMSetting8021x
 
 

 

 

+
 

 

-
nm_setting_802_1x_get_client_cert_scheme ()

-
NMSetting8021xCKScheme nm_setting_802_1x_get_client_cert_scheme
-                                                        (NMSetting8021x *setting);

-

-Returns the scheme used to store the client certificate.  If the returned scheme
-is NM_SETTING_802_1X_CK_SCHEME_BLOB, use nm_setting_802_1x_get_client_cert_blob();
-if NM_SETTING_802_1X_CK_SCHEME_PATH, use nm_setting_802_1x_get_client_cert_path().
-

-

+
nm_setting_802_1x_get_phase2_client_cert_scheme ()

+
NMSetting8021xCKScheme
+nm_setting_802_1x_get_phase2_client_cert_scheme
+                               (NMSetting8021x *setting);

+
Returns the scheme used to store the "phase 2" client certificate.  If the
+returned scheme is NM_SETTING_802_1X_CK_SCHEME_BLOB, use
+nm_setting_802_1x_get_client_cert_blob(); if
+NM_SETTING_802_1X_CK_SCHEME_PATH, use
+nm_setting_802_1x_get_client_cert_path().

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSetting8021x
-
Returns :
scheme used to store the client certificate (blob or path)
setting
the NMSetting8021x
 

 

 

+

+
Returns

+
 scheme used to store the "phase 2" client certificate (blob or path)

+

+

+
 

 

-
nm_setting_802_1x_get_client_cert_blob ()

-
const GByteArray *  nm_setting_802_1x_get_client_cert_blob
-                                                        (NMSetting8021x *setting);

-

-Client certificates are used to identify the connecting client to the network
+
nm_setting_802_1x_get_phase2_client_cert_blob ()

+
const GByteArray *
+nm_setting_802_1x_get_phase2_client_cert_blob
+                               (NMSetting8021x *setting);

+
Client certificates are used to identify the connecting client to the network
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
-

-

+authentication method.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSetting8021x
-
Returns :
the client certificate data
setting
the NMSetting8021x
 

 

 

+

+
Returns

+
 the "phase 2" client certificate data

+

+

+
 

 

-
nm_setting_802_1x_get_client_cert_path ()

-
const char *        nm_setting_802_1x_get_client_cert_path
-                                                        (NMSetting8021x *setting);

-

-Client certificates are used to identify the connecting client to the network
+
nm_setting_802_1x_get_phase2_client_cert_path ()

+
const char *
+nm_setting_802_1x_get_phase2_client_cert_path
+                               (NMSetting8021x *setting);

+
Client certificates are used to identify the connecting client to the network
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
-

-

+authentication method.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSetting8021x
-
Returns :
path to the client certificate file
setting
the NMSetting8021x
 

 

 

+

+
Returns

+
 path to the "phase 2" client certificate file

+

+

+
 

 

-
nm_setting_802_1x_set_client_cert ()

-
gboolean            nm_setting_802_1x_set_client_cert   (NMSetting8021x *setting,
-                                                         const char *cert_path,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
-                                                         GError **error);

-

-Reads a certificate from disk and sets the "client-cert"
+
nm_setting_802_1x_set_phase2_client_cert ()

+
gboolean
+nm_setting_802_1x_set_phase2_client_cert
+                               (NMSetting8021x *setting,
+                                const char *cert_path,
+                                NMSetting8021xCKScheme scheme,
+                                NMSetting8021xCKFormat *out_format,
+                                GError **error);

+
Reads a certificate from disk and sets the “phase2-client-cert”
 property with the raw certificate data if using the
 NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate
-file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
-

-

-Client certificates are used to identify the connecting client to the network
+file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.

+
Client certificates are used to identify the connecting client to the network
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
-

-

+authentication method.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
-
-
-
-
+any scheme
+clears the "phase2" client certificate.

+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSetting8021x
-
setting
the NMSetting8021x
 
 

 
cert_path :
when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH
-or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the client
+
cert_path
when scheme
+is set to either NM_SETTING_802_1X_CK_SCHEME_PATH
+or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" client
 certificate file (PEM, DER, or PKCS12 format).  The path must be UTF-8
 encoded; use g_filename_to_utf8() to convert if needed.  Passing NULL with
-any scheme clears the client certificate.
scheme :
desired storage scheme for the certificate 
 

 
out_format :
on successful return, the type of the certificate added
scheme
desired storage scheme for the certificate
 
 

 
error :
on unsuccessful return, an error
out_format
on successful return, the type of the certificate added
 
 

 
Returns :
TRUE if the operation succeeded, FALSE if it was unsuccessful
error
on unsuccessful return, an error
 
 

 
 

 

+

+
Returns

+
 TRUE if the operation succeeded, FALSE if it was unsuccessful

+

+

+
 

 

-
nm_setting_802_1x_get_phase1_peapver ()

-
const char *        nm_setting_802_1x_get_phase1_peapver
-                                                        (NMSetting8021x *setting);

-

+
nm_setting_802_1x_get_password ()

+
const char *
+nm_setting_802_1x_get_password (NMSetting8021x *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSetting8021x
-
Returns :
the "phase 1" PEAP version to be used when authenticating with
-EAP-PEAP as contained in the "phase1-peapver" property.  Valid
-values are NULL (unset), "0" (PEAP version 0), and "1" (PEAP version 1).
setting
the NMSetting8021x
 

 

 

+

+
Returns

+
 the password used by the authentication method, if any, as specified
+by the “password” property

+

+

+
 

 

-
nm_setting_802_1x_get_phase1_peaplabel ()

-
const char *        nm_setting_802_1x_get_phase1_peaplabel
-                                                        (NMSetting8021x *setting);

-

+
nm_setting_802_1x_get_password_flags ()

+
NMSettingSecretFlags
+nm_setting_802_1x_get_password_flags (NMSetting8021x *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSetting8021x
-
Returns :
whether the "phase 1" PEAP label is new-style or old-style, to be
-used when authenticating with EAP-PEAP, as contained in the
-"phase1-peaplabel" property.  Valid values are NULL (unset),
-"0" (use old-style label), and "1" (use new-style label).  See the
-wpa_supplicant documentation for more details.
setting
the NMSetting8021x
 

 

 

+

+
Returns

+
 the NMSettingSecretFlags pertaining to the “password”

+

+

+
 

 

-
nm_setting_802_1x_get_phase1_fast_provisioning ()

-
const char *        nm_setting_802_1x_get_phase1_fast_provisioning
-                                                        (NMSetting8021x *setting);

-

+
nm_setting_802_1x_get_password_raw ()

+
const GByteArray *
+nm_setting_802_1x_get_password_raw (NMSetting8021x *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSetting8021x
-
Returns :
whether "phase 1" PEAP fast provisioning should be used, as specified
-by the "phase1-fast-provisioning" property.  See the
-wpa_supplicant documentation for more details.
setting
the NMSetting8021x
 

 

 

+

+
Returns

+
 the password used by the authentication method as a
+UTF-8-encoded array of bytes, as specified by the
+“password-raw” property

+

+

+
 

 

-
nm_setting_802_1x_get_phase2_auth ()

-
const char *        nm_setting_802_1x_get_phase2_auth   (NMSetting8021x *setting);

-

+
nm_setting_802_1x_get_password_raw_flags ()

+
NMSettingSecretFlags
+nm_setting_802_1x_get_password_raw_flags
+                               (NMSetting8021x *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSetting8021x
-
Returns :
the "phase 2" non-EAP (ex MD5) allowed authentication method as
-specified by the "phase2-auth" property.
setting
the NMSetting8021x
 

 

 

+

+
Returns

+
 the NMSettingSecretFlags pertaining to the
+“password-raw”

+

+

+
 

 

-
nm_setting_802_1x_get_phase2_autheap ()

-
const char *        nm_setting_802_1x_get_phase2_autheap
-                                                        (NMSetting8021x *setting);

-

+
nm_setting_802_1x_get_pin ()

+
const char *
+nm_setting_802_1x_get_pin (NMSetting8021x *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSetting8021x
-
Returns :
the "phase 2" EAP-based (ex TLS) allowed authentication method as
-specified by the "phase2-autheap" property.
setting
the NMSetting8021x
 

 

 

+

+
Returns

+
 the PIN used by the authentication method, if any, as specified
+by the “pin” property

+

+

+
 

 

-
nm_setting_802_1x_get_phase2_ca_cert_scheme ()

-
NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_ca_cert_scheme
-                                                        (NMSetting8021x *setting);

-

-Returns the scheme used to store the "phase 2" CA certificate.  If the
-returned scheme is NM_SETTING_802_1X_CK_SCHEME_BLOB, use
-nm_setting_802_1x_get_ca_cert_blob(); if NM_SETTING_802_1X_CK_SCHEME_PATH,
-use nm_setting_802_1x_get_ca_cert_path().
-

-

+
nm_setting_802_1x_get_pin_flags ()

+
NMSettingSecretFlags
+nm_setting_802_1x_get_pin_flags (NMSetting8021x *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSetting8021x
-
Returns :
scheme used to store the "phase 2" CA certificate (blob or path)
setting
the NMSetting8021x
 

 

 

+

+
Returns

+
 the NMSettingSecretFlags pertaining to the
+“pin”

+

+

+
 

 

-
nm_setting_802_1x_get_phase2_ca_cert_blob ()

-
const GByteArray *  nm_setting_802_1x_get_phase2_ca_cert_blob
-                                                        (NMSetting8021x *setting);

-

-Returns the "phase 2" CA certificate blob if the CA certificate is stored
-using the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme.  Not all EAP methods use
-a CA certificate (LEAP for example), and those that can take advantage of the
-CA certificate allow it to be unset.  Note that lack of a CA certificate
-reduces security by allowing man-in-the-middle attacks, because the identity
-of the network cannot be confirmed by the client.
-

-

+
nm_setting_802_1x_get_private_key_scheme ()

+
NMSetting8021xCKScheme
+nm_setting_802_1x_get_private_key_scheme
+                               (NMSetting8021x *setting);

+
Returns the scheme used to store the private key.  If the returned scheme is
+NM_SETTING_802_1X_CK_SCHEME_BLOB, use
+nm_setting_802_1x_get_client_cert_blob(); if
+NM_SETTING_802_1X_CK_SCHEME_PATH, use
+nm_setting_802_1x_get_client_cert_path().

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSetting8021x
-
Returns :
the "phase 2" CA certificate data
setting
the NMSetting8021x
 

 

 

+

+
Returns

+
 scheme used to store the private key (blob or path)

+

+

+
 

 

-
nm_setting_802_1x_get_phase2_ca_cert_path ()

-
const char *        nm_setting_802_1x_get_phase2_ca_cert_path
-                                                        (NMSetting8021x *setting);

-

-Returns the "phase 2" CA certificate path if the CA certificate is stored
-using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.  Not all EAP methods use
-a CA certificate (LEAP for example), and those that can take advantage of the
-CA certificate allow it to be unset.  Note that lack of a CA certificate
-reduces security by allowing man-in-the-middle attacks, because the identity
-of the network cannot be confirmed by the client.
-

-

+
nm_setting_802_1x_get_private_key_blob ()

+
const GByteArray *
+nm_setting_802_1x_get_private_key_blob
+                               (NMSetting8021x *setting);

+
Private keys are used to authenticate the connecting client to the network
+when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
+authentication method.

+
WARNING: the private key property is not a "secret" property, and thus
+unencrypted private key data may be readable by unprivileged users.  Private
+keys should always be encrypted with a private key password.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSetting8021x
-
Returns :
path to the "phase 2" CA certificate file
setting
the NMSetting8021x
 

 

 

+

+
Returns

+
 the private key data

+

+

+
 

 

-
nm_setting_802_1x_set_phase2_ca_cert ()

-
gboolean            nm_setting_802_1x_set_phase2_ca_cert
-                                                        (NMSetting8021x *setting,
-                                                         const char *cert_path,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
-                                                         GError **error);

-

-Reads a certificate from disk and sets the "phase2-ca-cert"
-property with the raw certificate data if using the
-NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate
-file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
-

-

+
nm_setting_802_1x_get_private_key_path ()

+
const char *
+nm_setting_802_1x_get_private_key_path
+                               (NMSetting8021x *setting);

+
Private keys are used to authenticate the connecting client to the network
+when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
+authentication method.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSetting8021x
-
cert_path :
when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH
-or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" CA
-certificate file (PEM or DER format).  The path must be UTF-8 encoded; use
-g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
-clears the "phase2" CA certificate.
scheme :
desired storage scheme for the certificate
out_format :
on successful return, the type of the certificate added
error :
on unsuccessful return, an error
Returns :
TRUE if the operation succeeded, FALSE if it was unsuccessful
setting
the NMSetting8021x
 

 

 

+

+
Returns

+
 path to the private key file

+

+

+
 

 

-
nm_setting_802_1x_get_phase2_subject_match ()

-
const char *        nm_setting_802_1x_get_phase2_subject_match
-                                                        (NMSetting8021x *setting);

-

+
nm_setting_802_1x_set_private_key ()

+
gboolean
+nm_setting_802_1x_set_private_key (NMSetting8021x *setting,
+                                   const char *key_path,
+                                   const char *password,
+                                   NMSetting8021xCKScheme scheme,
+                                   NMSetting8021xCKFormat *out_format,
+                                   GError **error);

+
Private keys are used to authenticate the connecting client to the network
+when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
+authentication method.

+
This function reads a private key from disk and sets the
+“private-key” property with the private key file data if using
+the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the private
+key file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.

+
If password
+ is given, this function attempts to decrypt the private key to
+verify that password
+ is correct, and if it is, updates the
+“private-key-password” property with the given password
+.  If
+the decryption is unsuccessful, FALSE is returned, error
+ is set, and no
+internal data is changed.  If no password
+ is given, the private key is
+assumed to be valid, no decryption is performed, and the password may be set
+at a later time.

+
WARNING: the private key property is not a "secret" property, and thus
+unencrypted private key data using the BLOB scheme may be readable by
+unprivileged users.  Private keys should always be encrypted with a private
+key password to prevent unauthorized access to unencrypted private key data.

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-

 





 
 
 
setting :
the NMSetting8021x
-
Returns :
the "phase2-subject-match" property. This is
-the substring to be matched against the subject of the "phase 2"
-authentication server certificate, or NULL no subject verification
-is to be performed.
setting
the NMSetting8021x
 
 

-

-

-

-
nm_setting_802_1x_get_num_phase2_altsubject_matches ()

-
guint32             nm_setting_802_1x_get_num_phase2_altsubject_matches
-                                                        (NMSetting8021x *setting);

-

-Returns the number of entries in the
-"phase2-altsubject-matches" property of this setting.
-

-

----
-
-
-
+
+
+
-
-
+
+
+
-
-




 
setting :
the NMSetting8021x
-
key_path
when scheme
+is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
+NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the private key file
+(PEM, DER, or PKCS12 format).  The path must be UTF-8 encoded; use
+g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
+clears the private key.
 
 

 
Returns :
the number of phase2-altsubject-matches entries.
password
password used to decrypt the private key, or NULL if the password
+is unknown.  If the password is given but fails to decrypt the private key,
+an error is returned.
 
 

-

-

-

-
nm_setting_802_1x_get_phase2_altsubject_match ()

-
const char *        nm_setting_802_1x_get_phase2_altsubject_match
-                                                        (NMSetting8021x *setting,
-                                                         guint32 i);

-

-Returns the "phase 2" altSubjectName match at index i.
-

-

----
-
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+




 
setting :
the NMSettingConnection
-
scheme
desired storage scheme for the private key
 
 

 
i :
the zero-based index of the array of "phase 2" altSubjectName matches
out_format
on successful return, the type of the private key added
 
 

 
Returns :
the "phase 2" altSubjectName match at index i
-
error
on unsuccessful return, an error
 
 

 
 

 

+

+
Returns

+
 TRUE if the operation succeeded, FALSE if it was unsuccessful

+

+

+
 

 

-
nm_setting_802_1x_add_phase2_altsubject_match ()

-
gboolean            nm_setting_802_1x_add_phase2_altsubject_match
-                                                        (NMSetting8021x *setting,
-                                                         const char *phase2_altsubject_match);

-

-Adds an allowed alternate subject name match for "phase 2".  Until
-at least one match is added, the altSubjectName of the "phase 2"
-remote authentication server is not verified.
-

-

+
nm_setting_802_1x_get_private_key_password ()

+
const char *
+nm_setting_802_1x_get_private_key_password
+                               (NMSetting8021x *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSetting8021x
-
phase2_altsubject_match :
the "phase 2" altSubjectName to allow for this
-connection
Returns :
TRUE if the "phase 2" alternative subject name match was
-successfully added, FALSE if it was already allowed.
setting
the NMSetting8021x
 

 

 

+

+
Returns

+
 the private key password used to decrypt the private key if
+previously set with nm_setting_802_1x_set_private_key(), or the
+“private-key-password” property.

+

+

+
 

 

-
nm_setting_802_1x_remove_phase2_altsubject_match ()

-
void                nm_setting_802_1x_remove_phase2_altsubject_match
-                                                        (NMSetting8021x *setting,
-                                                         guint32 i);

-

-Removes the allowed "phase 2" altSubjectName at the specified index.
-

-

+
nm_setting_802_1x_get_private_key_password_flags ()

+
NMSettingSecretFlags
+nm_setting_802_1x_get_private_key_password_flags
+                               (NMSetting8021x *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSetting8021x
-
i :
the index of the "phase 2" altSubjectName match to remove
setting
the NMSetting8021x
 

 

 

+

+
Returns

+
 the NMSettingSecretFlags pertaining to the
+“private-key-password”

+

+

+
 

 

-
nm_setting_802_1x_clear_phase2_altsubject_matches ()

-
void                nm_setting_802_1x_clear_phase2_altsubject_matches
-                                                        (NMSetting8021x *setting);

-

-Clears all "phase 2" altSubjectName matches.
-

-

+
nm_setting_802_1x_get_private_key_format ()

+
NMSetting8021xCKFormat
+nm_setting_802_1x_get_private_key_format
+                               (NMSetting8021x *setting);

+

+
Parameters

+
--+++
-
-
+
+
+

 





 
 
setting :
the NMSetting8021x
-
setting
the NMSetting8021x
 
 

 

 

+

+
Returns

+
 the data format of the private key data stored in the
+“private-key” property

+

+

+
 

 

-
nm_setting_802_1x_get_phase2_client_cert_scheme ()

-
NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_client_cert_scheme
-                                                        (NMSetting8021x *setting);

-

-Returns the scheme used to store the "phase 2" client certificate.  If the
-returned scheme is NM_SETTING_802_1X_CK_SCHEME_BLOB, use
-nm_setting_802_1x_get_client_cert_blob(); if
+
nm_setting_802_1x_get_phase2_private_key_scheme ()

+
NMSetting8021xCKScheme
+nm_setting_802_1x_get_phase2_private_key_scheme
+                               (NMSetting8021x *setting);

+
Returns the scheme used to store the "phase 2" private key.  If the returned
+scheme is NM_SETTING_802_1X_CK_SCHEME_BLOB, use
+nm_setting_802_1x_get_client_cert_blob(); if
 NM_SETTING_802_1X_CK_SCHEME_PATH, use
-nm_setting_802_1x_get_client_cert_path().
-

-

+nm_setting_802_1x_get_client_cert_path().

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSetting8021x
-
Returns :
scheme used to store the "phase 2" client certificate (blob or path)
setting
the NMSetting8021x
 

 

 

+

+
Returns

+
 scheme used to store the "phase 2" private key (blob or path)

+

+

+
 

 

-
nm_setting_802_1x_get_phase2_client_cert_blob ()

-
const GByteArray *  nm_setting_802_1x_get_phase2_client_cert_blob
-                                                        (NMSetting8021x *setting);

-

-Client certificates are used to identify the connecting client to the network
+
nm_setting_802_1x_get_phase2_private_key_blob ()

+
const GByteArray *
+nm_setting_802_1x_get_phase2_private_key_blob
+                               (NMSetting8021x *setting);

+
Private keys are used to authenticate the connecting client to the network
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
-

-

+authentication method.

+
WARNING: the phase2 private key property is not a "secret" property, and thus
+unencrypted private key data may be readable by unprivileged users.  Private
+keys should always be encrypted with a private key password.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSetting8021x
-
Returns :
the "phase 2" client certificate data
setting
the NMSetting8021x
 

 

 

+

+
Returns

+
 the "phase 2" private key data

+

+

+
 

 

-
nm_setting_802_1x_get_phase2_client_cert_path ()

-
const char *        nm_setting_802_1x_get_phase2_client_cert_path
-                                                        (NMSetting8021x *setting);

-

-Client certificates are used to identify the connecting client to the network
+
nm_setting_802_1x_get_phase2_private_key_path ()

+
const char *
+nm_setting_802_1x_get_phase2_private_key_path
+                               (NMSetting8021x *setting);

+
Private keys are used to authenticate the connecting client to the network
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
-

-

+authentication method.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSetting8021x
-
Returns :
path to the "phase 2" client certificate file
setting
the NMSetting8021x
 

 

 

+

+
Returns

+
 path to the "phase 2" private key file

+

+

+
 

 

-
nm_setting_802_1x_set_phase2_client_cert ()

-
gboolean            nm_setting_802_1x_set_phase2_client_cert
-                                                        (NMSetting8021x *setting,
-                                                         const char *cert_path,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
-                                                         GError **error);

-

-Reads a certificate from disk and sets the "phase2-client-cert"
-property with the raw certificate data if using the
-NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate
-file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
-

-

-Client certificates are used to identify the connecting client to the network
+
nm_setting_802_1x_set_phase2_private_key ()

+
gboolean
+nm_setting_802_1x_set_phase2_private_key
+                               (NMSetting8021x *setting,
+                                const char *key_path,
+                                const char *password,
+                                NMSetting8021xCKScheme scheme,
+                                NMSetting8021xCKFormat *out_format,
+                                GError **error);

+
Private keys are used to authenticate the connecting client to the network
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
-

-

+authentication method.

+
This function reads a private key from disk and sets the
+“phase2-private-key” property with the private key file data if
+using the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the
+private key file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.

+
If password
+ is given, this function attempts to decrypt the private key to
+verify that password
+ is correct, and if it is, updates the
+“phase2-private-key-password” property with the given
+password
+.  If the decryption is unsuccessful, FALSE is returned, error
+ is
+set, and no internal data is changed.  If no password
+ is given, the private
+key is assumed to be valid, no decryption is performed, and the password may
+be set at a later time.

+
WARNING: the "phase2" private key property is not a "secret" property, and
+thus unencrypted private key data using the BLOB scheme may be readable by
+unprivileged users.  Private keys should always be encrypted with a private
+key password to prevent unauthorized access to unencrypted private key data.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSetting8021x
-
setting
the NMSetting8021x
 
 

 
cert_path :
when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH
-or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" client
-certificate file (PEM, DER, or PKCS12 format).  The path must be UTF-8
-encoded; use g_filename_to_utf8() to convert if needed.  Passing NULL with
-any scheme clears the "phase2" client certificate.
key_path
when scheme
+is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
+NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" private
+key file (PEM, DER, or PKCS12 format).  The path must be UTF-8 encoded;
+use g_filename_to_utf8() to convert if needed.  Passing NULL with any
+scheme
+clears the private key.
 
 

 
scheme :
desired storage scheme for the certificate
password
password used to decrypt the private key, or NULL if the password
+is unknown.  If the password is given but fails to decrypt the private key,
+an error is returned.
 
 

 
out_format :
on successful return, the type of the certificate added
scheme
desired storage scheme for the private key
 
 

 
error :
on unsuccessful return, an error
out_format
on successful return, the type of the private key added
 
 

 
Returns :
TRUE if the operation succeeded, FALSE if it was unsuccessful
error
on unsuccessful return, an error
 
 

 
 

 

+

+
Returns

+
 TRUE if the operation succeeded, FALSE if it was unsuccessful

+

+

+
 

 

-
nm_setting_802_1x_get_password ()

-
const char *        nm_setting_802_1x_get_password      (NMSetting8021x *setting);

-

+
nm_setting_802_1x_get_phase2_private_key_password ()

+
const char *
+nm_setting_802_1x_get_phase2_private_key_password
+                               (NMSetting8021x *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSetting8021x
-
Returns :
the password used by the authentication method, if any, as specified
-by the "password" property
setting
the NMSetting8021x
 

 

 

+

+
Returns

+
 the private key password used to decrypt the private key if
+previously set with nm_setting_802_1x_set_phase2_private_key() or the
+“phase2-private-key-password” property.

+

+

+
 

 

-
nm_setting_802_1x_get_password_flags ()

-
NMSettingSecretFlags nm_setting_802_1x_get_password_flags
-                                                        (NMSetting8021x *setting);

-

+
nm_setting_802_1x_get_phase2_private_key_password_flags ()

+
NMSettingSecretFlags
+nm_setting_802_1x_get_phase2_private_key_password_flags
+                               (NMSetting8021x *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSetting8021x
-
Returns :
the NMSettingSecretFlags pertaining to the "password"
-
setting
the NMSetting8021x
 

 

 

+

+
Returns

+
 the NMSettingSecretFlags pertaining to the
+“phase2-private-key-password”

+

+

+
 

 

-
nm_setting_802_1x_get_password_raw ()

-
const GByteArray *  nm_setting_802_1x_get_password_raw  (NMSetting8021x *setting);

-

+
nm_setting_802_1x_get_phase2_private_key_format ()

+
NMSetting8021xCKFormat
+nm_setting_802_1x_get_phase2_private_key_format
+                               (NMSetting8021x *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSetting8021x
-
Returns :
the password used by the authentication method as a
-UTF-8-encoded array of bytes, as specified by the
-"password-raw" property
setting
the NMSetting8021x
 

 

 

-

+

+
Returns

+
 the data format of the "phase 2" private key data stored in the
+“phase2-private-key” property

+

+

+
+
+

+
Types and Values

 

-
nm_setting_802_1x_get_password_raw_flags ()

-
NMSettingSecretFlags nm_setting_802_1x_get_password_raw_flags
-                                                        (NMSetting8021x *setting);

-

+
enum NMSetting8021xCKFormat

+
NMSetting8021xCKFormat values indicate the general type of a certificate
+or private key

+

+
Members

+
--+++
-
-
+
+
-
-
+
+
-
-

 





 
 
 
setting :
the NMSetting8021x
+
NM_SETTING_802_1X_CK_FORMAT_UNKNOWN

+
unknown file format

 		 
 

 
Returns :
the NMSettingSecretFlags pertaining to the
-"password-raw"
+
NM_SETTING_802_1X_CK_FORMAT_X509

+
file contains an X.509 format certificate

 		 
 

-

-

-

-
nm_setting_802_1x_get_pin ()

-
const char *        nm_setting_802_1x_get_pin           (NMSetting8021x *setting);

-

----
-
-
-
+
+
-
-
+
+
+




 
setting :
the NMSetting8021x
+
NM_SETTING_802_1X_CK_FORMAT_RAW_KEY

+
file contains an old-style OpenSSL PEM
+or DER private key

 		 
 

 
Returns :
the PIN used by the authentication method, if any, as specified
-by the "pin" property
NM_SETTING_802_1X_CK_FORMAT_PKCS12

+
file contains a PKCS12 certificate
+and private key

+		 
 

 
 

 

+

 

 

-
nm_setting_802_1x_get_pin_flags ()

-
NMSettingSecretFlags nm_setting_802_1x_get_pin_flags    (NMSetting8021x *setting);

-

+
enum NMSetting8021xCKScheme

+
NMSetting8021xCKScheme values indicate how a certificate or private key is
+stored in the setting properties, either as a blob of the item's data, or as
+a path to a certificate or private key file on the filesystem

+

+
Members

+
--+++
-
-
+
+
+
+
+
+
+
-
-
+
+

 





 
 
 
setting :
the NMSetting8021x
+
NM_SETTING_802_1X_CK_SCHEME_UNKNOWN

+
unknown certificate or private key
+scheme

+		 
NM_SETTING_802_1X_CK_SCHEME_BLOB

+
certificate or key is stored as the raw
+item data

 		 
 

 
Returns :
the NMSettingSecretFlags pertaining to the
-"pin"
+
NM_SETTING_802_1X_CK_SCHEME_PATH

+
certificate or key is stored as a path
+to a file containing the certificate or key data

 		 
 

 
 

 

+
 

 

-
nm_setting_802_1x_get_private_key_scheme ()

-
NMSetting8021xCKScheme nm_setting_802_1x_get_private_key_scheme
-                                                        (NMSetting8021x *setting);

+
NM_SETTING_802_1X_SETTING_NAME

+
#define NM_SETTING_802_1X_SETTING_NAME "802-1x"
+

 

-Returns the scheme used to store the private key.  If the returned scheme is
-NM_SETTING_802_1X_CK_SCHEME_BLOB, use
-nm_setting_802_1x_get_client_cert_blob(); if
-NM_SETTING_802_1X_CK_SCHEME_PATH, use
-nm_setting_802_1x_get_client_cert_path().
 

-

+
+

+

+
enum NMSetting8021xError

+

+
Members

+
--+++
-
-
+
+
+
+
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSetting8021x
+
NM_SETTING_802_1X_ERROR_UNKNOWN

+
unknown or unclassified error

+		 
NM_SETTING_802_1X_ERROR_INVALID_PROPERTY

+
the property was invalid

 		 
 

 
Returns :
scheme used to store the private key (blob or path)
NM_SETTING_802_1X_ERROR_MISSING_PROPERTY

+
the property was missing and is
+required

+		 
 

 
 

 

+
 

 

-
nm_setting_802_1x_get_private_key_blob ()

-
const GByteArray *  nm_setting_802_1x_get_private_key_blob
-                                                        (NMSetting8021x *setting);

+
NM_SETTING_802_1X_ERROR

+
#define NM_SETTING_802_1X_ERROR nm_setting_802_1x_error_quark ()
+

 

-Private keys are used to authenticate the connecting client to the network
-when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
 

+

+

+

+
NM_SETTING_802_1X_EAP

+
#define NM_SETTING_802_1X_EAP "eap"
+

 

-WARNING: the private key property is not a "secret" property, and thus
-unencrypted private key data may be readable by unprivileged users.  Private
-keys should always be encrypted with a private key password.
 

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSetting8021x
-
Returns :
the private key data

 

 

 

-
nm_setting_802_1x_get_private_key_path ()

-
const char *        nm_setting_802_1x_get_private_key_path
-                                                        (NMSetting8021x *setting);

+
NM_SETTING_802_1X_IDENTITY

+
#define NM_SETTING_802_1X_IDENTITY "identity"
+

 

-Private keys are used to authenticate the connecting client to the network
-when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
 

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSetting8021x
-
Returns :
path to the private key file

 

 

 

-
nm_setting_802_1x_set_private_key ()

-
gboolean            nm_setting_802_1x_set_private_key   (NMSetting8021x *setting,
-                                                         const char *key_path,
-                                                         const char *password,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
-                                                         GError **error);

+
NM_SETTING_802_1X_ANONYMOUS_IDENTITY

+
#define NM_SETTING_802_1X_ANONYMOUS_IDENTITY "anonymous-identity"
+

+

+

+

+

+

+
NM_SETTING_802_1X_PAC_FILE

+
#define NM_SETTING_802_1X_PAC_FILE "pac-file"
+

 

-Private keys are used to authenticate the connecting client to the network
-when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
 

+

+

+

+
NM_SETTING_802_1X_CA_CERT

+
#define NM_SETTING_802_1X_CA_CERT "ca-cert"
+

 

-This function reads a private key from disk and sets the
-"private-key" property with the private key file data if using
-the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the private
-key file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
 

+

+

+

+
NM_SETTING_802_1X_CA_PATH

+
#define NM_SETTING_802_1X_CA_PATH "ca-path"
+

 

-If password is given, this function attempts to decrypt the private key to
-verify that password is correct, and if it is, updates the
-"private-key-password" property with the given password.  If
-the decryption is unsuccessful, FALSE is returned, error is set, and no
-internal data is changed.  If no password is given, the private key is
-assumed to be valid, no decryption is performed, and the password may be set
-at a later time.
 

+

+

+

+
NM_SETTING_802_1X_SUBJECT_MATCH

+
#define NM_SETTING_802_1X_SUBJECT_MATCH "subject-match"
+

 

-WARNING: the private key property is not a "secret" property, and thus
-unencrypted private key data using the BLOB scheme may be readable by
-unprivileged users.  Private keys should always be encrypted with a private
-key password to prevent unauthorized access to unencrypted private key data.
 

-

----
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSetting8021x
-
key_path :
when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
-NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the private key file
-(PEM, DER, or PKCS12 format).  The path must be UTF-8 encoded; use
-g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
-clears the private key.
password :
password used to decrypt the private key, or NULL if the password
-is unknown.  If the password is given but fails to decrypt the private key,
-an error is returned.
scheme :
desired storage scheme for the private key
out_format :
on successful return, the type of the private key added
error :
on unsuccessful return, an error
Returns :
TRUE if the operation succeeded, FALSE if it was unsuccessful

 

 

 

-
nm_setting_802_1x_get_private_key_password ()

-
const char *        nm_setting_802_1x_get_private_key_password
-                                                        (NMSetting8021x *setting);

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSetting8021x
-
Returns :
the private key password used to decrypt the private key if
-previously set with nm_setting_802_1x_set_private_key(), or the
-"private-key-password" property.

+
NM_SETTING_802_1X_ALTSUBJECT_MATCHES

+
#define NM_SETTING_802_1X_ALTSUBJECT_MATCHES "altsubject-matches"
+

+

+

 

 

 

-
nm_setting_802_1x_get_private_key_password_flags ()

-
NMSettingSecretFlags nm_setting_802_1x_get_private_key_password_flags
-                                                        (NMSetting8021x *setting);

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSetting8021x
-
Returns :
the NMSettingSecretFlags pertaining to the
-"private-key-password"
-

+
NM_SETTING_802_1X_CLIENT_CERT

+
#define NM_SETTING_802_1X_CLIENT_CERT "client-cert"
+

+

+

 

 

 

-
nm_setting_802_1x_get_private_key_format ()

-
NMSetting8021xCKFormat nm_setting_802_1x_get_private_key_format
-                                                        (NMSetting8021x *setting);

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSetting8021x
-
Returns :
the data format of the private key data stored in the
-"private-key" property

+
NM_SETTING_802_1X_PHASE1_PEAPVER

+
#define NM_SETTING_802_1X_PHASE1_PEAPVER "phase1-peapver"
+

+

+

+

+

+

+
NM_SETTING_802_1X_PHASE1_PEAPLABEL

+
#define NM_SETTING_802_1X_PHASE1_PEAPLABEL "phase1-peaplabel"
+

+

+

+

+

+

+
NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING

+
#define NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING "phase1-fast-provisioning"
+

+

+

+

+

+

+
NM_SETTING_802_1X_PHASE2_AUTH

+
#define NM_SETTING_802_1X_PHASE2_AUTH "phase2-auth"
+

+

+

+

+

+

+
NM_SETTING_802_1X_PHASE2_AUTHEAP

+
#define NM_SETTING_802_1X_PHASE2_AUTHEAP "phase2-autheap"
+

+

+

 

 

 

-
nm_setting_802_1x_get_phase2_private_key_scheme ()

-
NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_private_key_scheme
-                                                        (NMSetting8021x *setting);

+
NM_SETTING_802_1X_PHASE2_CA_CERT

+
#define NM_SETTING_802_1X_PHASE2_CA_CERT "phase2-ca-cert"
+

 

-Returns the scheme used to store the "phase 2" private key.  If the returned
-scheme is NM_SETTING_802_1X_CK_SCHEME_BLOB, use
-nm_setting_802_1x_get_client_cert_blob(); if
-NM_SETTING_802_1X_CK_SCHEME_PATH, use
-nm_setting_802_1x_get_client_cert_path().
 

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSetting8021x
-
Returns :
scheme used to store the "phase 2" private key (blob or path)

 

 

 

-
nm_setting_802_1x_get_phase2_private_key_blob ()

-
const GByteArray *  nm_setting_802_1x_get_phase2_private_key_blob
-                                                        (NMSetting8021x *setting);

+
NM_SETTING_802_1X_PHASE2_CA_PATH

+
#define NM_SETTING_802_1X_PHASE2_CA_PATH "phase2-ca-path"
+

 

-Private keys are used to authenticate the connecting client to the network
-when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
 

+

+

+

+
NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH

+
#define NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH "phase2-subject-match"
+

 

-WARNING: the phase2 private key property is not a "secret" property, and thus
-unencrypted private key data may be readable by unprivileged users.  Private
-keys should always be encrypted with a private key password.
 

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSetting8021x
-
Returns :
the "phase 2" private key data

 

 

 

-
nm_setting_802_1x_get_phase2_private_key_path ()

-
const char *        nm_setting_802_1x_get_phase2_private_key_path
-                                                        (NMSetting8021x *setting);

+
NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES

+
#define NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES "phase2-altsubject-matches"
+

 

-Private keys are used to authenticate the connecting client to the network
-when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
 

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSetting8021x
-
Returns :
path to the "phase 2" private key file

 

 

 

-
nm_setting_802_1x_set_phase2_private_key ()

-
gboolean            nm_setting_802_1x_set_phase2_private_key
-                                                        (NMSetting8021x *setting,
-                                                         const char *key_path,
-                                                         const char *password,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
-                                                         GError **error);

+
NM_SETTING_802_1X_PHASE2_CLIENT_CERT

+
#define NM_SETTING_802_1X_PHASE2_CLIENT_CERT "phase2-client-cert"
+

 

-Private keys are used to authenticate the connecting client to the network
-when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
 

+

+

+

+
NM_SETTING_802_1X_PASSWORD

+
#define NM_SETTING_802_1X_PASSWORD "password"
+

 

-This function reads a private key from disk and sets the
-"phase2-private-key" property with the private key file data if
-using the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the
-private key file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
 

+

+

+

+
NM_SETTING_802_1X_PASSWORD_FLAGS

+
#define NM_SETTING_802_1X_PASSWORD_FLAGS "password-flags"
+

 

-If password is given, this function attempts to decrypt the private key to
-verify that password is correct, and if it is, updates the
-"phase2-private-key-password" property with the given
-password.  If the decryption is unsuccessful, FALSE is returned, error is
-set, and no internal data is changed.  If no password is given, the private
-key is assumed to be valid, no decryption is performed, and the password may
-be set at a later time.
 

+

+

+

+
NM_SETTING_802_1X_PASSWORD_RAW

+
#define NM_SETTING_802_1X_PASSWORD_RAW "password-raw"
+

 

-WARNING: the "phase2" private key property is not a "secret" property, and
-thus unencrypted private key data using the BLOB scheme may be readable by
-unprivileged users.  Private keys should always be encrypted with a private
-key password to prevent unauthorized access to unencrypted private key data.
 

-

----
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSetting8021x
-
key_path :
when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
-NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" private
-key file (PEM, DER, or PKCS12 format).  The path must be UTF-8 encoded;
-use g_filename_to_utf8() to convert if needed.  Passing NULL with any
-scheme clears the private key.
password :
password used to decrypt the private key, or NULL if the password
-is unknown.  If the password is given but fails to decrypt the private key,
-an error is returned.
scheme :
desired storage scheme for the private key
out_format :
on successful return, the type of the private key added
error :
on unsuccessful return, an error
Returns :
TRUE if the operation succeeded, FALSE if it was unsuccessful

 

 

 

-
nm_setting_802_1x_get_phase2_private_key_password ()

-
const char *        nm_setting_802_1x_get_phase2_private_key_password
-                                                        (NMSetting8021x *setting);

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSetting8021x
-
Returns :
the private key password used to decrypt the private key if
-previously set with nm_setting_802_1x_set_phase2_private_key() or the
-"phase2-private-key-password" property.

+
NM_SETTING_802_1X_PASSWORD_RAW_FLAGS

+
#define NM_SETTING_802_1X_PASSWORD_RAW_FLAGS "password-raw-flags"
+

+

+

 

 

 

-
nm_setting_802_1x_get_phase2_private_key_password_flags ()

-
NMSettingSecretFlags nm_setting_802_1x_get_phase2_private_key_password_flags
-                                                        (NMSetting8021x *setting);

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSetting8021x
-
Returns :
the NMSettingSecretFlags pertaining to the
-"phase2-private-key-password"
-

+
NM_SETTING_802_1X_PRIVATE_KEY

+
#define NM_SETTING_802_1X_PRIVATE_KEY "private-key"
+

+

+

 

 

 

-
nm_setting_802_1x_get_phase2_private_key_format ()

-
NMSetting8021xCKFormat nm_setting_802_1x_get_phase2_private_key_format
-                                                        (NMSetting8021x *setting);

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSetting8021x
-
Returns :
the data format of the "phase 2" private key data stored in the
-"phase2-private-key" property

-

+
NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD

+
#define NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD "private-key-password"
+

+

+

 
-

-
Property Details

+

 

-
The "altsubject-matches" property

-
  "altsubject-matches"       GSList_gchararray_*   : Read / Write

+
NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS

+
#define NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS "private-key-password-flags"
+

 

-List of strings to be matched against the altSubjectName of the
-certificate presented by the authentication server. If the list
-is empty, no verification of the server certificate's
-altSubjectName is performed.
 

 

 

 

-
The "anonymous-identity" property

-
  "anonymous-identity"       gchar*                : Read / Write

+
NM_SETTING_802_1X_PHASE2_PRIVATE_KEY

+
#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY "phase2-private-key"
+

 

-Anonymous identity string for EAP authentication methods.  Used as the
-unencrypted identity with EAP types that support different tunneled
-identity like EAP-TTLS.
 

-
Default value: NULL

 

 

 

-
The "ca-cert" property

-
  "ca-cert"                  GArray_guchar_*       : Read / Write

+
NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD

+
#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD "phase2-private-key-password"
+

 

-Contains the CA certificate if used by the EAP method specified in the
-"eap" property.  Setting this property directly is
-discouraged; use the nm_setting_802_1x_set_ca_cert() function instead.
 

 

 

 

-
The "ca-path" property

-
  "ca-path"                  gchar*                : Read / Write

+
NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS

+
#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS "phase2-private-key-password-flags"
+

 

-UTF-8 encoded path to a directory containing PEM or DER formatted
-certificates to be added to the verification chain in addition to the
-certificate specified in the "ca-cert" property.
 

-
Default value: NULL

 

 

 

-
The "client-cert" property

-
  "client-cert"              GArray_guchar_*       : Read / Write

+
NM_SETTING_802_1X_PIN

+
#define NM_SETTING_802_1X_PIN "pin"
+

 

-Contains the client certificate if used by the EAP method specified in
-the "eap" property.  Setting this property directly is
-discouraged; use the nm_setting_802_1x_set_client_cert() function instead.
 

 

 

 

-
The "eap" property

-
  "eap"                      GSList_gchararray_*   : Read / Write

+
NM_SETTING_802_1X_PIN_FLAGS

+
#define NM_SETTING_802_1X_PIN_FLAGS "pin-flags"
+

 

-The allowed EAP method to be used when authenticating to the network with
-802.1x.  Valid methods are: "leap", "md5", "tls", "peap", "ttls", and
-"fast".  Each method requires different configuration using the
-properties of this object; refer to wpa_supplicant documentation for the
-allowed combinations.
 

 

 

 

-
The "identity" property

-
  "identity"                 gchar*                : Read / Write

+
NM_SETTING_802_1X_SYSTEM_CA_CERTS

+
#define NM_SETTING_802_1X_SYSTEM_CA_CERTS "system-ca-certs"
+

 

-Identity string for EAP authentication methods.  Often the user's
-user or login name.
 

+

+

+

+
Property Details

+

+
The “altsubject-matches” property

+
  “altsubject-matches”       GSList_gchararray_ *

+
List of strings to be matched against the altSubjectName of the certificate presented by the authentication server. If the list is empty, no verification of the server certificate's altSubjectName is performed.

+
Flags: Read / Write

+

+

+

+
The “anonymous-identity” property

+
  “anonymous-identity”       gchar *

+
Anonymous identity string for EAP authentication methods.  Used as the unencrypted identity with EAP types that support different tunneled identity like EAP-TTLS.

+
Flags: Read / Write

 
Default value: NULL

 

 

 

-
The "pac-file" property

-
  "pac-file"                 gchar*                : Read / Write

-

-UTF-8 encoded file path containing PAC for EAP-FAST.
-

+
The “ca-cert” property

+
  “ca-cert”                  GArray_guchar_ *

+
Contains the CA certificate if used by the EAP method specified in the 'eap' property.  Certificate data is specified using a 'scheme'; two are currently supported: blob and path.  When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data.  When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string 'file://' and ending with a terminating NULL byte.  This property can be unset even if the EAP method supports CA certificates, but this allows man-in-the-middle attacks and is NOT recommended.

+
Flags: Read / Write

+

+

+

+
The “ca-path” property

+
  “ca-path”                  gchar *

+
UTF-8 encoded path to a directory containing PEM or DER formatted certificates to be added to the verification chain in addition to the certificate specified in the 'ca-cert' property.

+
Flags: Read / Write

 
Default value: NULL

 

 

 

-
The "password" property

-
  "password"                 gchar*                : Read / Write

-

-Password used for EAP authentication methods. If both
-"password" and "password-raw" are
-specified, "password" is preferred.
-

+
The “client-cert” property

+
  “client-cert”              GArray_guchar_ *

+
Contains the client certificate if used by the EAP method specified in the 'eap' property.  Certificate data is specified using a 'scheme'; two are currently supported: blob and path.  When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data.  When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string 'file://' and ending with a terminating NULL byte.

+
Flags: Read / Write

+

+

+

+
The “eap” property

+
  “eap”                      GSList_gchararray_ *

+
The allowed EAP method to be used when authenticating to the network with 802.1x. Valid methods are: 'leap', 'md5', 'tls', 'peap', 'ttls', and 'fast'. Each method requires different configuration using the properties of this setting; refer to wpa_supplicant documentation for the allowed combinations.

+
Flags: Read / Write

+

+

+

+
The “identity” property

+
  “identity”                 gchar *

+
Identity string for EAP authentication methods.  Often the user's user or login name.

+
Flags: Read / Write

 
Default value: NULL

 

 

 

-
The "password-flags" property

-
  "password-flags"           guint                 : Read / Write

-

-Flags indicating how to handle "password":.
-

+
The “pac-file” property

+
  “pac-file”                 gchar *

+
UTF-8 encoded file path containing PAC for EAP-FAST.

+
Flags: Read / Write

+
Default value: NULL

+

+

+

+
The “password” property

+
  “password”                 gchar *

+
UTF-8 encoded password used for EAP authentication methods.

+
Flags: Read / Write

+
Default value: NULL

+

+

+

+
The “password-flags” property

+
  “password-flags”           guint

+
Flags indicating how to handle the 802.1x password.

+
Flags: Read / Write

 
Allowed values: <= 7

 
Default value: 0

 

 

 

-
The "password-raw" property

-
  "password-raw"             GArray_guchar_*       : Read / Write

-

-Password used for EAP authentication methods delivered as a
-UTF-8-encoded array of bytes. If both "password"
-and "password-raw" are specified,
-"password" is preferred.
-

+
The “password-raw” property

+
  “password-raw”             GArray_guchar_ *

+
Password used for EAP authentication methods, given as a byte array to allow passwords in other encodings than UTF-8 to be used.  If both 'password' and 'password-raw' are given, 'password' is preferred.

+
Flags: Read / Write

 

 

 

-
The "password-raw-flags" property

-
  "password-raw-flags"       guint                 : Read / Write

-

-Flags indicating how to handle "password-raw":.
-

+
The “password-raw-flags” property

+
  “password-raw-flags”       guint

+
Flags indicating how to handle the 802.1x password byte array.

+
Flags: Read / Write

 
Allowed values: <= 7

 
Default value: 0

 

 

 

-
The "phase1-fast-provisioning" property

-
  "phase1-fast-provisioning" gchar*                : Read / Write

-

-Enables or disables in-line provisioning of EAP-FAST credentials when
-FAST is specified as the EAP method in the "eap" property.
-Recognized values are "0" (disabled), "1" (allow unauthenticated
-provisioning), "2" (allow authenticated provisioning), and "3" (allow
-both authenticated and unauthenticated provisioning).  See the
-wpa_supplicant documentation for more details.
-

+
The “phase1-fast-provisioning” property

+
  “phase1-fast-provisioning” gchar *

+
Enables or disables in-line provisioning of EAP-FAST credentials when FAST is specified as the EAP method in the #NMSetting8021x:eap property. Allowed values are '0' (disabled), '1' (allow unauthenticated provisioning), '2' (allow authenticated provisioning), and '3' (allow both authenticated and unauthenticated provisioning).  See the wpa_supplicant documentation for more details.

+
Flags: Read / Write

 
Default value: NULL

 

 

 

-
The "phase1-peaplabel" property

-
  "phase1-peaplabel"         gchar*                : Read / Write

-

-Forces use of the new PEAP label during key derivation.  Some RADIUS
-servers may require forcing the new PEAP label to interoperate with
-PEAPv1.  Set to "1" to force use of the new PEAP label.  See the
-wpa_supplicant documentation for more details.
-

+
The “phase1-peaplabel” property

+
  “phase1-peaplabel”         gchar *

+
Forces use of the new PEAP label during key derivation.  Some RADIUS servers may require forcing the new PEAP label to interoperate with PEAPv1.  Set to '1' to force use of the new PEAP label.  See the wpa_supplicant documentation for more details.

+
Flags: Read / Write

 
Default value: NULL

 

 

 

-
The "phase1-peapver" property

-
  "phase1-peapver"           gchar*                : Read / Write

-

-Forces which PEAP version is used when PEAP is set as the EAP method in
-the "eap" property.  When unset, the version reported by
-the server will be used.  Sometimes when using older RADIUS servers, it
-is necessary to force the client to use a particular PEAP version.  To do
-so, this property may be set to "0" or "1" to force that specific PEAP
-version.
-

+
The “phase1-peapver” property

+
  “phase1-peapver”           gchar *

+
Forces which PEAP version is used when PEAP is set as the EAP method in 'eap' property.  When unset, the version reported by the server will be used.  Sometimes when using older RADIUS servers, it is necessary to force the client to use a particular PEAP version.  To do so, this property may be set to '0' or '1' to force that specific PEAP version.

+
Flags: Read / Write

 
Default value: NULL

 

 

 

-
The "phase2-altsubject-matches" property

-
  "phase2-altsubject-matches" GSList_gchararray_*   : Read / Write

-

-List of strings to be matched against the altSubjectName of the
-certificate presented by the authentication server during the
-inner "phase 2" authentication. If the list is empty, no
-verification of the server certificate's altSubjectName is
-performed.
-

+
The “phase2-altsubject-matches” property

+
  “phase2-altsubject-matches” GSList_gchararray_ *

+
List of strings to be matched against List of strings to be matched against the altSubjectName of the certificate presented by the authentication server during the inner 'phase 2' authentication. If the list is empty, no verification of the server certificate's altSubjectName is performed.

+
Flags: Read / Write

 

 

 

-
The "phase2-auth" property

-
  "phase2-auth"              gchar*                : Read / Write

-

-Specifies the allowed "phase 2" inner non-EAP authentication methods when
-an EAP method that uses an inner TLS tunnel is specified in the
-"eap" property.  Recognized non-EAP phase2 methods are
-"pap", "chap", "mschap", "mschapv2", "gtc", "otp", "md5", and "tls".
-Each 'phase 2' inner method requires specific parameters for successful
-authentication; see the wpa_supplicant documentation for more details.
-

+
The “phase2-auth” property

+
  “phase2-auth”              gchar *

+
Specifies the allowed 'phase 2' inner non-EAP authentication methods when an EAP method that uses an inner TLS tunnel is specified in the 'eap' property. Recognized non-EAP phase2 methods are 'pap', 'chap', 'mschap', 'mschapv2', 'gtc', 'otp', 'md5', and 'tls'.  Each 'phase 2' inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details.

+
Flags: Read / Write

 
Default value: NULL

 

 

 

-
The "phase2-autheap" property

-
  "phase2-autheap"           gchar*                : Read / Write

-

-Specifies the allowed "phase 2" inner EAP-based authentication methods
-when an EAP method that uses an inner TLS tunnel is specified in the
-"eap" property.  Recognized EAP-based phase2 methods are
-"md5", "mschapv2", "otp", "gtc", and "tls". Each 'phase 2' inner method
-requires specific parameters for successful authentication; see the
-wpa_supplicant documentation for more details.
-

+
The “phase2-autheap” property

+
  “phase2-autheap”           gchar *

+
Specifies the allowed 'phase 2' inner EAP-based authentication methods when an EAP method that uses an inner TLS tunnel is specified in the 'eap' property. Recognized EAP-based 'phase 2' methods are 'md5', 'mschapv2', 'otp', 'gtc', and 'tls'. Each 'phase 2' inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details.

+
Flags: Read / Write

 
Default value: NULL

 

 

 

-
The "phase2-ca-cert" property

-
  "phase2-ca-cert"           GArray_guchar_*       : Read / Write

-

-Contains the CA certificate if used by the EAP method specified in the
-"phase2-auth" or "phase2-autheap" properties.
-Setting this property directly is discouraged; use the
-nm_setting_802_1x_set_phase2_ca_cert() function instead.
-

+
The “phase2-ca-cert” property

+
  “phase2-ca-cert”           GArray_guchar_ *

+
Contains the 'phase 2' CA certificate if used by the EAP method specified in the 'phase2-auth' or 'phase2-autheap' properties.  Certificate data is specified using a 'scheme'; two are currentlysupported: blob and path. When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data. When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string 'file://' and ending with a terminating NULL byte.  This property can be unset even if the EAP method supports CA certificates, but this allows man-in-the-middle attacks and is NOT recommended.

+
Flags: Read / Write

 

 

 

-
The "phase2-ca-path" property

-
  "phase2-ca-path"           gchar*                : Read / Write

-

-UTF-8 encoded path to a directory containing PEM or DER formatted
-certificates to be added to the verification chain in addition to the
-certificate specified in the "phase2-ca-cert" property.
-

+
The “phase2-ca-path” property

+
  “phase2-ca-path”           gchar *

+
UTF-8 encoded path to a directory containing PEM or DER formatted certificates to be added to the verification chain in addition to the certificate specified in the 'phase2-ca-cert' property.

+
Flags: Read / Write

 
Default value: NULL

 

 

 

-
The "phase2-client-cert" property

-
  "phase2-client-cert"       GArray_guchar_*       : Read / Write

-

-Contains the client certificate if used by the EAP method specified in
-the "phase2-auth" or "phase2-autheap"
-properties.  Setting this property directly is discouraged; use the
-nm_setting_802_1x_set_phase2_client_cert() function instead.
-

+
The “phase2-client-cert” property

+
  “phase2-client-cert”       GArray_guchar_ *

+
Contains the 'phase 2' client certificate if used by the EAP method specified in the 'phase2-auth' or 'phase2-autheap' properties. Certificate data is specified using a 'scheme'; two are currently supported: blob and path.  When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data.  When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string 'file://' and ending with a terminating NULL byte.

+
Flags: Read / Write

 

 

 

-
The "phase2-private-key" property

-
  "phase2-private-key"       GArray_guchar_*       : Read / Write

-

-Private key data used by "phase 2" inner authentication methods.
-

-

-Contains the "phase 2" inner private key if the "phase2-auth"
-or "phase2-autheap" property is set to 'tls'.  Setting this
-property directly is discouraged; use the
-nm_setting_802_1x_set_phase2_private_key() function instead.
-

+
The “phase2-private-key” property

+
  “phase2-private-key”       GArray_guchar_ *

+
Contains the 'phase 2' inner private key when the 'phase2-auth' or 'phase2-autheap' property is set to 'tls'.  Key data is specified using a 'scheme'; two are currently supported: blob and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string 'file://' and ending with a terminating NULL byte.  When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the 'phase2-private-key-password' property must be set to password used to decrypt the PKCS#12 certificate and key.  When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string 'file://' and and ending with a terminating NULL byte, and as with the blob scheme the 'phase2-private-key-password' property must be set to the password used to decode the PKCS#12 private key and certificate.

+
Flags: Read / Write

 

 

 

-
The "phase2-private-key-password" property

-
  "phase2-private-key-password" gchar*                : Read / Write

-

-The password used to decrypt the private key specified in
-"phase2-private-key" when the private key either uses the
-path scheme, or if the private key is a PKCS12 format key.  Setting this
-property directly is not generally necessary except when returning
-secrets to NetworkManager; it is generally set automatically when setting
-the private key by the nm_setting_802_1x_set_phase2_private_key() function.
-

+
The “phase2-private-key-password” property

+
  “phase2-private-key-password” gchar *

+
The password used to decrypt the 'phase 2' private key specified in the 'private-key' property when the phase2 private key either uses the path scheme, or if the phase2 private key is a PKCS#12 format key.

+
Flags: Read / Write

 
Default value: NULL

 

 

 

-
The "phase2-private-key-password-flags" property

-
  "phase2-private-key-password-flags" guint                 : Read / Write

-

-Flags indicating how to handle "phase2-private-key-password":.
-

+
The “phase2-private-key-password-flags” property

+
  “phase2-private-key-password-flags” guint

+
Flags indicating how to handle the 802.1x phase2 private key password.

+
Flags: Read / Write

 
Allowed values: <= 7

 
Default value: 0

 

 

 

-
The "phase2-subject-match" property

-
  "phase2-subject-match"     gchar*                : Read / Write

-

-Substring to be matched against the subject of the certificate
-presented by the authentication server during the inner "phase
-2" authentication. When unset, no verification of the
-authentication server certificate's subject is performed.
-

+
The “phase2-subject-match” property

+
  “phase2-subject-match”     gchar *

+
Substring to be matched against the subject of the certificate presented by the authentication server during the inner 'phase2' authentication. When unset, no verification of the authentication server certificate's subject is performed.

+
Flags: Read / Write

 
Default value: NULL

 

 

 

-
The "pin" property

-
  "pin"                      gchar*                : Read / Write

-

-PIN used for EAP authentication methods.
-

+
The “pin” property

+
  “pin”                      gchar *

+
PIN used for EAP authentication methods.

+
Flags: Read / Write

 
Default value: NULL

 

 

 

-
The "pin-flags" property

-
  "pin-flags"                guint                 : Read / Write

-

-Flags indicating how to handle "pin":.
-

+
The “pin-flags” property

+
  “pin-flags”                guint

+
Flags indicating how to handle the 802.1x PIN.

+
Flags: Read / Write

 
Allowed values: <= 7

 
Default value: 0

 

 

 

-
The "private-key" property

-
  "private-key"              GArray_guchar_*       : Read / Write

-

-Contains the private key if the "eap" property is set to
-'tls'.  Setting this property directly is discouraged; use the
-nm_setting_802_1x_set_private_key() function instead.
-

-

-WARNING: "private-key" is not a "secret" property, and thus
-unencrypted private key data using the BLOB scheme may be readable by
-unprivileged users.  Private keys should always be encrypted with a
-private key password to prevent unauthorized access to unencrypted
-private key data.
-

+
The “private-key” property

+
  “private-key”              GArray_guchar_ *

+
Contains the private key when the 'eap' property is set to 'tls'.  Key data is specified using a 'scheme'; two are currently supported: blob and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string 'file://' and ending with a terminating NULL byte.  When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the 'private-key-password' property must be set to password used to decrypt the PKCS#12 certificate and key.  When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string 'file://' and and ending with a terminating NULL byte, and as with the blob scheme the 'private-key-password' property must be set to the password used to decode the PKCS#12 private key and certificate.

+
Flags: Read / Write

 

 

 

-
The "private-key-password" property

-
  "private-key-password"     gchar*                : Read / Write

-

-The password used to decrypt the private key specified in
-"private-key" when the private key either uses the path
-scheme, or if the private key is a PKCS12 format key.  Setting this
-property directly is not generally necessary except when returning
-secrets to NetworkManager; it is generally set automatically when setting
-the private key by the nm_setting_802_1x_set_private_key() function.
-

+
The “private-key-password” property

+
  “private-key-password”     gchar *

+
The password used to decrypt the private key specified in the 'private-key' property when the private key either uses the path scheme, or if the private key is a PKCS#12 format key.

+
Flags: Read / Write

 
Default value: NULL

 

 

 

-
The "private-key-password-flags" property

-
  "private-key-password-flags" guint                 : Read / Write

-

-Flags indicating how to handle "private-key-password":.
-

+
The “private-key-password-flags” property

+
  “private-key-password-flags” guint

+
Flags indicating how to handle the 802.1x private key password.

+
Flags: Read / Write

 
Allowed values: <= 7

 
Default value: 0

 

 

 

-
The "subject-match" property

-
  "subject-match"            gchar*                : Read / Write

-

-Substring to be matched against the subject of the certificate
-presented by the authentication server. When unset, no
-verification of the authentication server certificate's subject
-is performed.
-

+
The “subject-match” property

+
  “subject-match”            gchar *

+
Substring to be matched against the subject of the certificate presented by the authentication server. When unset, no verification of the authentication server certificate's subject is performed.

+
Flags: Read / Write

 
Default value: NULL

 

 

 

-
The "system-ca-certs" property

-
  "system-ca-certs"          gboolean              : Read / Write / Construct

-

-When TRUE, overrides "ca-path" and
-"phase2-ca-path" properties using the system CA directory
-specified at configure time with the --system-ca-path switch.  The
-certificates in this directory are added to the verification chain in
-addition to any certificates specified by the "ca-cert"
-and "phase2-ca-cert" properties.
-

+
The “system-ca-certs” property

+
  “system-ca-certs”          gboolean

+
When TRUE, overrides 'ca-path' and 'phase2-ca-path' properties using the system CA directory specified at configure time with the --system-ca-path switch.  The certificates in this directory are added to the verification chain in addition to any certificates specified by the 'ca-cert' and 'phase2-ca-cert' properties.

+
Flags: Read / Write / Construct

 
Default value: FALSE

 

 

 
 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.20
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingAdsl.html b/docs/libnm-util/html/NMSettingAdsl.html
index 761094b9..25a642bb 100644
--- a/docs/libnm-util/html/NMSettingAdsl.html
+++ b/docs/libnm-util/html/NMSettingAdsl.html
@@ -2,34 +2,28 @@
 
 
 
-NMSettingAdsl
+libnm-util Reference Manual: NMSettingAdsl
 
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
 

 

 

@@ -37,74 +31,438 @@
 
NMSettingAdsl
NMSettingAdsl — Describes ADSL-based properties

-
+

 
 
 

-

-
Synopsis

-
-#include <nm-setting-adsl.h>
-
-#define             NM_SETTING_ADSL_SETTING_NAME
-enum                NMSettingAdslError;
-#define             NM_SETTING_ADSL_ERROR
-GQuark              nm_setting_adsl_error_quark         (void);
-#define             NM_SETTING_ADSL_USERNAME
-#define             NM_SETTING_ADSL_PASSWORD
-#define             NM_SETTING_ADSL_PASSWORD_FLAGS
-#define             NM_SETTING_ADSL_PROTOCOL
-#define             NM_SETTING_ADSL_ENCAPSULATION
-#define             NM_SETTING_ADSL_VPI
-#define             NM_SETTING_ADSL_VCI
-#define             NM_SETTING_ADSL_PROTOCOL_PPPOA
-#define             NM_SETTING_ADSL_PROTOCOL_PPPOE
-#define             NM_SETTING_ADSL_PROTOCOL_IPOATM
-#define             NM_SETTING_ADSL_ENCAPSULATION_VCMUX
-#define             NM_SETTING_ADSL_ENCAPSULATION_LLC
-                    NMSettingAdsl;
-                    NMSettingAdslClass;
-NMSetting *         nm_setting_adsl_new                 (void);
-const char *        nm_setting_adsl_get_username        (NMSettingAdsl *setting);
-const char *        nm_setting_adsl_get_password        (NMSettingAdsl *setting);
-const char *        nm_setting_adsl_get_protocol        (NMSettingAdsl *setting);
-const char *        nm_setting_adsl_get_encapsulation   (NMSettingAdsl *setting);
-guint32             nm_setting_adsl_get_vpi             (NMSettingAdsl *setting);
-guint32             nm_setting_adsl_get_vci             (NMSettingAdsl *setting);
-NMSettingSecretFlags nm_setting_adsl_get_password_flags (NMSettingAdsl *setting);
-

+

+
Functions

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





+GQuark
+
+nm_setting_adsl_error_quark ()
+

+NMSetting *
+
+nm_setting_adsl_new ()
+
const char *
+
+nm_setting_adsl_get_username ()
+
const char *
+
+nm_setting_adsl_get_password ()
+
const char *
+
+nm_setting_adsl_get_protocol ()
+
const char *
+
+nm_setting_adsl_get_encapsulation ()
+

+guint32
+
+nm_setting_adsl_get_vpi ()
+

+guint32
+
+nm_setting_adsl_get_vci ()
+

+NMSettingSecretFlags
+
+nm_setting_adsl_get_password_flags ()
+

+

+

+
Properties

+

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+






+gchar *encapsulationRead / Write

+gchar *passwordRead / Write
guintpassword-flagsRead / Write

+gchar *protocolRead / Write

+gchar *usernameRead / Write
guintvciRead / Write
guintvpiRead / Write

+

+

+
Types and Values

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+




#defineNM_SETTING_ADSL_SETTING_NAME
enumNMSettingAdslError
#defineNM_SETTING_ADSL_ERROR
#defineNM_SETTING_ADSL_USERNAME
#defineNM_SETTING_ADSL_PASSWORD
#defineNM_SETTING_ADSL_PASSWORD_FLAGS
#defineNM_SETTING_ADSL_PROTOCOL
#defineNM_SETTING_ADSL_ENCAPSULATION
#defineNM_SETTING_ADSL_VPI
#defineNM_SETTING_ADSL_VCI
#defineNM_SETTING_ADSL_PROTOCOL_PPPOA
#defineNM_SETTING_ADSL_PROTOCOL_PPPOE
#defineNM_SETTING_ADSL_PROTOCOL_IPOATM
#defineNM_SETTING_ADSL_ENCAPSULATION_VCMUX
#defineNM_SETTING_ADSL_ENCAPSULATION_LLC

 

 

 
Object Hierarchy

-
-  GEnum
-   +----NMSettingAdslError
-

-
-  GObject
-   +----NMSetting
-         +----NMSettingAdsl
+
    GEnum
+    ╰── NMSettingAdslError
+    GObject
+    ╰── NMSetting
+        ╰── NMSettingAdsl
 

 

 

-
Properties

-
-  "encapsulation"            gchar*                : Read / Write
-  "password"                 gchar*                : Read / Write
-  "password-flags"           guint                 : Read / Write
-  "protocol"                 gchar*                : Read / Write
-  "username"                 gchar*                : Read / Write
-  "vci"                      guint                 : Read / Write
-  "vpi"                      guint                 : Read / Write
+
Includes

+
#include <nm-setting-adsl.h>
 

 

 

 
Description

-

-The NMSettingAdsl object is a NMSetting subclass that describes
-properties of ADSL connections.
-

+
The NMSettingAdsl object is a NMSetting subclass that describes
+properties of ADSL connections.

 

 

-
Details

+
Functions

+

+
nm_setting_adsl_error_quark ()

+
GQuark
+nm_setting_adsl_error_quark (void);

+
Registers an error quark for NMSettingAdsl if necessary.

+

+
Returns

+
 the error quark used for NMSettingAdsl errors.

+

+

+

+

+

+
nm_setting_adsl_new ()

+
NMSetting *
+nm_setting_adsl_new (void);

+
Creates a new NMSettingAdsl object with default values.

+

+
Returns

+
 the new empty NMSettingAdsl object

+

+

+

+

+

+
nm_setting_adsl_get_username ()

+
const char *
+nm_setting_adsl_get_username (NMSettingAdsl *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingAdsl
 

+

+

+
Returns

+
 the “username” property of the setting

+

+

+

+

+

+
nm_setting_adsl_get_password ()

+
const char *
+nm_setting_adsl_get_password (NMSettingAdsl *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingAdsl
 

+

+

+
Returns

+
 the “password” property of the setting

+

+

+

+

+

+
nm_setting_adsl_get_protocol ()

+
const char *
+nm_setting_adsl_get_protocol (NMSettingAdsl *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingAdsl
 

+

+

+
Returns

+
 the “protocol” property of the setting

+

+

+

+

+

+
nm_setting_adsl_get_encapsulation ()

+
const char *
+nm_setting_adsl_get_encapsulation (NMSettingAdsl *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingAdsl
 

+

+

+
Returns

+
 the “encapsulation” property of the setting

+

+

+

+

+

+
nm_setting_adsl_get_vpi ()

+
guint32
+nm_setting_adsl_get_vpi (NMSettingAdsl *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingAdsl
 

+

+

+
Returns

+
 the “vpi” property of the setting

+

+

+

+

+

+
nm_setting_adsl_get_vci ()

+
guint32
+nm_setting_adsl_get_vci (NMSettingAdsl *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingAdsl
 

+

+

+
Returns

+
 the “vci” property of the setting

+

+

+

+

+

+
nm_setting_adsl_get_password_flags ()

+
NMSettingSecretFlags
+nm_setting_adsl_get_password_flags (NMSettingAdsl *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingAdsl
 

+

+

+
Returns

+
 the NMSettingSecretFlags pertaining to the “password”

+

+

+

+

+

+
Types and Values

 

 
NM_SETTING_ADSL_SETTING_NAME

 
#define NM_SETTING_ADSL_SETTING_NAME "adsl"
@@ -114,38 +472,42 @@ properties of ADSL connections.
 

 

 

-
enum NMSettingAdslError

-
typedef enum {
-	NM_SETTING_ADSL_ERROR_UNKNOWN = 0,              /*< nick=UnknownError >*/
-	NM_SETTING_ADSL_ERROR_INVALID_PROPERTY,         /*< nick=InvalidProperty >*/
-	NM_SETTING_ADSL_ERROR_MISSING_PROPERTY          /*< nick=MissingProperty >*/
-} NMSettingAdslError;
-

-

+
enum NMSettingAdslError

+

+
Members

+
--+++
-
-
+
+
-
-
+
+
-
-
+
+

 





 
 
 
NM_SETTING_ADSL_ERROR_UNKNOWN
unknown or unclassified error
+
NM_SETTING_ADSL_ERROR_UNKNOWN

+
unknown or unclassified error

 		 
 

 
NM_SETTING_ADSL_ERROR_INVALID_PROPERTY
the property was invalid
+
NM_SETTING_ADSL_ERROR_INVALID_PROPERTY

+
the property was invalid

 		 
 

 
NM_SETTING_ADSL_ERROR_MISSING_PROPERTY
the property was missing and is
-required
+
NM_SETTING_ADSL_ERROR_MISSING_PROPERTY

+
the property was missing and is
+required

 		 
 

 
 

 

+

 

 

 
NM_SETTING_ADSL_ERROR

@@ -156,24 +518,6 @@ required
 

 

 

-
nm_setting_adsl_error_quark ()

-
GQuark              nm_setting_adsl_error_quark         (void);

-

-Registers an error quark for NMSettingAdsl if necessary.
-

-

----
-
-
-
-
-




Returns :
the error quark used for NMSettingAdsl errors.

-

-

-

 
NM_SETTING_ADSL_USERNAME

 
#define NM_SETTING_ADSL_USERNAME            "username"
 

@@ -268,267 +612,64 @@ Registers an error quark for 
-
NMSettingAdsl

-
typedef struct _NMSettingAdsl NMSettingAdsl;

-

-

-

-

-

-
NMSettingAdslClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingAdslClass;
-

-

-

-

-

-

-
nm_setting_adsl_new ()

-
NMSetting *         nm_setting_adsl_new                 (void);

-

-Creates a new NMSettingAdsl object with default values.
-

-

----
-
-
-
-
-




Returns :
the new empty NMSettingAdsl object

-

-

-

-
nm_setting_adsl_get_username ()

-
const char *        nm_setting_adsl_get_username        (NMSettingAdsl *setting);

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingAdsl
-
Returns :
the "username" property of the setting

-

-

-

-
nm_setting_adsl_get_password ()

-
const char *        nm_setting_adsl_get_password        (NMSettingAdsl *setting);

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingAdsl
-
Returns :
the "password" property of the setting

-

-

-

-
nm_setting_adsl_get_protocol ()

-
const char *        nm_setting_adsl_get_protocol        (NMSettingAdsl *setting);

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingAdsl
-
Returns :
the "protocol" property of the setting

-

-

-

-
nm_setting_adsl_get_encapsulation ()

-
const char *        nm_setting_adsl_get_encapsulation   (NMSettingAdsl *setting);

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingAdsl
-
Returns :
the "encapsulation" property of the setting

-

-

-

-
nm_setting_adsl_get_vpi ()

-
guint32             nm_setting_adsl_get_vpi             (NMSettingAdsl *setting);

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingAdsl
-
Returns :
the "vpi" property of the setting

-

-

-

-
nm_setting_adsl_get_vci ()

-
guint32             nm_setting_adsl_get_vci             (NMSettingAdsl *setting);

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingAdsl
-
Returns :
the "vci" property of the setting

-

-

-

-
nm_setting_adsl_get_password_flags ()

-
NMSettingSecretFlags nm_setting_adsl_get_password_flags (NMSettingAdsl *setting);

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingAdsl
-
Returns :
the NMSettingSecretFlags pertaining to the "password"
-

-

 

 

 
Property Details

 

-
The "encapsulation" property

-
  "encapsulation"            gchar*                : Read / Write

-

-ADSL connection encapsulation, can be vcmux or llc.
-

+
The “encapsulation” property

+
  “encapsulation”            gchar *

+
Encapsulation of ADSL connection.

+
Flags: Read / Write

 
Default value: NULL

 

 

 

-
The "password" property

-
  "password"                 gchar*                : Read / Write

-

-Password used to authenticate with the ADSL service.
-

+
The “password” property

+
  “password”                 gchar *

+
Password used to authenticate with the pppoa service.

+
Flags: Read / Write

 
Default value: NULL

 

 

 

-
The "password-flags" property

-
  "password-flags"           guint                 : Read / Write

-

-Flags indicating how to handle "password":.
-

+
The “password-flags” property

+
  “password-flags”           guint

+
Flags indicating how to handle the ADSL password.

+
Flags: Read / Write

 
Allowed values: <= 7

 
Default value: 0

 

 

 

-
The "protocol" property

-
  "protocol"                 gchar*                : Read / Write

-

-ADSL connection protocol, can be pppoa, pppoe or ipoatm.
-

+
The “protocol” property

+
  “protocol”                 gchar *

+
ADSL connection protocol.

+
Flags: Read / Write

 
Default value: NULL

 

 

 

-
The "username" property

-
  "username"                 gchar*                : Read / Write

-

-Username used to authenticate with the ADSL service.
-

+
The “username” property

+
  “username”                 gchar *

+
Username used to authenticate with the pppoa service.

+
Flags: Read / Write

 
Default value: NULL

 

 

 

-
The "vci" property

-
  "vci"                      guint                 : Read / Write

-

-ADSL connection vci.
-

+
The “vci” property

+
  “vci”                      guint

+
VCI of ADSL connection.

+
Flags: Read / Write

 
Allowed values: <= 65536

 
Default value: 0

 

 

 

-
The "vpi" property

-
  "vpi"                      guint                 : Read / Write

-

-ADSL connection vpi.
-

+
The “vpi” property

+
  “vpi”                      guint

+
VPI of ADSL connection.

+
Flags: Read / Write

 
Allowed values: <= 65536

 
Default value: 0

 

@@ -536,6 +677,6 @@ ADSL connection vpi.
 

 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.20

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingBluetooth.html b/docs/libnm-util/html/NMSettingBluetooth.html
index 388ae5e7..0fa1c00a 100644
--- a/docs/libnm-util/html/NMSettingBluetooth.html
+++ b/docs/libnm-util/html/NMSettingBluetooth.html
@@ -2,34 +2,28 @@
 
 
 
-NMSettingBluetooth
+libnm-util Reference Manual: NMSettingBluetooth
 
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
 

 

 

@@ -37,59 +31,218 @@
 
NMSettingBluetooth
NMSettingBluetooth — Describes Bluetooth connection properties

-
+

 
 
 

-

-
Synopsis

-
-#include <nm-setting-bluetooth.h>
-
-#define             NM_SETTING_BLUETOOTH_SETTING_NAME
-enum                NMSettingBluetoothError;
-#define             NM_SETTING_BLUETOOTH_ERROR
-GQuark              nm_setting_bluetooth_error_quark    (void);
-#define             NM_SETTING_BLUETOOTH_BDADDR
-#define             NM_SETTING_BLUETOOTH_TYPE
-#define             NM_SETTING_BLUETOOTH_TYPE_DUN
-#define             NM_SETTING_BLUETOOTH_TYPE_PANU
-                    NMSettingBluetooth;
-                    NMSettingBluetoothClass;
-NMSetting *         nm_setting_bluetooth_new            (void);
-const GByteArray *  nm_setting_bluetooth_get_bdaddr     (NMSettingBluetooth *setting);
-const char *        nm_setting_bluetooth_get_connection_type
-                                                        (NMSettingBluetooth *setting);
-

+

+
Functions

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





+GQuark
+
+nm_setting_bluetooth_error_quark ()
+

+NMSetting *
+
+nm_setting_bluetooth_new ()
+
const GByteArray *
+
+nm_setting_bluetooth_get_bdaddr ()
+
const char *
+
+nm_setting_bluetooth_get_connection_type ()
+

+

+

+
Properties

+

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+






+GArray_guchar_ *bdaddrRead / Write

+gchar *typeRead / Write

+

+

+
Types and Values

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+




#defineNM_SETTING_BLUETOOTH_SETTING_NAME
enumNMSettingBluetoothError
#defineNM_SETTING_BLUETOOTH_ERROR
#defineNM_SETTING_BLUETOOTH_BDADDR
#defineNM_SETTING_BLUETOOTH_TYPE
#defineNM_SETTING_BLUETOOTH_TYPE_DUN
#defineNM_SETTING_BLUETOOTH_TYPE_PANU

 

 

 
Object Hierarchy

-
-  GEnum
-   +----NMSettingBluetoothError
-

-
-  GObject
-   +----NMSetting
-         +----NMSettingBluetooth
+
    GEnum
+    ╰── NMSettingBluetoothError
+    GObject
+    ╰── NMSetting
+        ╰── NMSettingBluetooth
 

 

 

-
Properties

-
-  "bdaddr"                   GArray_guchar_*       : Read / Write
-  "type"                     gchar*                : Read / Write
+
Includes

+
#include <nm-setting-bluetooth.h>
 

 

 

 
Description

-

-The NMSettingBluetooth object is a NMSetting subclass that describes
+
The NMSettingBluetooth object is a NMSetting subclass that describes
 properties necessary for connection to devices that provide network
 connections via the Bluetooth Dial-Up Networking (DUN) and Network Access
-Point (NAP) profiles.
-

+Point (NAP) profiles.

+

+

+
Functions

+

+
nm_setting_bluetooth_error_quark ()

+
GQuark
+nm_setting_bluetooth_error_quark (void);

+
Registers an error quark for NMSettingBluetooth if necessary.

+

+
Returns

+
 the error quark used for NMSettingBluetooth errors.

+

+

+

+

+

+
nm_setting_bluetooth_new ()

+
NMSetting *
+nm_setting_bluetooth_new (void);

+
Creates a new NMSettingBluetooth object with default values.

+

+
Returns

+
 the new empty NMSettingBluetooth object. 

+
[transfer full]

+

+

+

+

+
nm_setting_bluetooth_get_bdaddr ()

+
const GByteArray *
+nm_setting_bluetooth_get_bdaddr (NMSettingBluetooth *setting);

+
Gets the Bluetooth address of the remote device which this setting
+describes a connection to.

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingBluetooth
 

+

+

+
Returns

+
 the Bluetooth address

+

+

+

+

+

+
nm_setting_bluetooth_get_connection_type ()

+
const char *
+nm_setting_bluetooth_get_connection_type
+                               (NMSettingBluetooth *setting);

+
Returns the connection method for communicating with the remote device (i.e.
+either DUN to a DUN-capable device or PANU to a NAP-capable device).

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingBluetooth
 

+

+

+
Returns

+
 the type, either NM_SETTING_BLUETOOTH_PANU or NM_SETTING_BLUETOOTH_DUN

+

+

+

 

 

-
Details

+
Types and Values

 

 
NM_SETTING_BLUETOOTH_SETTING_NAME

 
#define NM_SETTING_BLUETOOTH_SETTING_NAME "bluetooth"
@@ -99,46 +252,51 @@ Point (NAP) profiles.
 

 

 

-
enum NMSettingBluetoothError

-
typedef enum {
-	NM_SETTING_BLUETOOTH_ERROR_UNKNOWN = 0,            /*< nick=UnknownError >*/
-	NM_SETTING_BLUETOOTH_ERROR_INVALID_PROPERTY,       /*< nick=InvalidProperty >*/
-	NM_SETTING_BLUETOOTH_ERROR_MISSING_PROPERTY,       /*< nick=MissingProperty >*/
-	NM_SETTING_BLUETOOTH_ERROR_TYPE_SETTING_NOT_FOUND, /*< nick=TypeSettingNotFound >*/
-} NMSettingBluetoothError;
-

-

+
enum NMSettingBluetoothError

+

+
Members

+
--+++
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+

 





 
 
 
NM_SETTING_BLUETOOTH_ERROR_UNKNOWN
unknown or unclassified error
+
NM_SETTING_BLUETOOTH_ERROR_UNKNOWN

+
unknown or unclassified error

 		 
 

 
NM_SETTING_BLUETOOTH_ERROR_INVALID_PROPERTY
the property was invalid
+
NM_SETTING_BLUETOOTH_ERROR_INVALID_PROPERTY

+
the property was invalid

 		 
 

 
NM_SETTING_BLUETOOTH_ERROR_MISSING_PROPERTY
the property was missing and is
-required
+
NM_SETTING_BLUETOOTH_ERROR_MISSING_PROPERTY

+
the property was missing and is
+required

 		 
 

 
NM_SETTING_BLUETOOTH_ERROR_TYPE_SETTING_NOT_FOUND
the connection
+
NM_SETTING_BLUETOOTH_ERROR_TYPE_SETTING_NOT_FOUND

+
the connection
 did not contain a required type setting, ie for DUN connections the connection
-must also contain an NMSettingGsm or NMSettingCdma as appropriate
+must also contain an NMSettingGsm or NMSettingCdma as appropriate

 		 
 

 
 

 

+

 

 

 
NM_SETTING_BLUETOOTH_ERROR

@@ -149,24 +307,6 @@ must also contain an 
-
nm_setting_bluetooth_error_quark ()

-
GQuark              nm_setting_bluetooth_error_quark    (void);

-

-Registers an error quark for NMSettingBluetooth if necessary.
-

-

----
-
-
-
-
-




Returns :
the error quark used for NMSettingBluetooth errors.

-

-

-

 
NM_SETTING_BLUETOOTH_BDADDR

 
#define NM_SETTING_BLUETOOTH_BDADDR    "bdaddr"
 

@@ -186,141 +326,38 @@ Registers an error quark for 
NM_SETTING_BLUETOOTH_TYPE_DUN

 
#define NM_SETTING_BLUETOOTH_TYPE_DUN  "dun"
 

-

-Connection type describing a connection to devices that support the Bluetooth
-DUN profile.
-

+
Connection type describing a connection to devices that support the Bluetooth
+DUN profile.

 

 

 

 
NM_SETTING_BLUETOOTH_TYPE_PANU

 
#define NM_SETTING_BLUETOOTH_TYPE_PANU "panu"
 

-

-Connection type describing a connection to devices that support the Bluetooth
-NAP (Network Access Point) protocol, which accepts connections via PANU.
-

-

-

-

-
NMSettingBluetooth

-
typedef struct _NMSettingBluetooth NMSettingBluetooth;

-

-

-

-

-

-
NMSettingBluetoothClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingBluetoothClass;
-

-

-

-

-

-

-
nm_setting_bluetooth_new ()

-
NMSetting *         nm_setting_bluetooth_new            (void);

-

-Creates a new NMSettingBluetooth object with default values.
-

-

----
-
-
-
-
-




Returns :
the new empty NMSettingBluetooth object. [transfer full]
-

-

-

-

-
nm_setting_bluetooth_get_bdaddr ()

-
const GByteArray *  nm_setting_bluetooth_get_bdaddr     (NMSettingBluetooth *setting);

-

-Gets the Bluetooth address of the remote device which this setting
-describes a connection to.
-

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingBluetooth
-
Returns :
the Bluetooth address

-

-

-

-
nm_setting_bluetooth_get_connection_type ()

-
const char *        nm_setting_bluetooth_get_connection_type
-                                                        (NMSettingBluetooth *setting);

-

-Returns the connection method for communicating with the remote device (i.e.
-either DUN to a DUN-capable device or PANU to a NAP-capable device).
-

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingBluetooth
-
Returns :
the type, either NM_SETTING_BLUETOOTH_PANU or NM_SETTING_BLUETOOTH_DUN
-

+
Connection type describing a connection to devices that support the Bluetooth
+NAP (Network Access Point) protocol, which accepts connections via PANU.

 

 

 

 
Property Details

 

-
The "bdaddr" property

-
  "bdaddr"                   GArray_guchar_*       : Read / Write

-

-The Bluetooth address of the device.
-

+
The “bdaddr” property

+
  “bdaddr”                   GArray_guchar_ *

+
The Bluetooth address of the device.

+
Flags: Read / Write

 

 

 

-
The "type" property

-
  "type"                     gchar*                : Read / Write

-

-Either 'dun' for Dial-Up Networking connections or 'panu' for Personal
-Area Networking connections to devices supporting the NAP profile.
-

+
The “type” property

+
  “type”                     gchar *

+
Either 'dun' for Dial-Up Networking connections or 'panu' for Personal Area Networking connections.

+
Flags: Read / Write

 
Default value: NULL

 

 

 

 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.20
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingBond.html b/docs/libnm-util/html/NMSettingBond.html
index 89c6fe25..b047b365 100644
--- a/docs/libnm-util/html/NMSettingBond.html
+++ b/docs/libnm-util/html/NMSettingBond.html
@@ -2,34 +2,28 @@
 
 
 
-NMSettingBond
+libnm-util Reference Manual: NMSettingBond
 
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
 

 

 

@@ -37,544 +31,662 @@
 
NMSettingBond
NMSettingBond — Describes connection properties for bonds

-
+

 
 
 

-

-
Synopsis

-
-#include <nm-setting-bond.h>
-
-#define             NM_SETTING_BOND_SETTING_NAME
-enum                NMSettingBondError;
-#define             NM_SETTING_BOND_ERROR
-GQuark              nm_setting_bond_error_quark         (void);
-#define             NM_SETTING_BOND_INTERFACE_NAME
-#define             NM_SETTING_BOND_OPTIONS
-#define             NM_SETTING_BOND_OPTION_MODE
-#define             NM_SETTING_BOND_OPTION_MIIMON
-#define             NM_SETTING_BOND_OPTION_DOWNDELAY
-#define             NM_SETTING_BOND_OPTION_UPDELAY
-#define             NM_SETTING_BOND_OPTION_ARP_INTERVAL
-#define             NM_SETTING_BOND_OPTION_ARP_IP_TARGET
-                    NMSettingBond;
-                    NMSettingBondClass;
-NMSetting *         nm_setting_bond_new                 (void);
-const char *        nm_setting_bond_get_interface_name  (NMSettingBond *setting);
-guint32             nm_setting_bond_get_num_options     (NMSettingBond *setting);
-gboolean            nm_setting_bond_get_option          (NMSettingBond *setting,
-                                                         guint32 idx,
-                                                         const char **out_name,
-                                                         const char **out_value);
-const char *        nm_setting_bond_get_option_by_name  (NMSettingBond *setting,
-                                                         const char *name);
-gboolean            nm_setting_bond_add_option          (NMSettingBond *setting,
-                                                         const char *name,
-                                                         const char *value);
-gboolean            nm_setting_bond_remove_option       (NMSettingBond *setting,
-                                                         const char *name);
-const char **       nm_setting_bond_get_valid_options   (NMSettingBond *setting);
-const char *        nm_setting_bond_get_option_default  (NMSettingBond *setting,
-                                                         const char *name);
-

-

 

-
Object Hierarchy

-
-  GEnum
-   +----NMSettingBondError
-

-
-  GObject
-   +----NMSetting
-         +----NMSettingBond
-

-

-

-
Properties

-
-  "interface-name"           gchar*                : Read / Write
-  "options"                  GHashTable_gchararray+gchararray_*  : Read / Write
-

-

-

-
Description

-

-The NMSettingBond object is a NMSetting subclass that describes properties
-necessary for bond connections.
-

-

-

-
Details

-

-
NM_SETTING_BOND_SETTING_NAME

-
#define NM_SETTING_BOND_SETTING_NAME "bond"
-

-

-

-

-

-

-
enum NMSettingBondError

-
typedef enum {
-	NM_SETTING_BOND_ERROR_UNKNOWN = 0,      /*< nick=UnknownError >*/
-	NM_SETTING_BOND_ERROR_INVALID_PROPERTY, /*< nick=InvalidProperty >*/
-	NM_SETTING_BOND_ERROR_MISSING_PROPERTY, /*< nick=MissingProperty >*/
-	NM_SETTING_BOND_ERROR_INVALID_OPTION,   /*< nick=InvalidOption >*/
-	NM_SETTING_BOND_ERROR_MISSING_OPTION,   /*< nick=MissingOption >*/
-} NMSettingBondError;
-

-

+
Functions

+
--++
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
-
+
-
-
+
-
-
+
+
+
+
+

 




 
 
 
NM_SETTING_BOND_ERROR_UNKNOWN
unknown or unclassified error
+
+GQuark
+
+nm_setting_bond_error_quark ()
+

+NMSetting *
+
+nm_setting_bond_new ()
+
const char *
+
+nm_setting_bond_get_interface_name ()
+

+guint32
+
+nm_setting_bond_get_num_options ()
+

+gboolean
+
+nm_setting_bond_get_option ()
 
 

 
NM_SETTING_BOND_ERROR_INVALID_PROPERTY
the property was invalid
+const char *
+
+nm_setting_bond_get_option_by_name ()
 
 

 
NM_SETTING_BOND_ERROR_MISSING_PROPERTY
the property was missing and is
-required
+
+gboolean
+
+nm_setting_bond_add_option ()
 
 

 
NM_SETTING_BOND_ERROR_INVALID_OPTION

+
+gboolean
+
+nm_setting_bond_remove_option ()
 
 

 
NM_SETTING_BOND_ERROR_MISSING_OPTION

+const char **
+
+nm_setting_bond_get_valid_options ()
+
const char *
+
+nm_setting_bond_get_option_default ()
 
 

 
 

 

-

-

-
NM_SETTING_BOND_ERROR

-
#define NM_SETTING_BOND_ERROR nm_setting_bond_error_quark ()
-

-

-

+

+
Properties

+

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+






+gchar *interface-nameRead / Write
GHashTable_gchararray+gchararray_*optionsRead / Write

 

-

-

-
nm_setting_bond_error_quark ()

-
GQuark              nm_setting_bond_error_quark         (void);

-

-Registers an error quark for NMSettingBond if necessary.
-

-

+

+
Types and Values

+
--++
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

 




 
Returns :
the error quark used for NMSettingBond errors.
#defineNM_SETTING_BOND_SETTING_NAME
enumNMSettingBondError
#defineNM_SETTING_BOND_ERROR
#defineNM_SETTING_BOND_INTERFACE_NAME
#defineNM_SETTING_BOND_OPTIONS
#defineNM_SETTING_BOND_OPTION_MODE
#defineNM_SETTING_BOND_OPTION_MIIMON
#defineNM_SETTING_BOND_OPTION_DOWNDELAY
#defineNM_SETTING_BOND_OPTION_UPDELAY
#defineNM_SETTING_BOND_OPTION_ARP_INTERVAL
#defineNM_SETTING_BOND_OPTION_ARP_IP_TARGET

 

 

-

-

-
NM_SETTING_BOND_INTERFACE_NAME

-
#define NM_SETTING_BOND_INTERFACE_NAME "interface-name"
+

+
Object Hierarchy

+
    GEnum
+    ╰── NMSettingBondError
+    GObject
+    ╰── NMSetting
+        ╰── NMSettingBond
 

-

-

 

-

-

-
NM_SETTING_BOND_OPTIONS

-
#define NM_SETTING_BOND_OPTIONS "options"
+

+
Includes

+
#include <nm-setting-bond.h>
 

-

-

 

-

-

-
NM_SETTING_BOND_OPTION_MODE

-
#define NM_SETTING_BOND_OPTION_MODE          "mode"
-

-

-

+

+
Description

+
The NMSettingBond object is a NMSetting subclass that describes properties
+necessary for bond connections.

 

-

+

+
Functions

 

-
NM_SETTING_BOND_OPTION_MIIMON

-
#define NM_SETTING_BOND_OPTION_MIIMON        "miimon"
-

-

-

+
nm_setting_bond_error_quark ()

+
GQuark
+nm_setting_bond_error_quark (void);

+
Registers an error quark for NMSettingBond if necessary.

+

+
Returns

+
 the error quark used for NMSettingBond errors.

+

 

-

-

-
NM_SETTING_BOND_OPTION_DOWNDELAY

-
#define NM_SETTING_BOND_OPTION_DOWNDELAY     "downdelay"
-

-

-

 

 

 

-
NM_SETTING_BOND_OPTION_UPDELAY

-
#define NM_SETTING_BOND_OPTION_UPDELAY       "updelay"
-

-

-

+
nm_setting_bond_new ()

+
NMSetting *
+nm_setting_bond_new (void);

+
Creates a new NMSettingBond object with default values.

+

+
Returns

+
 the new empty NMSettingBond object. 

+
[transfer full]

 

-

-

-
NM_SETTING_BOND_OPTION_ARP_INTERVAL

-
#define NM_SETTING_BOND_OPTION_ARP_INTERVAL  "arp_interval"
-

-

-

 

 

 

-
NM_SETTING_BOND_OPTION_ARP_IP_TARGET

-
#define NM_SETTING_BOND_OPTION_ARP_IP_TARGET "arp_ip_target"
-

-

-

+
nm_setting_bond_get_interface_name ()

+
const char *
+nm_setting_bond_get_interface_name (NMSettingBond *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingBond
 

 

-

-

-
NMSettingBond

-
typedef struct _NMSettingBond NMSettingBond;

-

-

+

+
Returns

+
 the “interface-name” property of the setting

+

 

-

-

-
NMSettingBondClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingBondClass;
-

-

-

 

 

 

-
nm_setting_bond_new ()

-
NMSetting *         nm_setting_bond_new                 (void);

-

-Creates a new NMSettingBond object with default values.
-

-

+
nm_setting_bond_get_num_options ()

+
guint32
+nm_setting_bond_get_num_options (NMSettingBond *setting);

+
Returns the number of options that should be set for this bond when it
+is activated. This can be used to retrieve each option individually
+using nm_setting_bond_get_option().

+

+
Parameters

+
--+++
-
-
+
+
+

 





 
 
Returns :
the new empty NMSettingBond object. [transfer full]
-
setting
the NMSettingBond
 
 

 

 

+

+
Returns

+
 the number of bonding options

+

+

+

 

 

-
nm_setting_bond_get_interface_name ()

-
const char *        nm_setting_bond_get_interface_name  (NMSettingBond *setting);

-

+
nm_setting_bond_get_option ()

+
gboolean
+nm_setting_bond_get_option (NMSettingBond *setting,
+                            guint32 idx,
+                            const char **out_name,
+                            const char **out_value);

+
Given an index, return the value of the bonding option at that index.  Indexes
+are *not* guaranteed to be static across modifications to options done by
+nm_setting_bond_add_option() and nm_setting_bond_remove_option(),
+and should not be used to refer to options except for short periods of time
+such as during option iteration.

+

+
Parameters

+
--+++
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingBond
-
setting
the NMSettingBond
 
idx
index of the desired option, from 0 to
+nm_setting_bond_get_num_options() - 1
 
out_name
 on return, the name of the bonding option; this
+value is owned by the setting and should not be modified. 
[out]
 

 
Returns :
the "interface-name" property of the setting
out_value
 on return, the value of the name of the bonding
+option; this value is owned by the setting and should not be modified. 
[out]
 

 
 

 

+

+
Returns

+
 TRUE on success if the index was valid and an option was found,
+FALSE if the index was invalid (ie, greater than the number of options
+currently held by the setting)

+

+

+

 

 

-
nm_setting_bond_get_num_options ()

-
guint32             nm_setting_bond_get_num_options     (NMSettingBond *setting);

-

-Returns the number of options that should be set for this bond when it
-is activated. This can be used to retrieve each option individually
-using nm_setting_bond_get_option().
-

-

+
nm_setting_bond_get_option_by_name ()

+
const char *
+nm_setting_bond_get_option_by_name (NMSettingBond *setting,
+                                    const char *name);

+
Returns the value associated with the bonding option specified by
+name
+, if it exists.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingBond
-
setting
the NMSettingBond
 
 

 
Returns :
the number of bonding options
name
the option name for which to retrieve the value
 
 

 
 

 

+

+
Returns

+
 the value, or NULL if the key/value pair was never added to the
+setting; the value is owned by the setting and must not be modified

+

+

+

 

 

-
nm_setting_bond_get_option ()

-
gboolean            nm_setting_bond_get_option          (NMSettingBond *setting,
-                                                         guint32 idx,
-                                                         const char **out_name,
-                                                         const char **out_value);

-

-Given an index, return the value of the bonding option at that index.  Indexes
-are *not* guaranteed to be static across modifications to options done by
-nm_setting_bond_add_option() and nm_setting_bond_remove_option(),
-and should not be used to refer to options except for short periods of time
-such as during option iteration.
-

-

+
nm_setting_bond_add_option ()

+
gboolean
+nm_setting_bond_add_option (NMSettingBond *setting,
+                            const char *name,
+                            const char *value);

+
Add an option to the table.  The option is compared to an internal list
+of allowed options.  Option names may contain only alphanumeric characters
+(ie [a-zA-Z0-9]).  Adding a new name replaces any existing name/value pair
+that may already exist.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+

 





 
 
 
setting :
the NMSettingBond
-
setting
the NMSettingBond
 
 

 
idx :
index of the desired option, from 0 to
-nm_setting_bond_get_num_options() - 1
name
name for the option
 
 

 
out_name :
on return, the name of the bonding option; this
-value is owned by the setting and should not be modified. [out]
-
out_value :
on return, the value of the name of the bonding
-option; this value is owned by the setting and should not be modified. [out]
-
Returns :

-TRUE on success if the index was valid and an option was found,
-FALSE if the index was invalid (ie, greater than the number of options
-currently held by the setting)
value
value for the option
 
 

 
 

 

+

+
Returns

+
 TRUE if the option was valid and was added to the internal option
+list, FALSE if it was not.

+

+

+

 

 

-
nm_setting_bond_get_option_by_name ()

-
const char *        nm_setting_bond_get_option_by_name  (NMSettingBond *setting,
-                                                         const char *name);

-

-Returns the value associated with the bonding option specified by
-name, if it exists.
-

-

+
nm_setting_bond_remove_option ()

+
gboolean
+nm_setting_bond_remove_option (NMSettingBond *setting,
+                               const char *name);

+
Remove the bonding option referenced by name
+ from the internal option
+list.

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingBond
-
name :
the option name for which to retrieve the value
setting
the NMSettingBond
 
 

 
Returns :
the value, or NULL if the key/value pair was never added to the
-setting; the value is owned by the setting and must not be modified
name
name of the option to remove
 
 

 
 

 

+

+
Returns

+
 TRUE if the option was found and removed from the internal option
+list, FALSE if it was not.

+

+

+

 

 

-
nm_setting_bond_add_option ()

-
gboolean            nm_setting_bond_add_option          (NMSettingBond *setting,
-                                                         const char *name,
-                                                         const char *value);

-

-Add an option to the table.  The option is compared to an internal list
-of allowed options.  Option names may contain only alphanumeric characters
-(ie [a-zA-Z0-9]).  Adding a new name replaces any existing name/value pair
-that may already exist.
-

-

+
nm_setting_bond_get_valid_options ()

+
const char **
+nm_setting_bond_get_valid_options (NMSettingBond *setting);

+
Returns a list of valid bond options.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingBond
-
name :
name for the option
value :
value for the option
Returns :

-TRUE if the option was valid and was added to the internal option
-list, FALSE if it was not.
setting
the NMSettingBond
 

 

 

+

+
Returns

+
 a NULL-terminated array of strings of valid bond options. 

+
[transfer none]

+

+

 

 

-
nm_setting_bond_remove_option ()

-
gboolean            nm_setting_bond_remove_option       (NMSettingBond *setting,
-                                                         const char *name);

-

-Remove the bonding option referenced by name from the internal option
-list.
-

-

+
nm_setting_bond_get_option_default ()

+
const char *
+nm_setting_bond_get_option_default (NMSettingBond *setting,
+                                    const char *name);

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
-
-
-
-
+
+
+

 





 
 
 
setting :
the NMSettingBond
-
setting
the NMSettingBond
 
 

 
name :
name of the option to remove
Returns :

-TRUE if the option was found and removed from the internal option
-list, FALSE if it was not.
name
the name of the option
 
 

 
 

 

-

+

+
Returns

+
 the value of the bond option if not overridden by an entry in
+the “options” property.

+

+

+

+

+

+
Types and Values

 

-
nm_setting_bond_get_valid_options ()

-
const char **       nm_setting_bond_get_valid_options   (NMSettingBond *setting);

+
NM_SETTING_BOND_SETTING_NAME

+
#define NM_SETTING_BOND_SETTING_NAME "bond"
+

 

-Returns a list of valid bond options.
 

-

+
+

+

+
enum NMSettingBondError

+

+
Members

+
--+++
-
-
+
+
-
-
+
+
-
-

 





 
 
 
setting :
the NMSettingBond
+
NM_SETTING_BOND_ERROR_UNKNOWN

+
unknown or unclassified error

 		 
 

 
Returns :
a NULL-terminated array of strings of valid bond options. [transfer none]
+
NM_SETTING_BOND_ERROR_INVALID_PROPERTY

+
the property was invalid

 		 
 

-

-

-

-
nm_setting_bond_get_option_default ()

-
const char *        nm_setting_bond_get_option_default  (NMSettingBond *setting,
-                                                         const char *name);

-

----
-
-
-
+
+
-
-
+
+
+
-
-
+
+
+




 
setting :
the NMSettingBond
+
NM_SETTING_BOND_ERROR_MISSING_PROPERTY

+
the property was missing and is
+required

 		 
 

 
name :
the name of the option
NM_SETTING_BOND_ERROR_INVALID_OPTION
  
 

 
Returns :
the value of the bond option if not overridden by an entry in
-the "options" property.
NM_SETTING_BOND_ERROR_MISSING_OPTION
  
 

 
 

 

 

-

-
Property Details

+

 

-
The "interface-name" property

-
  "interface-name"           gchar*                : Read / Write

+
NM_SETTING_BOND_ERROR

+
#define NM_SETTING_BOND_ERROR nm_setting_bond_error_quark ()
+

+

+

+

+

+

+
NM_SETTING_BOND_INTERFACE_NAME

+
#define NM_SETTING_BOND_INTERFACE_NAME "interface-name"
+

 

-The name of the virtual in-kernel bonding network interface
 

-
Default value: NULL

 

 

 

-
The "options" property

-
  "options"                  GHashTable_gchararray+gchararray_*  : Read / Write

+
NM_SETTING_BOND_OPTIONS

+
#define NM_SETTING_BOND_OPTIONS "options"
+

+

+

+

+

+

+
NM_SETTING_BOND_OPTION_MODE

+
#define NM_SETTING_BOND_OPTION_MODE          "mode"
+

+

+

+

+

+

+
NM_SETTING_BOND_OPTION_MIIMON

+
#define NM_SETTING_BOND_OPTION_MIIMON        "miimon"
+

 

-Dictionary of key/value pairs of bonding options.  Both keys
-and values must be strings. Option names must contain only
-alphanumeric characters (ie, [a-zA-Z0-9]).
 

 

+

+

+
NM_SETTING_BOND_OPTION_DOWNDELAY

+
#define NM_SETTING_BOND_OPTION_DOWNDELAY     "downdelay"
+

+

+

+

+

+

+
NM_SETTING_BOND_OPTION_UPDELAY

+
#define NM_SETTING_BOND_OPTION_UPDELAY       "updelay"
+

+

+

+

+

+

+
NM_SETTING_BOND_OPTION_ARP_INTERVAL

+
#define NM_SETTING_BOND_OPTION_ARP_INTERVAL  "arp_interval"
+

+

+

+

+

+

+
NM_SETTING_BOND_OPTION_ARP_IP_TARGET

+
#define NM_SETTING_BOND_OPTION_ARP_IP_TARGET "arp_ip_target"
+

+

+

+

+

+

+
Property Details

+

+
The “interface-name” property

+
  “interface-name”           gchar *

+
The name of the virtual in-kernel bonding network interface.

+
Flags: Read / Write

+
Default value: NULL

+

+

+

+
The “options” property

+
  “options”                  GHashTable_gchararray+gchararray_*

+
Dictionary of key/value pairs of bonding options.  Both keys and values must be strings.  Option names must contain only alphanumeric characters (ie, [a-zA-Z0-9]).

+
Flags: Read / Write

+

 

 

 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.20

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingBridge.html b/docs/libnm-util/html/NMSettingBridge.html
index b5a9742c..8be803d6 100644
--- a/docs/libnm-util/html/NMSettingBridge.html
+++ b/docs/libnm-util/html/NMSettingBridge.html
@@ -2,34 +2,28 @@
 
 
 
-NMSettingBridge
+libnm-util Reference Manual: NMSettingBridge
 
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
 

 

 

@@ -37,70 +31,427 @@
 
NMSettingBridge
NMSettingBridge — Describes connection properties for bridges

-
+

 
 
 

-

-
Synopsis

-
-#include <nm-setting-bridge.h>
-
-#define             NM_SETTING_BRIDGE_SETTING_NAME
-enum                NMSettingBridgeError;
-#define             NM_SETTING_BRIDGE_ERROR
-GQuark              nm_setting_bridge_error_quark       (void);
-#define             NM_SETTING_BRIDGE_INTERFACE_NAME
-#define             NM_SETTING_BRIDGE_STP
-#define             NM_SETTING_BRIDGE_PRIORITY
-#define             NM_SETTING_BRIDGE_FORWARD_DELAY
-#define             NM_SETTING_BRIDGE_HELLO_TIME
-#define             NM_SETTING_BRIDGE_MAX_AGE
-#define             NM_SETTING_BRIDGE_AGEING_TIME
-                    NMSettingBridge;
-                    NMSettingBridgeClass;
-NMSetting *         nm_setting_bridge_new               (void);
-const char *        nm_setting_bridge_get_interface_name
-                                                        (NMSettingBridge *setting);
-gboolean            nm_setting_bridge_get_stp           (NMSettingBridge *setting);
-guint16             nm_setting_bridge_get_priority      (NMSettingBridge *setting);
-guint16             nm_setting_bridge_get_forward_delay (NMSettingBridge *setting);
-guint16             nm_setting_bridge_get_hello_time    (NMSettingBridge *setting);
-guint16             nm_setting_bridge_get_max_age       (NMSettingBridge *setting);
-guint32             nm_setting_bridge_get_ageing_time   (NMSettingBridge *setting);
-

+

+
Functions

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





+GQuark
+
+nm_setting_bridge_error_quark ()
+

+NMSetting *
+
+nm_setting_bridge_new ()
+
const char *
+
+nm_setting_bridge_get_interface_name ()
+

+gboolean
+
+nm_setting_bridge_get_stp ()
+

+guint16
+
+nm_setting_bridge_get_priority ()
+

+guint16
+
+nm_setting_bridge_get_forward_delay ()
+

+guint16
+
+nm_setting_bridge_get_hello_time ()
+

+guint16
+
+nm_setting_bridge_get_max_age ()
+

+guint32
+
+nm_setting_bridge_get_ageing_time ()
+

+

+

+
Properties

+

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





guintageing-timeRead / Write / Construct
guintforward-delayRead / Write / Construct
guinthello-timeRead / Write / Construct

+gchar *interface-nameRead / Write
guintmax-ageRead / Write / Construct
guintpriorityRead / Write / Construct
gbooleanstpRead / Write / Construct

+

+

+
Types and Values

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+




#defineNM_SETTING_BRIDGE_SETTING_NAME
enumNMSettingBridgeError
#defineNM_SETTING_BRIDGE_ERROR
#defineNM_SETTING_BRIDGE_INTERFACE_NAME
#defineNM_SETTING_BRIDGE_STP
#defineNM_SETTING_BRIDGE_PRIORITY
#defineNM_SETTING_BRIDGE_FORWARD_DELAY
#defineNM_SETTING_BRIDGE_HELLO_TIME
#defineNM_SETTING_BRIDGE_MAX_AGE
#defineNM_SETTING_BRIDGE_AGEING_TIME

 

 

 
Object Hierarchy

-
-  GEnum
-   +----NMSettingBridgeError
-

-
-  GObject
-   +----NMSetting
-         +----NMSettingBridge
+
    GEnum
+    ╰── NMSettingBridgeError
+    GObject
+    ╰── NMSetting
+        ╰── NMSettingBridge
 

 

 

-
Properties

-
-  "ageing-time"              guint                 : Read / Write / Construct
-  "forward-delay"            guint                 : Read / Write / Construct
-  "hello-time"               guint                 : Read / Write / Construct
-  "interface-name"           gchar*                : Read / Write
-  "max-age"                  guint                 : Read / Write / Construct
-  "priority"                 guint                 : Read / Write / Construct
-  "stp"                      gboolean              : Read / Write / Construct
+
Includes

+
#include <nm-setting-bridge.h>
 

 

 

 
Description

-

-The NMSettingBridge object is a NMSetting subclass that describes properties
-necessary for bridging connections.
-

+
The NMSettingBridge object is a NMSetting subclass that describes properties
+necessary for bridging connections.

+

+

+
Functions

+

+
nm_setting_bridge_error_quark ()

+
GQuark
+nm_setting_bridge_error_quark (void);

+
Registers an error quark for NMSettingBridge if necessary.

+

+
Returns

+
 the error quark used for NMSettingBridge errors.

+

+

+
Since 0.9.8

+

+

+

+
nm_setting_bridge_new ()

+
NMSetting *
+nm_setting_bridge_new (void);

+
Creates a new NMSettingBridge object with default values.

+

+
Returns

+
 the new empty NMSettingBridge object. 

+
[transfer full]

+

+
Since 0.9.8

+

+

+

+
nm_setting_bridge_get_interface_name ()

+
const char *
+nm_setting_bridge_get_interface_name (NMSettingBridge *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingBridge
 

+

+

+
Returns

+
 the “interface-name” property of the setting

+

+

+
Since 0.9.8

+

+

+

+
nm_setting_bridge_get_stp ()

+
gboolean
+nm_setting_bridge_get_stp (NMSettingBridge *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingBridge
 

+

+

+
Returns

+
 the “stp” property of the setting

+

+

+
Since 0.9.8

+

+

+

+
nm_setting_bridge_get_priority ()

+
guint16
+nm_setting_bridge_get_priority (NMSettingBridge *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingBridge
 

+

+

+
Returns

+
 the “priority” property of the setting

+

+

+
Since 0.9.8

+

+

+

+
nm_setting_bridge_get_forward_delay ()

+
guint16
+nm_setting_bridge_get_forward_delay (NMSettingBridge *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingBridge
 

+

+

+
Returns

+
 the “forward-delay” property of the setting

+

+

+
Since 0.9.8

+

+

+

+
nm_setting_bridge_get_hello_time ()

+
guint16
+nm_setting_bridge_get_hello_time (NMSettingBridge *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingBridge
 

+

+

+
Returns

+
 the “hello-time” property of the setting

+

+

+
Since 0.9.8

+

+

+

+
nm_setting_bridge_get_max_age ()

+
guint16
+nm_setting_bridge_get_max_age (NMSettingBridge *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingBridge
 

+

+

+
Returns

+
 the “max-age” property of the setting

+

+

+
Since 0.9.8

+

+

+

+
nm_setting_bridge_get_ageing_time ()

+
guint32
+nm_setting_bridge_get_ageing_time (NMSettingBridge *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingBridge
 

+

+

+
Returns

+
 the “ageing-time” property of the setting

+

+

+
Since 0.9.8

+

 

 

-
Details

+
Types and Values

 

 
NM_SETTING_BRIDGE_SETTING_NAME

 
#define NM_SETTING_BRIDGE_SETTING_NAME "bridge"
@@ -110,37 +461,41 @@ necessary for bridging connections.
 

 

 

-
enum NMSettingBridgeError

-
typedef enum {
-	NM_SETTING_BRIDGE_ERROR_UNKNOWN = 0,      /*< nick=UnknownError >*/
-	NM_SETTING_BRIDGE_ERROR_INVALID_PROPERTY, /*< nick=InvalidProperty >*/
-	NM_SETTING_BRIDGE_ERROR_MISSING_PROPERTY, /*< nick=MissingProperty >*/
-} NMSettingBridgeError;
-

-

+
enum NMSettingBridgeError

+

+
Members

+
--+++
-
-
+
+
-
-
+
+
-
-
+
+

 





 
 
 
NM_SETTING_BRIDGE_ERROR_UNKNOWN
unknown or unclassified error
+
NM_SETTING_BRIDGE_ERROR_UNKNOWN

+
unknown or unclassified error

 		 
 

 
NM_SETTING_BRIDGE_ERROR_INVALID_PROPERTY
the property was invalid
+
NM_SETTING_BRIDGE_ERROR_INVALID_PROPERTY

+
the property was invalid

 		 
 

 
NM_SETTING_BRIDGE_ERROR_MISSING_PROPERTY
the property was missing and is
-required
+
NM_SETTING_BRIDGE_ERROR_MISSING_PROPERTY

+
the property was missing and is
+required

 		 
 

 
 

+

 
Since 0.9.8

 

 

@@ -153,25 +508,6 @@ required
 

 

 

-
nm_setting_bridge_error_quark ()

-
GQuark              nm_setting_bridge_error_quark       (void);

-

-Registers an error quark for NMSettingBridge if necessary.
-

-

----
-
-
-
-
-




Returns :
the error quark used for NMSettingBridge errors.

-
Since 0.9.8

-

-

-

 
NM_SETTING_BRIDGE_INTERFACE_NAME

 
#define NM_SETTING_BRIDGE_INTERFACE_NAME "interface-name"
 

@@ -226,287 +562,73 @@ Registers an error quark for 
-
NMSettingBridge

-
typedef struct _NMSettingBridge NMSettingBridge;

-

-

-

-

-

-
NMSettingBridgeClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingBridgeClass;
-

-

-

-

-

-

-
nm_setting_bridge_new ()

-
NMSetting *         nm_setting_bridge_new               (void);

-

-Creates a new NMSettingBridge object with default values.
-

-

----
-
-
-
-
-




Returns :
the new empty NMSettingBridge object. [transfer full]
-

-
Since 0.9.8

-

-

-

-
nm_setting_bridge_get_interface_name ()

-
const char *        nm_setting_bridge_get_interface_name
-                                                        (NMSettingBridge *setting);

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingBridge
-
Returns :
the "interface-name" property of the setting

-
Since 0.9.8

-

-

-

-
nm_setting_bridge_get_stp ()

-
gboolean            nm_setting_bridge_get_stp           (NMSettingBridge *setting);

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingBridge
-
Returns :
the "stp" property of the setting

-
Since 0.9.8

-

-

-

-
nm_setting_bridge_get_priority ()

-
guint16             nm_setting_bridge_get_priority      (NMSettingBridge *setting);

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingBridge
-
Returns :
the "priority" property of the setting

-
Since 0.9.8

-

-

-

-
nm_setting_bridge_get_forward_delay ()

-
guint16             nm_setting_bridge_get_forward_delay (NMSettingBridge *setting);

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingBridge
-
Returns :
the "forward-delay" property of the setting

-
Since 0.9.8

-

-

-

-
nm_setting_bridge_get_hello_time ()

-
guint16             nm_setting_bridge_get_hello_time    (NMSettingBridge *setting);

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingBridge
-
Returns :
the "hello-time" property of the setting

-
Since 0.9.8

-

-

-

-
nm_setting_bridge_get_max_age ()

-
guint16             nm_setting_bridge_get_max_age       (NMSettingBridge *setting);

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingBridge
-
Returns :
the "max-age" property of the setting

-
Since 0.9.8

-

-

-

-
nm_setting_bridge_get_ageing_time ()

-
guint32             nm_setting_bridge_get_ageing_time   (NMSettingBridge *setting);

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingBridge
-
Returns :
the "ageing-time" property of the setting

-
Since 0.9.8

-

 

 

 
Property Details

 

-
The "ageing-time" property

-
  "ageing-time"              guint                 : Read / Write / Construct

-

-The ethernet MAC address aging time, in seconds.
-

+
The “ageing-time” property

+
  “ageing-time”              guint

+
The ethernet MAC address aging time, in seconds.

+
Flags: Read / Write / Construct

 
Allowed values: <= 1000000

 
Default value: 300

 
Since 0.9.8

 

 

 

-
The "forward-delay" property

-
  "forward-delay"            guint                 : Read / Write / Construct

-

-The Spanning Tree Protocol (STP) forwarding delay, in seconds.
-

+
The “forward-delay” property

+
  “forward-delay”            guint

+
The Spanning Tree Protocol (STP) forwarding delay, in seconds.

+
Flags: Read / Write / Construct

 
Allowed values: <= 30

 
Default value: 15

 
Since 0.9.8

 

 

 

-
The "hello-time" property

-
  "hello-time"               guint                 : Read / Write / Construct

-

-The Spanning Tree Protocol (STP) hello time, in seconds.
-

+
The “hello-time” property

+
  “hello-time”               guint

+
The Spanning Tree Protocol (STP) hello time, in seconds.

+
Flags: Read / Write / Construct

 
Allowed values: <= 10

 
Default value: 2

 
Since 0.9.8

 

 

 

-
The "interface-name" property

-
  "interface-name"           gchar*                : Read / Write

-

-The name of the virtual in-kernel briding network interface
-

+
The “interface-name” property

+
  “interface-name”           gchar *

+
The name of the virtual in-kernel bridging network interface.

+
Flags: Read / Write

 
Default value: NULL

 
Since 0.9.8

 

 

 

-
The "max-age" property

-
  "max-age"                  guint                 : Read / Write / Construct

-

-The Spanning Tree Protocol (STP) maximum message age, in seconds.
-

+
The “max-age” property

+
  “max-age”                  guint

+
The Spanning Tree Protocol (STP) maximum message age, in seconds.

+
Flags: Read / Write / Construct

 
Allowed values: <= 40

 
Default value: 20

 
Since 0.9.8

 

 

 

-
The "priority" property

-
  "priority"                 guint                 : Read / Write / Construct

-

-Sets the Spanning Tree Protocol (STP) priority for this bridge.  Lower
-values are "better"; the lowest priority bridge will be elected the root
-bridge.
-

+
The “priority” property

+
  “priority”                 guint

+
Sets the Spanning Tree Protocol (STP) priority for this bridge.  Lower values are 'better'; the lowest priority bridge will be elected the root bridge.

+
Flags: Read / Write / Construct

 
Allowed values: <= 65535

-
Default value: 128

+
Default value: 32768

 
Since 0.9.8

 

 

 

-
The "stp" property

-
  "stp"                      gboolean              : Read / Write / Construct

-

-Controls whether Spanning Tree Protocol (STP) is enabled for this bridge.
-

+
The “stp” property

+
  “stp”                      gboolean

+
Controls whether Spanning Tree Protocol (STP) is enabled for this bridge.

+
Flags: Read / Write / Construct

 
Default value: TRUE

 
Since 0.9.8

 

@@ -514,6 +636,6 @@ Controls whether Spanning Tree Protocol (STP) is enabled for this bridge.
 

 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.20

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingBridgePort.html b/docs/libnm-util/html/NMSettingBridgePort.html
index bb2e37d0..146e4a64 100644
--- a/docs/libnm-util/html/NMSettingBridgePort.html
+++ b/docs/libnm-util/html/NMSettingBridgePort.html
@@ -2,34 +2,28 @@
 
 
 
-NMSettingBridgePort
+libnm-util Reference Manual: NMSettingBridgePort
 
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
 

 

 

@@ -37,59 +31,252 @@
 
NMSettingBridgePort
NMSettingBridgePort — Describes connection properties for bridge ports

-
+

 
 
 

-

-
Synopsis

-
-#include <nm-setting-bridge-port.h>
-
-#define             NM_SETTING_BRIDGE_PORT_SETTING_NAME
-enum                NMSettingBridgePortError;
-#define             NM_SETTING_BRIDGE_PORT_ERROR
-GQuark              nm_setting_bridge_port_error_quark  (void);
-#define             NM_SETTING_BRIDGE_PORT_PRIORITY
-#define             NM_SETTING_BRIDGE_PORT_PATH_COST
-#define             NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE
-                    NMSettingBridgePort;
-                    NMSettingBridgePortClass;
-NMSetting *         nm_setting_bridge_port_new          (void);
-guint16             nm_setting_bridge_port_get_priority (NMSettingBridgePort *setting);
-guint16             nm_setting_bridge_port_get_path_cost
-                                                        (NMSettingBridgePort *setting);
-gboolean            nm_setting_bridge_port_get_hairpin_mode
-                                                        (NMSettingBridgePort *setting);
-

+

+
Functions

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





+GQuark
+
+nm_setting_bridge_port_error_quark ()
+

+NMSetting *
+
+nm_setting_bridge_port_new ()
+

+guint16
+
+nm_setting_bridge_port_get_priority ()
+

+guint16
+
+nm_setting_bridge_port_get_path_cost ()
+

+gboolean
+
+nm_setting_bridge_port_get_hairpin_mode ()
+

+

+

+
Properties

+

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





gbooleanhairpin-modeRead / Write
guintpath-costRead / Write / Construct
guintpriorityRead / Write / Construct

+

+

+
Types and Values

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+




#defineNM_SETTING_BRIDGE_PORT_SETTING_NAME
enumNMSettingBridgePortError
#defineNM_SETTING_BRIDGE_PORT_ERROR
#defineNM_SETTING_BRIDGE_PORT_PRIORITY
#defineNM_SETTING_BRIDGE_PORT_PATH_COST
#defineNM_SETTING_BRIDGE_PORT_HAIRPIN_MODE

 

 

 
Object Hierarchy

-
-  GEnum
-   +----NMSettingBridgePortError
-

-
-  GObject
-   +----NMSetting
-         +----NMSettingBridgePort
+
    GEnum
+    ╰── NMSettingBridgePortError
+    GObject
+    ╰── NMSetting
+        ╰── NMSettingBridgePort
 

 

 

-
Properties

-
-  "hairpin-mode"             gboolean              : Read / Write
-  "path-cost"                guint                 : Read / Write / Construct
-  "priority"                 guint                 : Read / Write / Construct
+
Includes

+
#include <nm-setting-bridge-port.h>
 

 

 

 
Description

-

-The NMSettingBridgePort object is a NMSetting subclass that describes
-optional properties that apply to bridge ports.
-

+
The NMSettingBridgePort object is a NMSetting subclass that describes
+optional properties that apply to bridge ports.

+

+

+
Functions

+

+
nm_setting_bridge_port_error_quark ()

+
GQuark
+nm_setting_bridge_port_error_quark (void);

+
Registers an error quark for NMSettingBridgePort if necessary.

+

+
Returns

+
 the error quark used for NMSettingBridgePort errors.

+

+

+
Since 0.9.8

+

+

+

+
nm_setting_bridge_port_new ()

+
NMSetting *
+nm_setting_bridge_port_new (void);

+
Creates a new NMSettingBridgePort object with default values.

+

+
Returns

+
 the new empty NMSettingBridgePort object. 

+
[transfer full]

+

+
Since 0.9.8

+

+

+

+
nm_setting_bridge_port_get_priority ()

+
guint16
+nm_setting_bridge_port_get_priority (NMSettingBridgePort *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingBridgePort
 

+

+

+
Returns

+
 the “priority” property of the setting

+

+

+
Since 0.9.8

+

+

+

+
nm_setting_bridge_port_get_path_cost ()

+
guint16
+nm_setting_bridge_port_get_path_cost (NMSettingBridgePort *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingBridgePort
 

+

+

+
Returns

+
 the “path-cost” property of the setting

+

+

+
Since 0.9.8

+

+

+

+
nm_setting_bridge_port_get_hairpin_mode ()

+
gboolean
+nm_setting_bridge_port_get_hairpin_mode
+                               (NMSettingBridgePort *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingBridgePort
 

+

+

+
Returns

+
 the “hairpin-mode” property of the setting

+

+

+
Since 0.9.8

+

 

 

-
Details

+
Types and Values

 

 
NM_SETTING_BRIDGE_PORT_SETTING_NAME

 
#define NM_SETTING_BRIDGE_PORT_SETTING_NAME "bridge-port"
@@ -99,37 +286,41 @@ optional properties that apply to bridge ports.
 

 

 

-
enum NMSettingBridgePortError

-
typedef enum {
-	NM_SETTING_BRIDGE_PORT_ERROR_UNKNOWN = 0,      /*< nick=UnknownError >*/
-	NM_SETTING_BRIDGE_PORT_ERROR_INVALID_PROPERTY, /*< nick=InvalidProperty >*/
-	NM_SETTING_BRIDGE_PORT_ERROR_MISSING_PROPERTY, /*< nick=MissingProperty >*/
-} NMSettingBridgePortError;
-

-

+
enum NMSettingBridgePortError

+

+
Members

+
--+++
-
-
+
+
-
-
+
+
-
-
+
+

 





 
 
 
NM_SETTING_BRIDGE_PORT_ERROR_UNKNOWN
unknown or unclassified error
+
NM_SETTING_BRIDGE_PORT_ERROR_UNKNOWN

+
unknown or unclassified error

 		 
 

 
NM_SETTING_BRIDGE_PORT_ERROR_INVALID_PROPERTY
the property was invalid
+
NM_SETTING_BRIDGE_PORT_ERROR_INVALID_PROPERTY

+
the property was invalid

 		 
 

 
NM_SETTING_BRIDGE_PORT_ERROR_MISSING_PROPERTY
the property was missing and
-is required
+
NM_SETTING_BRIDGE_PORT_ERROR_MISSING_PROPERTY

+
the property was missing and
+is required

 		 
 

 
 

+

 
Since 0.9.8

 

 

@@ -142,25 +333,6 @@ is required
 

 

 

-
nm_setting_bridge_port_error_quark ()

-
GQuark              nm_setting_bridge_port_error_quark  (void);

-

-Registers an error quark for NMSettingBridgePort if necessary.
-

-

----
-
-
-
-
-




Returns :
the error quark used for NMSettingBridgePort errors.

-
Since 0.9.8

-

-

-

 
NM_SETTING_BRIDGE_PORT_PRIORITY

 
#define NM_SETTING_BRIDGE_PORT_PRIORITY     "priority"
 

@@ -183,151 +355,33 @@ Registers an error quark for 
 

 

-

-

-
NMSettingBridgePort

-
typedef struct _NMSettingBridgePort NMSettingBridgePort;

-

-

-

-

-

-
NMSettingBridgePortClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingBridgePortClass;
-

-

-

-

-

-

-
nm_setting_bridge_port_new ()

-
NMSetting *         nm_setting_bridge_port_new          (void);

-

-Creates a new NMSettingBridgePort object with default values.
-

-

----
-
-
-
-
-




Returns :
the new empty NMSettingBridgePort object. [transfer full]
-

-
Since 0.9.8

-

-

-

-
nm_setting_bridge_port_get_priority ()

-
guint16             nm_setting_bridge_port_get_priority (NMSettingBridgePort *setting);

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingBridgePort
-
Returns :
the "priority" property of the setting

-
Since 0.9.8

-

-

-

-
nm_setting_bridge_port_get_path_cost ()

-
guint16             nm_setting_bridge_port_get_path_cost
-                                                        (NMSettingBridgePort *setting);

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingBridgePort
-
Returns :
the "path-cost" property of the setting

-
Since 0.9.8

-

-

-

-
nm_setting_bridge_port_get_hairpin_mode ()

-
gboolean            nm_setting_bridge_port_get_hairpin_mode
-                                                        (NMSettingBridgePort *setting);

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingBridgePort
-
Returns :
the "hairpin-mode" property of the setting

-
Since 0.9.8

-

 

 

 
Property Details

 

-
The "hairpin-mode" property

-
  "hairpin-mode"             gboolean              : Read / Write

-

-Enables or disabled 'hairpin mode' for the port, which allows frames to
-be sent back out through the port the frame was received on.
-

+
The “hairpin-mode” property

+
  “hairpin-mode”             gboolean

+
Enables or disabled 'hairpin mode' for the port, which allows frames to be sent back out through the port the frame was received on.

+
Flags: Read / Write

 
Default value: FALSE

 
Since 0.9.8

 

 

 

-
The "path-cost" property

-
  "path-cost"                guint                 : Read / Write / Construct

-

-The Spanning Tree Protocol (STP) port cost for destinations via this port.
-

+
The “path-cost” property

+
  “path-cost”                guint

+
The Spanning Tree Protocol (STP) port cost for destinations via this port.

+
Flags: Read / Write / Construct

 
Allowed values: <= 65535

 
Default value: 100

 
Since 0.9.8

 

 

 

-
The "priority" property

-
  "priority"                 guint                 : Read / Write / Construct

-

-The Spanning Tree Protocol (STP) priority of this bridge port.
-

+
The “priority” property

+
  “priority”                 guint

+
The Spanning Tree Protocol (STP) priority of this bridge port.

+
Flags: Read / Write / Construct

 
Allowed values: <= 63

 
Default value: 32

 
Since 0.9.8

@@ -336,6 +390,6 @@ The Spanning Tree Protocol (STP) priority of this bridge port.
 

 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.20

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingCdma.html b/docs/libnm-util/html/NMSettingCdma.html
index 0ce20d15..0693faa6 100644
--- a/docs/libnm-util/html/NMSettingCdma.html
+++ b/docs/libnm-util/html/NMSettingCdma.html
@@ -2,34 +2,28 @@
 
 
 
-NMSettingCdma
+libnm-util Reference Manual: NMSettingCdma
 
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
 

 

 

@@ -37,61 +31,290 @@
 
NMSettingCdma
NMSettingCdma — Describes CDMA-based mobile broadband properties

-
+

 
 
 

-

-
Synopsis

-
-#include <nm-setting-cdma.h>
-
-#define             NM_SETTING_CDMA_SETTING_NAME
-enum                NMSettingCdmaError;
-#define             NM_SETTING_CDMA_ERROR
-GQuark              nm_setting_cdma_error_quark         (void);
-#define             NM_SETTING_CDMA_NUMBER
-#define             NM_SETTING_CDMA_USERNAME
-#define             NM_SETTING_CDMA_PASSWORD
-#define             NM_SETTING_CDMA_PASSWORD_FLAGS
-                    NMSettingCdma;
-                    NMSettingCdmaClass;
-NMSetting *         nm_setting_cdma_new                 (void);
-const char *        nm_setting_cdma_get_number          (NMSettingCdma *setting);
-const char *        nm_setting_cdma_get_username        (NMSettingCdma *setting);
-const char *        nm_setting_cdma_get_password        (NMSettingCdma *setting);
-NMSettingSecretFlags nm_setting_cdma_get_password_flags (NMSettingCdma *setting);
-

+

+
Functions

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





+GQuark
+
+nm_setting_cdma_error_quark ()
+

+NMSetting *
+
+nm_setting_cdma_new ()
+
const char *
+
+nm_setting_cdma_get_number ()
+
const char *
+
+nm_setting_cdma_get_username ()
+
const char *
+
+nm_setting_cdma_get_password ()
+

+NMSettingSecretFlags
+
+nm_setting_cdma_get_password_flags ()
+

+

+

+
Properties

+

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+






+gchar *numberRead / Write

+gchar *passwordRead / Write
guintpassword-flagsRead / Write

+gchar *usernameRead / Write

+

+

+
Types and Values

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+




#defineNM_SETTING_CDMA_SETTING_NAME
enumNMSettingCdmaError
#defineNM_SETTING_CDMA_ERROR
#defineNM_SETTING_CDMA_NUMBER
#defineNM_SETTING_CDMA_USERNAME
#defineNM_SETTING_CDMA_PASSWORD
#defineNM_SETTING_CDMA_PASSWORD_FLAGS

 

 

 
Object Hierarchy

-
-  GEnum
-   +----NMSettingCdmaError
-

-
-  GObject
-   +----NMSetting
-         +----NMSettingCdma
+
    GEnum
+    ╰── NMSettingCdmaError
+    GObject
+    ╰── NMSetting
+        ╰── NMSettingCdma
 

 

 

-
Properties

-
-  "number"                   gchar*                : Read / Write
-  "password"                 gchar*                : Read / Write
-  "password-flags"           guint                 : Read / Write
-  "username"                 gchar*                : Read / Write
+
Includes

+
#include <nm-setting-cdma.h>
 

 

 

 
Description

-

-The NMSettingCdma object is a NMSetting subclass that describes
+
The NMSettingCdma object is a NMSetting subclass that describes
 properties that allow connections to IS-95-based mobile broadband
-networks, including those using CDMA2000/EVDO technology.
-

+networks, including those using CDMA2000/EVDO technology.

 

 

-
Details

+
Functions

+

+
nm_setting_cdma_error_quark ()

+
GQuark
+nm_setting_cdma_error_quark (void);

+
Registers an error quark for NMSettingCdma if necessary.

+

+
Returns

+
 the error quark used for NMSettingCdma errors.

+

+

+

+

+

+
nm_setting_cdma_new ()

+
NMSetting *
+nm_setting_cdma_new (void);

+
Creates a new NMSettingCdma object with default values.

+

+
Returns

+
 the new empty NMSettingCdma object

+

+

+

+

+

+
nm_setting_cdma_get_number ()

+
const char *
+nm_setting_cdma_get_number (NMSettingCdma *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingCdma
 

+

+

+
Returns

+
 the “number” property of the setting

+

+

+

+

+

+
nm_setting_cdma_get_username ()

+
const char *
+nm_setting_cdma_get_username (NMSettingCdma *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingCdma
 

+

+

+
Returns

+
 the “username” property of the setting

+

+

+

+

+

+
nm_setting_cdma_get_password ()

+
const char *
+nm_setting_cdma_get_password (NMSettingCdma *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingCdma
 

+

+

+
Returns

+
 the “password” property of the setting

+

+

+

+

+

+
nm_setting_cdma_get_password_flags ()

+
NMSettingSecretFlags
+nm_setting_cdma_get_password_flags (NMSettingCdma *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingCdma
 

+

+

+
Returns

+
 the NMSettingSecretFlags pertaining to the “password”

+

+

+

+

+

+
Types and Values

 

 
NM_SETTING_CDMA_SETTING_NAME

 
#define NM_SETTING_CDMA_SETTING_NAME "cdma"
@@ -101,45 +324,50 @@ networks, including those using CDMA2000/EVDO technology.
 

 

 

-
enum NMSettingCdmaError

-
typedef enum {
-	NM_SETTING_CDMA_ERROR_UNKNOWN = 0,           /*< nick=UnknownError >*/
-	NM_SETTING_CDMA_ERROR_INVALID_PROPERTY,      /*< nick=InvalidProperty >*/
-	NM_SETTING_CDMA_ERROR_MISSING_PROPERTY,      /*< nick=MissingProperty >*/
-	NM_SETTING_CDMA_ERROR_MISSING_SERIAL_SETTING /*< nick=MissingSerialSetting >*/
-} NMSettingCdmaError;
-

-

+
enum NMSettingCdmaError

+

+
Members

+
--+++
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+

 





 
 
 
NM_SETTING_CDMA_ERROR_UNKNOWN
unknown or unclassified error
+
NM_SETTING_CDMA_ERROR_UNKNOWN

+
unknown or unclassified error

 		 
 

 
NM_SETTING_CDMA_ERROR_INVALID_PROPERTY
the property was invalid
+
NM_SETTING_CDMA_ERROR_INVALID_PROPERTY

+
the property was invalid

 		 
 

 
NM_SETTING_CDMA_ERROR_MISSING_PROPERTY
the property was missing and is
-required
+
NM_SETTING_CDMA_ERROR_MISSING_PROPERTY

+
the property was missing and is
+required

 		 
 

 
NM_SETTING_CDMA_ERROR_MISSING_SERIAL_SETTING
the required NMSettingSerial
-is missing in the connection
+
NM_SETTING_CDMA_ERROR_MISSING_SERIAL_SETTING

+
the required NMSettingSerial
+is missing in the connection

 		 
 

 
 

 

+

 

 

 
NM_SETTING_CDMA_ERROR

@@ -150,24 +378,6 @@ is missing in the connection
 

 

 

-
nm_setting_cdma_error_quark ()

-
GQuark              nm_setting_cdma_error_quark         (void);

-

-Registers an error quark for NMSettingCdma if necessary.
-

-

----
-
-
-
-
-




Returns :
the error quark used for NMSettingCdma errors.

-

-

-

 
NM_SETTING_CDMA_NUMBER

 
#define NM_SETTING_CDMA_NUMBER         "number"
 

@@ -198,185 +408,45 @@ Registers an error quark for 
-
NMSettingCdma

-
typedef struct _NMSettingCdma NMSettingCdma;

-

-

-

-

-

-
NMSettingCdmaClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingCdmaClass;
-

-

-

-

-

-

-
nm_setting_cdma_new ()

-
NMSetting *         nm_setting_cdma_new                 (void);

-

-Creates a new NMSettingCdma object with default values.
-

-

----
-
-
-
-
-




Returns :
the new empty NMSettingCdma object

-

-

-

-
nm_setting_cdma_get_number ()

-
const char *        nm_setting_cdma_get_number          (NMSettingCdma *setting);

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingCdma
-
Returns :
the "number" property of the setting

-

-

-

-
nm_setting_cdma_get_username ()

-
const char *        nm_setting_cdma_get_username        (NMSettingCdma *setting);

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingCdma
-
Returns :
the "username" property of the setting

-

-

-

-
nm_setting_cdma_get_password ()

-
const char *        nm_setting_cdma_get_password        (NMSettingCdma *setting);

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingCdma
-
Returns :
the "password" property of the setting

-

-

-

-
nm_setting_cdma_get_password_flags ()

-
NMSettingSecretFlags nm_setting_cdma_get_password_flags (NMSettingCdma *setting);

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingCdma
-
Returns :
the NMSettingSecretFlags pertaining to the "password"
-

-

 

 

 
Property Details

 

-
The "number" property

-
  "number"                   gchar*                : Read / Write

-

-The number to dial to establish the connection to the CDMA-based mobile
-broadband network, if any.  If not specified, the default number (777)
-is used when required.
-

+
The “number” property

+
  “number”                   gchar *

+
Number to dial when establishing a PPP data session with the CDMA-based mobile broadband network.  If not specified, the default number (#777) is used when required.

+
Flags: Read / Write

 
Default value: NULL

 

 

 

-
The "password" property

-
  "password"                 gchar*                : Read / Write

-

-The password used to authenticate with the network, if required.  Many
-providers do not require a password, or accept any password.  But if a
-password is required, it is specified here.
-

+
The “password” property

+
  “password”                 gchar *

+
Password used to authenticate with the network, if required.  Note that many providers do not require a password or accept any password.

+
Flags: Read / Write

 
Default value: NULL

 

 

 

-
The "password-flags" property

-
  "password-flags"           guint                 : Read / Write

-

-Flags indicating how to handle "password":.
-

+
The “password-flags” property

+
  “password-flags”           guint

+
Flags indicating how to handle the CDMA password.

+
Flags: Read / Write

 
Allowed values: <= 7

 
Default value: 0

 

 

 

-
The "username" property

-
  "username"                 gchar*                : Read / Write

-

-The username used to authenticate with the network, if required.  Many
-providers do not require a username, or accept any username.  But if a
-username is required, it is specified here.
-

+
The “username” property

+
  “username”                 gchar *

+
Username used to authenticate with the network, if required.  Note that many providers do not require a username or accept any username.

+
Flags: Read / Write

 
Default value: NULL

 

 

 

 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.20
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingConnection.html b/docs/libnm-util/html/NMSettingConnection.html
index 95b82888..f212d48d 100644
--- a/docs/libnm-util/html/NMSettingConnection.html
+++ b/docs/libnm-util/html/NMSettingConnection.html
@@ -2,34 +2,28 @@
 
 
 
-NMSettingConnection
+libnm-util Reference Manual: NMSettingConnection
 
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
 

 

 

@@ -37,1033 +31,1297 @@
 
NMSettingConnection
NMSettingConnection — Describes general connection properties

-
+

 
 
 

-

-
Synopsis

-
-#include <nm-setting-connection.h>
-
-#define             NM_SETTING_CONNECTION_SETTING_NAME
-enum                NMSettingConnectionError;
-#define             NM_SETTING_CONNECTION_ERROR
-GQuark              nm_setting_connection_error_quark   (void);
-#define             NM_SETTING_CONNECTION_ID
-#define             NM_SETTING_CONNECTION_UUID
-#define             NM_SETTING_CONNECTION_TYPE
-#define             NM_SETTING_CONNECTION_AUTOCONNECT
-#define             NM_SETTING_CONNECTION_TIMESTAMP
-#define             NM_SETTING_CONNECTION_READ_ONLY
-#define             NM_SETTING_CONNECTION_PERMISSIONS
-#define             NM_SETTING_CONNECTION_ZONE
-#define             NM_SETTING_CONNECTION_MASTER
-#define             NM_SETTING_CONNECTION_SLAVE_TYPE
-#define             NM_SETTING_CONNECTION_SECONDARIES
-                    NMSettingConnection;
-                    NMSettingConnectionClass;
-NMSetting *         nm_setting_connection_new           (void);
-const char *        nm_setting_connection_get_id        (NMSettingConnection *setting);
-const char *        nm_setting_connection_get_uuid      (NMSettingConnection *setting);
-const char *        nm_setting_connection_get_connection_type
-                                                        (NMSettingConnection *setting);
-gboolean            nm_setting_connection_get_autoconnect
-                                                        (NMSettingConnection *setting);
-guint64             nm_setting_connection_get_timestamp (NMSettingConnection *setting);
-gboolean            nm_setting_connection_get_read_only (NMSettingConnection *setting);
-guint32             nm_setting_connection_get_num_permissions
-                                                        (NMSettingConnection *setting);
-gboolean            nm_setting_connection_get_permission
-                                                        (NMSettingConnection *setting,
-                                                         guint32 idx,
-                                                         const char **out_ptype,
-                                                         const char **out_pitem,
-                                                         const char **out_detail);
-const char *        nm_setting_connection_get_zone      (NMSettingConnection *setting);
-gboolean            nm_setting_connection_permissions_user_allowed
-                                                        (NMSettingConnection *setting,
-                                                         const char *uname);
-gboolean            nm_setting_connection_add_permission
-                                                        (NMSettingConnection *setting,
-                                                         const char *ptype,
-                                                         const char *pitem,
-                                                         const char *detail);
-void                nm_setting_connection_remove_permission
-                                                        (NMSettingConnection *setting,
-                                                         guint32 idx);
-const char *        nm_setting_connection_get_master    (NMSettingConnection *setting);
-gboolean            nm_setting_connection_is_slave_type (NMSettingConnection *setting,
-                                                         const char *type);
-const char *        nm_setting_connection_get_slave_type
-                                                        (NMSettingConnection *setting);
-guint32             nm_setting_connection_get_num_secondaries
-                                                        (NMSettingConnection *setting);
-const char *        nm_setting_connection_get_secondary (NMSettingConnection *setting,
-                                                         guint32 idx);
-gboolean            nm_setting_connection_add_secondary (NMSettingConnection *setting,
-                                                         const char *sec_uuid);
-void                nm_setting_connection_remove_secondary
-                                                        (NMSettingConnection *setting,
-                                                         guint32 idx);
-

-

-

-
Object Hierarchy

-
-  GEnum
-   +----NMSettingConnectionError
-

-
-  GObject
-   +----NMSetting
-         +----NMSettingConnection
-

-

-

-
Properties

-
-  "autoconnect"              gboolean              : Read / Write / Construct
-  "id"                       gchar*                : Read / Write
-  "master"                   gchar*                : Read / Write
-  "permissions"              GSList_gchararray_*   : Read / Write
-  "read-only"                gboolean              : Read / Write / Construct
-  "secondaries"              GSList_gchararray_*   : Read / Write
-  "slave-type"               gchar*                : Read / Write
-  "timestamp"                guint64               : Read / Write / Construct
-  "type"                     gchar*                : Read / Write
-  "uuid"                     gchar*                : Read / Write
-  "zone"                     gchar*                : Read / Write / Construct
-

-

 

-
Description

-

-The NMSettingConnection object is a NMSetting subclass that describes
-properties that apply to all NMConnection objects, regardless of what type
-of network connection they describe.  Each NMConnection object must contain
-a NMSettingConnection setting.
-

-

-

-
Details

-

-
NM_SETTING_CONNECTION_SETTING_NAME

-
#define NM_SETTING_CONNECTION_SETTING_NAME "connection"
-

-

-

-

-

-

-
enum NMSettingConnectionError

-
typedef enum {
-	NM_SETTING_CONNECTION_ERROR_UNKNOWN = 0,            /*< nick=UnknownError >*/
-	NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY,       /*< nick=InvalidProperty >*/
-	NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY,       /*< nick=MissingProperty >*/
-	NM_SETTING_CONNECTION_ERROR_TYPE_SETTING_NOT_FOUND, /*< nick=TypeSettingNotFound >*/
-	NM_SETTING_CONNECTION_ERROR_IP_CONFIG_NOT_ALLOWED,  /*< nick=IpConfigNotAllowed >*/
-} NMSettingConnectionError;
-

-

-Describes errors that may result from operations involving a
-NMSettingConnection.
-

-

+
Functions

+
--++
-
-
+
+
+
+
+
-
-
+
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

 




 
 
 
NM_SETTING_CONNECTION_ERROR_UNKNOWN
unknown or unclassified error
+
+GQuark
+
+nm_setting_connection_error_quark ()
+

+NMSetting *
+
+nm_setting_connection_new ()
 
 

 
NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY
the property's value is
-  invalid
+const char *
+
+nm_setting_connection_get_id ()
 
 

 
NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY
a required property is not
-  present
+const char *
+
+nm_setting_connection_get_uuid ()
 
 

 
NM_SETTING_CONNECTION_ERROR_TYPE_SETTING_NOT_FOUND
the NMSetting object
-  referenced by the setting name contained in the
-  "type" property was not present in the NMConnection
+const char *
+
+nm_setting_connection_get_connection_type ()
+

+gboolean
+
+nm_setting_connection_get_autoconnect ()
+

+guint64
+
+nm_setting_connection_get_timestamp ()
+

+gboolean
+
+nm_setting_connection_get_read_only ()
+

+guint32
+
+nm_setting_connection_get_num_permissions ()
 
 

 
NM_SETTING_CONNECTION_ERROR_IP_CONFIG_NOT_ALLOWED
ip configuration is not
-  allowed to be present.
+
+gboolean
+
+nm_setting_connection_get_permission ()
+
const char *
+
+nm_setting_connection_get_zone ()
+

+gboolean
+
+nm_setting_connection_permissions_user_allowed ()
+

+gboolean
+
+nm_setting_connection_add_permission ()
+

+void
+
+nm_setting_connection_remove_permission ()
+
const char *
+
+nm_setting_connection_get_master ()
+

+gboolean
+
+nm_setting_connection_is_slave_type ()
+
const char *
+
+nm_setting_connection_get_slave_type ()
+

+guint32
+
+nm_setting_connection_get_num_secondaries ()
+
const char *
+
+nm_setting_connection_get_secondary ()
+

+gboolean
+
+nm_setting_connection_add_secondary ()
+

+void
+
+nm_setting_connection_remove_secondary ()
 
 

 
 

 

-

-

-
NM_SETTING_CONNECTION_ERROR

-
#define NM_SETTING_CONNECTION_ERROR nm_setting_connection_error_quark ()
-

-

-

-

-

-

-
nm_setting_connection_error_quark ()

-
GQuark              nm_setting_connection_error_quark   (void);

-

-Registers an error quark for NMSettingConnection if necessary.
-

-

+

+
Properties

+
--+++
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

 





 
Returns :
the error quark used for NMSettingConnection errors.
gbooleanautoconnectRead / Write / Construct

+gchar *idRead / Write

+gchar *masterRead / Write

+GSList_gchararray_ *permissionsRead / Write
gbooleanread-onlyRead / Write / Construct

+GSList_gchararray_ *secondariesRead / Write

+gchar *slave-typeRead / Write
guint64timestampRead / Write / Construct

+gchar *typeRead / Write

+gchar *uuidRead / Write

+gchar *zoneRead / Write / Construct

 

 

-

-

-
NM_SETTING_CONNECTION_ID

-
#define NM_SETTING_CONNECTION_ID          "id"
-

-

-

-

-

-

-
NM_SETTING_CONNECTION_UUID

-
#define NM_SETTING_CONNECTION_UUID        "uuid"
-

-

-

-

-

-

-
NM_SETTING_CONNECTION_TYPE

-
#define NM_SETTING_CONNECTION_TYPE        "type"
-

-

-

-

-

-

-
NM_SETTING_CONNECTION_AUTOCONNECT

-
#define NM_SETTING_CONNECTION_AUTOCONNECT "autoconnect"
-

-

-

-

-

-

-
NM_SETTING_CONNECTION_TIMESTAMP

-
#define NM_SETTING_CONNECTION_TIMESTAMP   "timestamp"
-

-

-

-

-

-

-
NM_SETTING_CONNECTION_READ_ONLY

-
#define NM_SETTING_CONNECTION_READ_ONLY   "read-only"
-

-

-

+

+
Types and Values

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+




#defineNM_SETTING_CONNECTION_SETTING_NAME
enumNMSettingConnectionError
#defineNM_SETTING_CONNECTION_ERROR
#defineNM_SETTING_CONNECTION_ID
#defineNM_SETTING_CONNECTION_UUID
#defineNM_SETTING_CONNECTION_TYPE
#defineNM_SETTING_CONNECTION_AUTOCONNECT
#defineNM_SETTING_CONNECTION_TIMESTAMP
#defineNM_SETTING_CONNECTION_READ_ONLY
#defineNM_SETTING_CONNECTION_PERMISSIONS
#defineNM_SETTING_CONNECTION_ZONE
#defineNM_SETTING_CONNECTION_MASTER
#defineNM_SETTING_CONNECTION_SLAVE_TYPE
#defineNM_SETTING_CONNECTION_SECONDARIES
 NMSettingConnection

 

-

-

-
NM_SETTING_CONNECTION_PERMISSIONS

-
#define NM_SETTING_CONNECTION_PERMISSIONS "permissions"
+

+
Object Hierarchy

+
    GEnum
+    ╰── NMSettingConnectionError
+    GObject
+    ╰── NMSetting
+        ╰── NMSettingConnection
 

-

-

 

-

-

-
NM_SETTING_CONNECTION_ZONE

-
#define NM_SETTING_CONNECTION_ZONE        "zone"
+

+
Includes

+
#include <nm-setting-connection.h>
 

-

-

 

-

-

-
NM_SETTING_CONNECTION_MASTER

-
#define NM_SETTING_CONNECTION_MASTER      "master"
-

-

-

+

+
Description

+
The NMSettingConnection object is a NMSetting subclass that describes
+properties that apply to all NMConnection objects, regardless of what type
+of network connection they describe.  Each NMConnection object must contain
+a NMSettingConnection setting.

 

-

+

+
Functions

 

-
NM_SETTING_CONNECTION_SLAVE_TYPE

-
#define NM_SETTING_CONNECTION_SLAVE_TYPE  "slave-type"
-

-

-

+
nm_setting_connection_error_quark ()

+
GQuark
+nm_setting_connection_error_quark (void);

+
Registers an error quark for NMSettingConnection if necessary.

+

+
Returns

+
 the error quark used for NMSettingConnection errors.

+

 

-

-

-
NM_SETTING_CONNECTION_SECONDARIES

-
#define NM_SETTING_CONNECTION_SECONDARIES "secondaries"
-

-

-

 

 

 

-
NMSettingConnection

-
typedef struct _NMSettingConnection NMSettingConnection;

-

-The NMSettingConnection struct contains only private data.
-It should only be accessed through the functions described below.
-

+
nm_setting_connection_new ()

+
NMSetting *
+nm_setting_connection_new (void);

+
Creates a new NMSettingConnection object with default values.

+

+
Returns

+
 the new empty NMSettingConnection object

+

 

-

-

-
NMSettingConnectionClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingConnectionClass;
-

-

-

 

 

 

-
nm_setting_connection_new ()

-
NMSetting *         nm_setting_connection_new           (void);

-

-Creates a new NMSettingConnection object with default values.
-

-

+
nm_setting_connection_get_id ()

+
const char *
+nm_setting_connection_get_id (NMSettingConnection *setting);

+
Returns the “id” property of the connection.

+

+
Parameters

+
--+++
-
-
+
+
+

 





 
 
Returns :
the new empty NMSettingConnection object
setting
the NMSettingConnection
 
 

 

 

-

-

-
nm_setting_connection_get_id ()

-
const char *        nm_setting_connection_get_id        (NMSettingConnection *setting);

-

-Returns the "id" property of the connection.
-

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingConnection
-
Returns :
the connection ID

+

+
Returns

+
 the connection ID

+

+

 

 

 

-
nm_setting_connection_get_uuid ()

-
const char *        nm_setting_connection_get_uuid      (NMSettingConnection *setting);

-

-Returns the "uuid" property of the connection.
-

-

+
nm_setting_connection_get_uuid ()

+
const char *
+nm_setting_connection_get_uuid (NMSettingConnection *setting);

+
Returns the “uuid” property of the connection.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingConnection
-
Returns :
the connection UUID
setting
the NMSettingConnection
 

 

 

+

+
Returns

+
 the connection UUID

+

+

+

 

 

-
nm_setting_connection_get_connection_type ()

-
const char *        nm_setting_connection_get_connection_type
-                                                        (NMSettingConnection *setting);

-

-Returns the "type" property of the connection.
-

-

+
nm_setting_connection_get_connection_type ()

+
const char *
+nm_setting_connection_get_connection_type
+                               (NMSettingConnection *setting);

+
Returns the “type” property of the connection.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingConnection
-
Returns :
the connection type
setting
the NMSettingConnection
 

 

 

+

+
Returns

+
 the connection type

+

+

+

 

 

-
nm_setting_connection_get_autoconnect ()

-
gboolean            nm_setting_connection_get_autoconnect
-                                                        (NMSettingConnection *setting);

-

-Returns the "autoconnect" property of the connection.
-

-

+
nm_setting_connection_get_autoconnect ()

+
gboolean
+nm_setting_connection_get_autoconnect (NMSettingConnection *setting);

+
Returns the “autoconnect” property of the connection.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingConnection
-
Returns :
the connection's autoconnect behavior
setting
the NMSettingConnection
 

 

 

+

+
Returns

+
 the connection's autoconnect behavior

+

+

+

 

 

-
nm_setting_connection_get_timestamp ()

-
guint64             nm_setting_connection_get_timestamp (NMSettingConnection *setting);

-

-Returns the "timestamp" property of the connection.
-

-

+
nm_setting_connection_get_timestamp ()

+
guint64
+nm_setting_connection_get_timestamp (NMSettingConnection *setting);

+
Returns the “timestamp” property of the connection.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingConnection
-
Returns :
the connection's timestamp
setting
the NMSettingConnection
 

 

 

+

+
Returns

+
 the connection's timestamp

+

+

+

 

 

-
nm_setting_connection_get_read_only ()

-
gboolean            nm_setting_connection_get_read_only (NMSettingConnection *setting);

-

-Returns the "read-only" property of the connection.
-

-

+
nm_setting_connection_get_read_only ()

+
gboolean
+nm_setting_connection_get_read_only (NMSettingConnection *setting);

+
Returns the “read-only” property of the connection.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingConnection
-
Returns :

-TRUE if the connection is read-only, FALSE if it is not
setting
the NMSettingConnection
 

 

 

+

+
Returns

+
 TRUE if the connection is read-only, FALSE if it is not

+

+

+

 

 

-
nm_setting_connection_get_num_permissions ()

-
guint32             nm_setting_connection_get_num_permissions
-                                                        (NMSettingConnection *setting);

-

-Returns the number of entires in the "permissions"
-property of this setting.
-

-

+
nm_setting_connection_get_num_permissions ()

+
guint32
+nm_setting_connection_get_num_permissions
+                               (NMSettingConnection *setting);

+
Returns the number of entires in the “permissions”
+property of this setting.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingConnection
-
Returns :
the number of permissions entires
setting
the NMSettingConnection
 

 

 

+

+
Returns

+
 the number of permissions entires

+

+

+

 

 

-
nm_setting_connection_get_permission ()

-
gboolean            nm_setting_connection_get_permission
-                                                        (NMSettingConnection *setting,
-                                                         guint32 idx,
-                                                         const char **out_ptype,
-                                                         const char **out_pitem,
-                                                         const char **out_detail);

-

-Retrieve one of the entries of the "permissions" property
-of this setting.
-

-

+
nm_setting_connection_get_permission ()

+
gboolean
+nm_setting_connection_get_permission (NMSettingConnection *setting,
+                                      guint32 idx,
+                                      const char **out_ptype,
+                                      const char **out_pitem,
+                                      const char **out_detail);

+
Retrieve one of the entries of the “permissions” property
+of this setting.

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingConnection
-
idx :
the zero-based index of the permissions entry
setting
the NMSettingConnection
 
 

 
out_ptype :
on return, the permission type (at this time, always "user")
idx
the zero-based index of the permissions entry
 
 

 
out_pitem :
on return, the permission item (formatted accoring to ptype, see
-"permissions" for more detail
out_ptype
on return, the permission type (at this time, always "user")
 
 

 
out_detail :
on return, the permission detail (at this time, always NULL)
out_pitem
on return, the permission item (formatted accoring to ptype
+, see
+“permissions” for more detail
 
 

 
Returns :

-TRUE if a permission was returned, FALSE if idx was invalid
out_detail
on return, the permission detail (at this time, always NULL)
 
 

 
 

 

+

+
Returns

+
 TRUE if a permission was returned, FALSE if idx
+was invalid

+

+

+

 

 

-
nm_setting_connection_get_zone ()

-
const char *        nm_setting_connection_get_zone      (NMSettingConnection *setting);

-

-Returns the "zone" property of the connection.
-

-

+
nm_setting_connection_get_zone ()

+
const char *
+nm_setting_connection_get_zone (NMSettingConnection *setting);

+
Returns the “zone” property of the connection.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingConnection
-
Returns :
the trust level of a connection
setting
the NMSettingConnection
 

 

 

+

+
Returns

+
 the trust level of a connection

+

+

+

 

 

-
nm_setting_connection_permissions_user_allowed ()

-
gboolean            nm_setting_connection_permissions_user_allowed
-                                                        (NMSettingConnection *setting,
-                                                         const char *uname);

-

-Checks whether the given username is allowed to view/access this connection.
-

-

+
nm_setting_connection_permissions_user_allowed ()

+
gboolean
+nm_setting_connection_permissions_user_allowed
+                               (NMSettingConnection *setting,
+                                const char *uname);

+
Checks whether the given username is allowed to view/access this connection.

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingConnection
-
uname :
the user name to check permissions for
setting
the NMSettingConnection
 
 

 
Returns :

-TRUE if the requested user is allowed to view this connection,
-FALSE if the given user is not allowed to view this connection
uname
the user name to check permissions for
 
 

 
 

 

+

+
Returns

+
 TRUE if the requested user is allowed to view this connection,
+FALSE if the given user is not allowed to view this connection

+

+

+

 

 

-
nm_setting_connection_add_permission ()

-
gboolean            nm_setting_connection_add_permission
-                                                        (NMSettingConnection *setting,
-                                                         const char *ptype,
-                                                         const char *pitem,
-                                                         const char *detail);

-

-Adds a permission to the connection's permission list.  At this time, only
-the "user" permission type is supported, and pitem must be a username. See
-"permissions": for more details.
-

-

+
nm_setting_connection_add_permission ()

+
gboolean
+nm_setting_connection_add_permission (NMSettingConnection *setting,
+                                      const char *ptype,
+                                      const char *pitem,
+                                      const char *detail);

+
Adds a permission to the connection's permission list.  At this time, only
+the "user" permission type is supported, and pitem
+ must be a username. See
+“permissions”: for more details.

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingConnection
-
ptype :
the permission type; at this time only "user" is supported
setting
the NMSettingConnection
 
 

 
pitem :
the permission item formatted as required for ptype
-
ptype
the permission type; at this time only "user" is supported
 
 

 
detail :
unused at this time; must be NULL. [allow-none]
-
pitem
the permission item formatted as required for ptype
+
 
 

 
Returns :
TRUE if the permission was unique and was successfully added to the
-list, FALSE if ptype or pitem was invalid or it the permission was already
-present in the list
detail
 unused at this time; must be NULL. 
[allow-none]
 

 
 

 

+

+
Returns

+
 TRUE if the permission was unique and was successfully added to the
+list, FALSE if ptype
+or pitem
+was invalid or it the permission was already
+present in the list

+

+

+
 

 

-
nm_setting_connection_remove_permission ()

-
void                nm_setting_connection_remove_permission
-                                                        (NMSettingConnection *setting,
-                                                         guint32 idx);

-

-Removes the permission at index idx from the connection.
-

-

+
nm_setting_connection_remove_permission ()

+
void
+nm_setting_connection_remove_permission
+                               (NMSettingConnection *setting,
+                                guint32 idx);

+
Removes the permission at index idx
+ from the connection.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingConnection
-
setting
the NMSettingConnection
 
 

 
idx :
the zero-based index of the permission to remove
idx
the zero-based index of the permission to remove
 
 

 
 

 

+
 

 

-
nm_setting_connection_get_master ()

-
const char *        nm_setting_connection_get_master    (NMSettingConnection *setting);

-

-Returns the "master" property of the connection.
-

-

+
nm_setting_connection_get_master ()

+
const char *
+nm_setting_connection_get_master (NMSettingConnection *setting);

+
Returns the “master” property of the connection.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingConnection
-
Returns :
interface name of the master device or UUID of the master
-connection.
setting
the NMSettingConnection
 

 

 

+

+
Returns

+
 interface name of the master device or UUID of the master
+connection.

+

+

+
 

 

-
nm_setting_connection_is_slave_type ()

-
gboolean            nm_setting_connection_is_slave_type (NMSettingConnection *setting,
-                                                         const char *type);

-

+
nm_setting_connection_is_slave_type ()

+
gboolean
+nm_setting_connection_is_slave_type (NMSettingConnection *setting,
+                                     const char *type);

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingConnection
-
type :
the setting name (ie NM_SETTING_BOND_SETTING_NAME) to be matched
-against setting's slave type
setting
the NMSettingConnection
 
 

 
Returns :
TRUE if connection is of the given slave type
-
type
the setting name (ie NM_SETTING_BOND_SETTING_NAME) to be matched
+against setting
+'s slave type
 
 

 
 

 

+

+
Returns

+
 TRUE if connection is of the given slave type
+

+

+

+
 

 

-
nm_setting_connection_get_slave_type ()

-
const char *        nm_setting_connection_get_slave_type
-                                                        (NMSettingConnection *setting);

-

-Returns the "slave-type" property of the connection.
-

-

+
nm_setting_connection_get_slave_type ()

+
const char *
+nm_setting_connection_get_slave_type (NMSettingConnection *setting);

+
Returns the “slave-type” property of the connection.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+

 





 
setting :
the NMSettingConnection
-
Returns :
the type of slave this connection is, if any
setting
the NMSettingConnection
 

+

+

+
Returns

+
 the type of slave this connection is, if any

+

+

+
+

+

+
nm_setting_connection_get_num_secondaries ()

+
guint32
+nm_setting_connection_get_num_secondaries
+                               (NMSettingConnection *setting);

+

+
Parameters

+

+++++
+
+
+
+
+





setting
the NMSettingConnection
 

 

 

+

+
Returns

+
 the number of configured secondary connection UUIDs

+

+

+
Since 0.9.8

+

 

 

-
nm_setting_connection_get_num_secondaries ()

-
guint32             nm_setting_connection_get_num_secondaries
-                                                        (NMSettingConnection *setting);

-

+
nm_setting_connection_get_secondary ()

+
const char *
+nm_setting_connection_get_secondary (NMSettingConnection *setting,
+                                     guint32 idx);

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingConnection
-
setting
the NMSettingConnection
 
 

 
Returns :
the number of configured secondary connection UUIDs
idx
the zero-based index of the secondary connection UUID entry
 
 

 
 

+

+

+
Returns

+
 the secondary connection UUID at index idx
+

+

+

 
Since 0.9.8

 
 

 

-
nm_setting_connection_get_secondary ()

-
const char *        nm_setting_connection_get_secondary (NMSettingConnection *setting,
-                                                         guint32 idx);

-

+
nm_setting_connection_add_secondary ()

+
gboolean
+nm_setting_connection_add_secondary (NMSettingConnection *setting,
+                                     const char *sec_uuid);

+
Adds a new secondary connetion UUID to the setting.

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingConnection
-
idx :
the zero-based index of the secondary connection UUID entry
setting
the NMSettingConnection
 
 

 
Returns :
the secondary connection UUID at index idx
-
sec_uuid
the secondary connection UUID to add
 
 

 
 

+

+

+
Returns

+
 TRUE if the secondary connection UUID was added; FALSE if the UUID
+was already present

+

+

 
Since 0.9.8

 
 

 

-
nm_setting_connection_add_secondary ()

-
gboolean            nm_setting_connection_add_secondary (NMSettingConnection *setting,
-                                                         const char *sec_uuid);

-

-Adds a new secondary connetion UUID to the setting.
-

-

+
nm_setting_connection_remove_secondary ()

+
void
+nm_setting_connection_remove_secondary
+                               (NMSettingConnection *setting,
+                                guint32 idx);

+
Removes the secondary coonnection UUID at index idx
+.

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingConnection
-
sec_uuid :
the secondary connection UUID to add
setting
the NMSettingConnection
 
 

 
Returns :

-TRUE if the secondary connection UUID was added; FALSE if the UUID
-was already present
idx
index number of the secondary connection UUID
 
 

 
 

+

 
Since 0.9.8

 
-

+
+

+
Types and Values

 

-
nm_setting_connection_remove_secondary ()

-
void                nm_setting_connection_remove_secondary
-                                                        (NMSettingConnection *setting,
-                                                         guint32 idx);

+
NM_SETTING_CONNECTION_SETTING_NAME

+
#define NM_SETTING_CONNECTION_SETTING_NAME "connection"
+

 

-Removes the secondary coonnection UUID at index idx.
 

-

+
+

+

+
enum NMSettingConnectionError

+
Describes errors that may result from operations involving a
+NMSettingConnection.

+

+
Members

+
--+++
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingConnection
+
NM_SETTING_CONNECTION_ERROR_UNKNOWN

+
unknown or unclassified error

+		 
NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY

+
the property's value is
+  invalid

+		 
NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY

+
a required property is not
+  present

+		 
NM_SETTING_CONNECTION_ERROR_TYPE_SETTING_NOT_FOUND

+
the NMSetting object
+  referenced by the setting name contained in the
+  “type” property was not present in the NMConnection

 		 
 

 
idx :
index number of the secondary connection UUID
NM_SETTING_CONNECTION_ERROR_IP_CONFIG_NOT_ALLOWED

+
ip configuration is not
+  allowed to be present.

+		 
 

 
 

-
Since 0.9.8

 

 

-

-
Property Details

+

 

-
The "autoconnect" property

-
  "autoconnect"              gboolean              : Read / Write / Construct

+
NM_SETTING_CONNECTION_ERROR

+
#define NM_SETTING_CONNECTION_ERROR nm_setting_connection_error_quark ()
+

 

-Whether or not the connection should be automatically connected by
-NetworkManager when the resources for the connection are available.
-TRUE to automatically activate the connection, FALSE to require manual
-intervention to activate the connection.  Defaults to TRUE.
 

-
Default value: TRUE

 

 

 

-
The "id" property

-
  "id"                       gchar*                : Read / Write

+
NM_SETTING_CONNECTION_ID

+
#define NM_SETTING_CONNECTION_ID          "id"
+

 

-A human readable unique idenfier for the connection, like "Work WiFi" or
-"T-Mobile 3G".
 

-
Default value: NULL

 

 

 

-
The "master" property

-
  "master"                   gchar*                : Read / Write

+
NM_SETTING_CONNECTION_UUID

+
#define NM_SETTING_CONNECTION_UUID        "uuid"
+

 

-Interface name of the master device or UUID of the master connection.
 

-
Default value: NULL

 

 

 

-
The "permissions" property

-
  "permissions"              GSList_gchararray_*   : Read / Write

+
NM_SETTING_CONNECTION_TYPE

+
#define NM_SETTING_CONNECTION_TYPE        "type"
+

 

-An array of strings defining what access a given user has to this
-connection.  If this is NULL or empty, all users are allowed to access
-this connection.  Otherwise a user is allowed to access this connection
-if and only if they are in this list. Each entry is of the form
-"[type]:[id]:[reserved]", for example:
 

+

+

+

+
NM_SETTING_CONNECTION_AUTOCONNECT

+
#define NM_SETTING_CONNECTION_AUTOCONNECT "autoconnect"
+

 

-   user:dcbw:blah
 

+

+

+

+
NM_SETTING_CONNECTION_TIMESTAMP

+
#define NM_SETTING_CONNECTION_TIMESTAMP   "timestamp"
+

 

-At this time only the 'user' [type] is allowed.  Any other values are
-ignored and reserved for future use.  [id] is the username that this
-permission refers to, which may not contain the ':' character. Any
-[reserved] information present must be ignored and is reserved for
-future use.  All of [type], [id], and [reserved] must be valid UTF-8.
 

 

 

 

-
The "read-only" property

-
  "read-only"                gboolean              : Read / Write / Construct

+
NM_SETTING_CONNECTION_READ_ONLY

+
#define NM_SETTING_CONNECTION_READ_ONLY   "read-only"
+

 

-TRUE if the connection can be modified using the providing settings
-service's D-Bus interface with the right privileges, or FALSE
-if the connection is read-only and cannot be modified.
 

-
Default value: FALSE

 

 

 

-
The "secondaries" property

-
  "secondaries"              GSList_gchararray_*   : Read / Write

+
NM_SETTING_CONNECTION_PERMISSIONS

+
#define NM_SETTING_CONNECTION_PERMISSIONS "permissions"
+

 

-List of connection UUIDs that should be activated when the base connection
-itself is activated.
 

-
Since 0.9.8

 

 

 

-
The "slave-type" property

-
  "slave-type"               gchar*                : Read / Write

+
NM_SETTING_CONNECTION_ZONE

+
#define NM_SETTING_CONNECTION_ZONE        "zone"
+

 

-Setting name describing the type of slave device (ie
-NM_SETTING_BOND_SETTING_NAME) or NULL if this connection is not a slave.
 

-
Default value: NULL

 

 

 

-
The "timestamp" property

-
  "timestamp"                guint64               : Read / Write / Construct

+
NM_SETTING_CONNECTION_MASTER

+
#define NM_SETTING_CONNECTION_MASTER      "master"
+

+

+

+

+

+

+
NM_SETTING_CONNECTION_SLAVE_TYPE

+
#define NM_SETTING_CONNECTION_SLAVE_TYPE  "slave-type"
+

 

-The time, in seconds since the Unix Epoch, that the connection was last
-_successfully_ fully activated.
 

-
Default value: 0

 

 

 

-
The "type" property

-
  "type"                     gchar*                : Read / Write

+
NM_SETTING_CONNECTION_SECONDARIES

+
#define NM_SETTING_CONNECTION_SECONDARIES "secondaries"
+

 

-The general hardware type of the device used for the network connection,
+

+

+

+

+
NMSettingConnection

+
typedef struct _NMSettingConnection NMSettingConnection;

+
The NMSettingConnection struct contains only private data.
+It should only be accessed through the functions described below.

+

+

+

+
Property Details

+

+
The “autoconnect” property

+
  “autoconnect”              gboolean

+
Whether or not the connection should be automatically connected by
+NetworkManager when the resources for the connection are available.
+TRUE to automatically activate the connection, FALSE to require manual
+intervention to activate the connection.  Defaults to TRUE.

+
Flags: Read / Write / Construct

+
Default value: TRUE

+

+

+

+
The “id” property

+
  “id”                       gchar *

+
A human readable unique idenfier for the connection, like "Work WiFi" or
+"T-Mobile 3G".

+
Flags: Read / Write

+
Default value: NULL

+

+

+

+
The “master” property

+
  “master”                   gchar *

+
Interface name of the master device or UUID of the master connection.

+
Flags: Read / Write

+
Default value: NULL

+

+

+

+
The “permissions” property

+
  “permissions”              GSList_gchararray_ *

+
An array of strings defining what access a given user has to this
+connection.  If this is NULL or empty, all users are allowed to access
+this connection.  Otherwise a user is allowed to access this connection
+if and only if they are in this list. Each entry is of the form
+"[type]:[id]:[reserved]", for example:

+
   user:dcbw:blah

+
At this time only the 'user' [type] is allowed.  Any other values are
+ignored and reserved for future use.  [id] is the username that this
+permission refers to, which may not contain the ':' character. Any
+[reserved] information present must be ignored and is reserved for
+future use.  All of [type], [id], and [reserved] must be valid UTF-8.

+
Flags: Read / Write

+

+

+

+
The “read-only” property

+
  “read-only”                gboolean

+
TRUE if the connection can be modified using the providing settings
+service's D-Bus interface with the right privileges, or FALSE
+if the connection is read-only and cannot be modified.

+
Flags: Read / Write / Construct

+
Default value: FALSE

+

+

+

+
The “secondaries” property

+
  “secondaries”              GSList_gchararray_ *

+
List of connection UUIDs that should be activated when the base connection
+itself is activated.

+
Flags: Read / Write

+
Since 0.9.8

+

+

+

+
The “slave-type” property

+
  “slave-type”               gchar *

+
Setting name describing the type of slave device (ie
+NM_SETTING_BOND_SETTING_NAME) or NULL if this connection is not a slave.

+
Flags: Read / Write

+
Default value: NULL

+

+

+

+
The “timestamp” property

+
  “timestamp”                guint64

+
The time, in seconds since the Unix Epoch, that the connection was last
+_successfully_ fully activated.

+
Flags: Read / Write / Construct

+
Default value: 0

+

+

+

+
The “type” property

+
  “type”                     gchar *

+
The general hardware type of the device used for the network connection,
 contains the name of the NMSetting object that describes that hardware
 type's parameters.  For example, for WiFi devices, the name of the
-NMSettingWireless setting.
-

+NMSettingWireless setting.

+
Flags: Read / Write

 
Default value: NULL

 

 

 

-
The "uuid" property

-
  "uuid"                     gchar*                : Read / Write

-

-A universally unique idenfier for the connection, for example generated
+
The “uuid” property

+
  “uuid”                     gchar *

+
A universally unique idenfier for the connection, for example generated
 with libuuid.  Should be assigned when the connection is created, and
 never changed as long as the connection still applies to the same
 network.  For example, should not be changed when the
-"id" or NMSettingIP4Config changes, but might need
+“id” or NMSettingIP4Config changes, but might need
 to be re-created when the WiFi SSID, mobile broadband network provider,
-or "type" changes.
-

-

-The UUID must be in the format '2815492f-7e56-435e-b2e9-246bd7cdc664'
+or “type” changes.

+
The UUID must be in the format '2815492f-7e56-435e-b2e9-246bd7cdc664'
 (ie, contains only hexadecimal characters and '-').  A suitable UUID may
-be generated by nm_utils_uuid_generate() or
-nm_utils_uuid_generate_from_string().
-

+be generated by nm_utils_uuid_generate() or
+nm_utils_uuid_generate_from_string().

+
Flags: Read / Write

 
Default value: NULL

 

 

 

-
The "zone" property

-
  "zone"                     gchar*                : Read / Write / Construct

-

-The trust level of a the connection.
+
The “zone” property

+
  “zone”                     gchar *

+
The trust level of a the connection.
 Free form case-insensitive string (for example "Home", "Work", "Public").
 NULL or unspecified zone means the connection will be placed in the
-default zone as defined by the firewall.
-

+default zone as defined by the firewall.

+
Flags: Read / Write / Construct

 
Default value: NULL

 

 

 
 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.20
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingGsm.html b/docs/libnm-util/html/NMSettingGsm.html
index 653911bb..6501d29a 100644
--- a/docs/libnm-util/html/NMSettingGsm.html
+++ b/docs/libnm-util/html/NMSettingGsm.html
@@ -2,34 +2,28 @@
 
 
 
-NMSettingGsm
+libnm-util Reference Manual: NMSettingGsm
 
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
 

 

 

@@ -37,92 +31,601 @@
 
NMSettingGsm
NMSettingGsm — Describes GSM/3GPP-based mobile broadband properties

-
+

 
 
 

-

-
Synopsis

-
-#include <nm-setting-gsm.h>
-
-#define             NM_SETTING_GSM_SETTING_NAME
-enum                NMSettingGsmError;
-#define             NM_SETTING_GSM_ERROR
-GQuark              nm_setting_gsm_error_quark          (void);
-#define             NM_SETTING_GSM_NUMBER
-#define             NM_SETTING_GSM_USERNAME
-#define             NM_SETTING_GSM_PASSWORD
-#define             NM_SETTING_GSM_PASSWORD_FLAGS
-#define             NM_SETTING_GSM_APN
-#define             NM_SETTING_GSM_NETWORK_ID
-#define             NM_SETTING_GSM_NETWORK_TYPE
-#define             NM_SETTING_GSM_ALLOWED_BANDS
-#define             NM_SETTING_GSM_PIN
-#define             NM_SETTING_GSM_PIN_FLAGS
-#define             NM_SETTING_GSM_HOME_ONLY
-enum                NMSettingGsmNetworkType;
-enum                NMSettingGsmNetworkBand;
-                    NMSettingGsm;
-                    NMSettingGsmClass;
-NMSetting *         nm_setting_gsm_new                  (void);
-const char *        nm_setting_gsm_get_number           (NMSettingGsm *setting);
-const char *        nm_setting_gsm_get_username         (NMSettingGsm *setting);
-const char *        nm_setting_gsm_get_password         (NMSettingGsm *setting);
-const char *        nm_setting_gsm_get_apn              (NMSettingGsm *setting);
-const char *        nm_setting_gsm_get_network_id       (NMSettingGsm *setting);
-int                 nm_setting_gsm_get_network_type     (NMSettingGsm *setting);
-guint32             nm_setting_gsm_get_allowed_bands    (NMSettingGsm *setting);
-const char *        nm_setting_gsm_get_pin              (NMSettingGsm *setting);
-gboolean            nm_setting_gsm_get_home_only        (NMSettingGsm *setting);
-NMSettingSecretFlags nm_setting_gsm_get_pin_flags       (NMSettingGsm *setting);
-NMSettingSecretFlags nm_setting_gsm_get_password_flags  (NMSettingGsm *setting);
-

+

+
Functions

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





+GQuark
+
+nm_setting_gsm_error_quark ()
+

+NMSetting *
+
+nm_setting_gsm_new ()
+
const char *
+
+nm_setting_gsm_get_number ()
+
const char *
+
+nm_setting_gsm_get_username ()
+
const char *
+
+nm_setting_gsm_get_password ()
+
const char *
+
+nm_setting_gsm_get_apn ()
+
const char *
+
+nm_setting_gsm_get_network_id ()
+

+int
+
+nm_setting_gsm_get_network_type ()
+

+guint32
+
+nm_setting_gsm_get_allowed_bands ()
+
const char *
+
+nm_setting_gsm_get_pin ()
+

+gboolean
+
+nm_setting_gsm_get_home_only ()
+

+NMSettingSecretFlags
+
+nm_setting_gsm_get_pin_flags ()
+

+NMSettingSecretFlags
+
+nm_setting_gsm_get_password_flags ()
+

+

+

+
Properties

+

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





guintallowed-bandsRead / Write / Construct

+gchar *apnRead / Write
gbooleanhome-onlyRead / Write

+gchar *network-idRead / Write
gintnetwork-typeRead / Write / Construct

+gchar *numberRead / Write

+gchar *passwordRead / Write
guintpassword-flagsRead / Write

+gchar *pinRead / Write
guintpin-flagsRead / Write

+gchar *usernameRead / Write

+

+

+
Types and Values

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+




#defineNM_SETTING_GSM_SETTING_NAME
enumNMSettingGsmError
#defineNM_SETTING_GSM_ERROR
#defineNM_SETTING_GSM_NUMBER
#defineNM_SETTING_GSM_USERNAME
#defineNM_SETTING_GSM_PASSWORD
#defineNM_SETTING_GSM_PASSWORD_FLAGS
#defineNM_SETTING_GSM_APN
#defineNM_SETTING_GSM_NETWORK_ID
#defineNM_SETTING_GSM_NETWORK_TYPE
#defineNM_SETTING_GSM_ALLOWED_BANDS
#defineNM_SETTING_GSM_PIN
#defineNM_SETTING_GSM_PIN_FLAGS
#defineNM_SETTING_GSM_HOME_ONLY
enumNMSettingGsmNetworkType
enumNMSettingGsmNetworkBand

 

 

 
Object Hierarchy

-
-  GEnum
-   +----NMSettingGsmError
-

-
-  GEnum
-   +----NMSettingGsmNetworkType
-

-
-  GEnum
-   +----NMSettingGsmNetworkBand
-

-
-  GObject
-   +----NMSetting
-         +----NMSettingGsm
+
    GEnum
+    ├── NMSettingGsmError
+    ├── NMSettingGsmNetworkBand
+    ╰── NMSettingGsmNetworkType
+    GObject
+    ╰── NMSetting
+        ╰── NMSettingGsm
 

 

 

-
Properties

-
-  "allowed-bands"            guint                 : Read / Write / Construct
-  "apn"                      gchar*                : Read / Write
-  "home-only"                gboolean              : Read / Write
-  "network-id"               gchar*                : Read / Write
-  "network-type"             gint                  : Read / Write / Construct
-  "number"                   gchar*                : Read / Write
-  "password"                 gchar*                : Read / Write
-  "password-flags"           guint                 : Read / Write
-  "pin"                      gchar*                : Read / Write
-  "pin-flags"                guint                 : Read / Write
-  "username"                 gchar*                : Read / Write
+
Includes

+
#include <nm-setting-gsm.h>
 

 

 

 
Description

-

-The NMSettingGsm object is a NMSetting subclass that describes
+
The NMSettingGsm object is a NMSetting subclass that describes
 properties that allow connections to 3GPP-based mobile broadband
-networks, including those using GPRS/EDGE and UMTS/HSPA technology.
-

+networks, including those using GPRS/EDGE and UMTS/HSPA technology.

+

+

+
Functions

+

+
nm_setting_gsm_error_quark ()

+
GQuark
+nm_setting_gsm_error_quark (void);

+
Registers an error quark for NMSettingGsm if necessary.

+

+
Returns

+
 the error quark used for NMSettingGsm errors.

+

+

+

+

+

+
nm_setting_gsm_new ()

+
NMSetting *
+nm_setting_gsm_new (void);

+
Creates a new NMSettingGsm object with default values.

+

+
Returns

+
 the new empty NMSettingGsm object

+

+

+

+

+

+
nm_setting_gsm_get_number ()

+
const char *
+nm_setting_gsm_get_number (NMSettingGsm *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingGsm
 

+

+

+
Returns

+
 the “number” property of the setting

+

+

+

+

+

+
nm_setting_gsm_get_username ()

+
const char *
+nm_setting_gsm_get_username (NMSettingGsm *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingGsm
 

+

+

+
Returns

+
 the “username” property of the setting

+

+

+

+

+

+
nm_setting_gsm_get_password ()

+
const char *
+nm_setting_gsm_get_password (NMSettingGsm *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingGsm
 

+

+

+
Returns

+
 the “password” property of the setting

+

+

+

+

+

+
nm_setting_gsm_get_apn ()

+
const char *
+nm_setting_gsm_get_apn (NMSettingGsm *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingGsm
 

+

+

+
Returns

+
 the “apn” property of the setting

+

+

+

+

+

+
nm_setting_gsm_get_network_id ()

+
const char *
+nm_setting_gsm_get_network_id (NMSettingGsm *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingGsm
 

+

+

+
Returns

+
 the “network-id” property of the setting

+

+

+

+

+

+
nm_setting_gsm_get_network_type ()

+
int
+nm_setting_gsm_get_network_type (NMSettingGsm *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingGsm
 

+

+

+
Returns

+
 the “network-type” property of the setting

+

+

+

+

+

+
nm_setting_gsm_get_allowed_bands ()

+
guint32
+nm_setting_gsm_get_allowed_bands (NMSettingGsm *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingGsm
 

+

+

+
Returns

+
 the “allowed-bands” property of the setting

+

+

+

+

+

+
nm_setting_gsm_get_pin ()

+
const char *
+nm_setting_gsm_get_pin (NMSettingGsm *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingGsm
 

+

+

+
Returns

+
 the “pin” property of the setting

+

+

+

+

+

+
nm_setting_gsm_get_home_only ()

+
gboolean
+nm_setting_gsm_get_home_only (NMSettingGsm *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingGsm
 

+

+

+
Returns

+
 the “home-only” property of the setting

+

+

+

+

+

+
nm_setting_gsm_get_pin_flags ()

+
NMSettingSecretFlags
+nm_setting_gsm_get_pin_flags (NMSettingGsm *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingGsm
 

+

+

+
Returns

+
 the NMSettingSecretFlags pertaining to the “pin”

+

+

+

+

+

+
nm_setting_gsm_get_password_flags ()

+
NMSettingSecretFlags
+nm_setting_gsm_get_password_flags (NMSettingGsm *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingGsm
 

+

+

+
Returns

+
 the NMSettingSecretFlags pertaining to the “password”

+

+

+

 

 

-
Details

+
Types and Values

 

 
NM_SETTING_GSM_SETTING_NAME

 
#define NM_SETTING_GSM_SETTING_NAME "gsm"
@@ -132,45 +635,50 @@ networks, including those using GPRS/EDGE and UMTS/HSPA technology.
 

 

 

-
enum NMSettingGsmError

-
typedef enum {
-	NM_SETTING_GSM_ERROR_UNKNOWN = 0,           /*< nick=UnknownError >*/
-	NM_SETTING_GSM_ERROR_INVALID_PROPERTY,      /*< nick=InvalidProperty >*/
-	NM_SETTING_GSM_ERROR_MISSING_PROPERTY,      /*< nick=MissingProperty >*/
-	NM_SETTING_GSM_ERROR_MISSING_SERIAL_SETTING /*< nick=MissingSerialSetting >*/
-} NMSettingGsmError;
-

-

+
enum NMSettingGsmError

+

+
Members

+
--+++
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+

 





 
 
 
NM_SETTING_GSM_ERROR_UNKNOWN
unknown or unclassified error
+
NM_SETTING_GSM_ERROR_UNKNOWN

+
unknown or unclassified error

 		 
 

 
NM_SETTING_GSM_ERROR_INVALID_PROPERTY
the property was invalid
+
NM_SETTING_GSM_ERROR_INVALID_PROPERTY

+
the property was invalid

 		 
 

 
NM_SETTING_GSM_ERROR_MISSING_PROPERTY
the property was missing and is
-required
+
NM_SETTING_GSM_ERROR_MISSING_PROPERTY

+
the property was missing and is
+required

 		 
 

 
NM_SETTING_GSM_ERROR_MISSING_SERIAL_SETTING
the required NMSettingSerial
-is missing in the connection
+
NM_SETTING_GSM_ERROR_MISSING_SERIAL_SETTING

+
the required NMSettingSerial
+is missing in the connection

 		 
 

 
 

 

+

 

 

 
NM_SETTING_GSM_ERROR

@@ -181,24 +689,6 @@ is missing in the connection
 

 

 

-
nm_setting_gsm_error_quark ()

-
GQuark              nm_setting_gsm_error_quark          (void);

-

-Registers an error quark for NMSettingGsm if necessary.
-

-

----
-
-
-
-
-




Returns :
the error quark used for NMSettingGsm errors.

-

-

-

 
NM_SETTING_GSM_NUMBER

 
#define NM_SETTING_GSM_NUMBER         "number"
 

@@ -287,599 +777,298 @@ Registers an error quark for 
-
enum NMSettingGsmNetworkType

-
typedef enum {
-	NM_SETTING_GSM_NETWORK_TYPE_ANY = -1,
-	NM_SETTING_GSM_NETWORK_TYPE_UMTS_HSPA = 0,
-	NM_SETTING_GSM_NETWORK_TYPE_GPRS_EDGE = 1,
-	NM_SETTING_GSM_NETWORK_TYPE_PREFER_UMTS_HSPA = 2,
-	NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE = 3,
-	NM_SETTING_GSM_NETWORK_TYPE_PREFER_4G = 4,
-	NM_SETTING_GSM_NETWORK_TYPE_4G = 5
-} NMSettingGsmNetworkType;
-

-

-NMSettingGsmNetworkType values indicate the allowed access technologies
-the device may use when connecting to this network.
-

-

+
enum NMSettingGsmNetworkType

+
NMSettingGsmNetworkType values indicate the allowed access technologies
+the device may use when connecting to this network.

+

+
Members

+
--+++
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+

 





 
 
 
NM_SETTING_GSM_NETWORK_TYPE_ANY
any access technology may be used
+
NM_SETTING_GSM_NETWORK_TYPE_ANY

+
any access technology may be used

 		 
 

 
NM_SETTING_GSM_NETWORK_TYPE_UMTS_HSPA
only 3G-type (UMTS and HSPA)
-technologies may be used
+
NM_SETTING_GSM_NETWORK_TYPE_UMTS_HSPA

+
only 3G-type (UMTS and HSPA)
+technologies may be used

 		 
 

 
NM_SETTING_GSM_NETWORK_TYPE_GPRS_EDGE
only 2G-type (GPRS and EDGE)
-technologies may be used
+
NM_SETTING_GSM_NETWORK_TYPE_GPRS_EDGE

+
only 2G-type (GPRS and EDGE)
+technologies may be used

 		 
 

 
NM_SETTING_GSM_NETWORK_TYPE_PREFER_UMTS_HSPA
3G-type technologies are
-preferred but 2G-type technologies may be used as a fallback
+
NM_SETTING_GSM_NETWORK_TYPE_PREFER_UMTS_HSPA

+
3G-type technologies are
+preferred but 2G-type technologies may be used as a fallback

 		 
 

 
NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE
2G-type technologies are
-preferred but 3G-type technologies may be used as a fallback
+
NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE

+
2G-type technologies are
+preferred but 3G-type technologies may be used as a fallback

 		 
 

 
NM_SETTING_GSM_NETWORK_TYPE_PREFER_4G
4G/LTE-type technologies are
-preferred but 3G/2/-type technologies may be used as a fallback
+
NM_SETTING_GSM_NETWORK_TYPE_PREFER_4G

+
4G/LTE-type technologies are
+preferred but 3G/2/-type technologies may be used as a fallback

 		 
 

 
NM_SETTING_GSM_NETWORK_TYPE_4G
only 4G/LTE type
-technologies may be used
+
NM_SETTING_GSM_NETWORK_TYPE_4G

+
only 4G/LTE type
+technologies may be used

 		 
 

 
 

 

+

 

 

-
enum NMSettingGsmNetworkBand

-
typedef enum {
-	NM_SETTING_GSM_BAND_UNKNOWN      = 0x00000000,
-	NM_SETTING_GSM_BAND_ANY          = 0x00000001,
-	NM_SETTING_GSM_BAND_EGSM         = 0x00000002, /*  900 MHz */
-	NM_SETTING_GSM_BAND_DCS          = 0x00000004, /* 1800 MHz */
-	NM_SETTING_GSM_BAND_PCS          = 0x00000008, /* 1900 MHz */
-	NM_SETTING_GSM_BAND_G850         = 0x00000010, /*  850 MHz */
-	NM_SETTING_GSM_BAND_U2100        = 0x00000020, /* WCDMA 3GPP UMTS 2100 MHz     (Class I) */
-	NM_SETTING_GSM_BAND_U1800        = 0x00000040, /* WCDMA 3GPP UMTS 1800 MHz     (Class III) */
-	NM_SETTING_GSM_BAND_U17IV        = 0x00000080, /* WCDMA 3GPP AWS 1700/2100 MHz (Class IV) */
-	NM_SETTING_GSM_BAND_U800         = 0x00000100, /* WCDMA 3GPP UMTS 800 MHz      (Class VI) */
-	NM_SETTING_GSM_BAND_U850         = 0x00000200, /* WCDMA 3GPP UMTS 850 MHz      (Class V) */
-	NM_SETTING_GSM_BAND_U900         = 0x00000400, /* WCDMA 3GPP UMTS 900 MHz      (Class VIII) */
-	NM_SETTING_GSM_BAND_U17IX        = 0x00000800, /* WCDMA 3GPP UMTS 1700 MHz     (Class IX) */
-	NM_SETTING_GSM_BAND_U1900        = 0x00001000, /* WCDMA 3GPP UMTS 1900 MHz     (Class II) */
-	NM_SETTING_GSM_BAND_U2600        = 0x00002000, /* WCDMA 3GPP UMTS 2600 MHz     (Class VII, internal) */
-} NMSettingGsmNetworkBand;
-

-

-NMSettingGsmNetworkBand values indicate the allowed frequency bands
-the device may use when connecting to this network.
-

-

+
enum NMSettingGsmNetworkBand

+
NMSettingGsmNetworkBand values indicate the allowed frequency bands
+the device may use when connecting to this network.

+

+
Members

+
--+++
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

 





 
 
 
NM_SETTING_GSM_BAND_UNKNOWN
unknown or no band specified
-
NM_SETTING_GSM_BAND_ANY
any band is allowed
-
NM_SETTING_GSM_BAND_EGSM
900 MHz original GSM band
-
NM_SETTING_GSM_BAND_DCS
1800 MHz DCS band
-
NM_SETTING_GSM_BAND_PCS
US 1900 MHz PCS band
-
NM_SETTING_GSM_BAND_G850
US 850 MHz Cellular band
+
NM_SETTING_GSM_BAND_UNKNOWN

+
unknown or no band specified

 		 
 

 
NM_SETTING_GSM_BAND_U2100
WCDMA 3GPP UMTS 2100 MHz (Class I)
+
NM_SETTING_GSM_BAND_ANY

+
any band is allowed

 		 
 

 
NM_SETTING_GSM_BAND_U1800
WCDMA 3GPP UMTS 1800 MHz (Class III)
+
NM_SETTING_GSM_BAND_EGSM

+
900 MHz original GSM band

 		 
 

 
NM_SETTING_GSM_BAND_U17IV
WCDMA 3GPP AWS 1700/2100 MHz (Class IV)
+
NM_SETTING_GSM_BAND_DCS

+
1800 MHz DCS band

 		 
 

 
NM_SETTING_GSM_BAND_U800
WCDMA 3GPP UMTS 800 MHz (Class VI)
+
NM_SETTING_GSM_BAND_PCS

+
US 1900 MHz PCS band

 		 
 

 
NM_SETTING_GSM_BAND_U850
WCDMA 3GPP UMTS 850 MHz (Class V)
-
NM_SETTING_GSM_BAND_U900
WCDMA 3GPP UMTS 900 MHz (Class VIII)
-
NM_SETTING_GSM_BAND_U17IX
WCDMA 3GPP UMTS 1700 MHz (Class IX)
-
NM_SETTING_GSM_BAND_U1900
WCDMA 3GPP UMTS 1900 MHz (Class II)
-
NM_SETTING_GSM_BAND_U2600
WCDMA 3GPP UMTS 2600 MHz (Class VII, internal)
-

-

-

-

-
NMSettingGsm

-
typedef struct _NMSettingGsm NMSettingGsm;

-

-

-

-

-

-
NMSettingGsmClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingGsmClass;
-

-

-

-

-

-

-
nm_setting_gsm_new ()

-
NMSetting *         nm_setting_gsm_new                  (void);

-

-Creates a new NMSettingGsm object with default values.
-

-

----
-
-
-
-
-




Returns :
the new empty NMSettingGsm object

-

-

-

-
nm_setting_gsm_get_number ()

-
const char *        nm_setting_gsm_get_number           (NMSettingGsm *setting);

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingGsm
-
Returns :
the "number" property of the setting

-

-

-

-
nm_setting_gsm_get_username ()

-
const char *        nm_setting_gsm_get_username         (NMSettingGsm *setting);

-

----
-
-
-
-
+
+
-
-
-
-
-




setting :
the NMSettingGsm
+
NM_SETTING_GSM_BAND_G850

+
US 850 MHz Cellular band

 		 
 

 
Returns :
the "username" property of the setting

-

-

-

-
nm_setting_gsm_get_password ()

-
const char *        nm_setting_gsm_get_password         (NMSettingGsm *setting);

-

----
-
-
-
-
+
+
-
-
-
-
-




setting :
the NMSettingGsm
+
NM_SETTING_GSM_BAND_U2100

+
WCDMA 3GPP UMTS 2100 MHz (Class I)

 		 
 

 
Returns :
the "password" property of the setting

-

-

-

-
nm_setting_gsm_get_apn ()

-
const char *        nm_setting_gsm_get_apn              (NMSettingGsm *setting);

-

----
-
-
-
-
+
+
-
-
-
-
-




setting :
the NMSettingGsm
+
NM_SETTING_GSM_BAND_U1800

+
WCDMA 3GPP UMTS 1800 MHz (Class III)

 		 
 

 
Returns :
the "apn" property of the setting

-

-

-

-
nm_setting_gsm_get_network_id ()

-
const char *        nm_setting_gsm_get_network_id       (NMSettingGsm *setting);

-

----
-
-
-
-
+
+
-
-
-
-
-




setting :
the NMSettingGsm
+
NM_SETTING_GSM_BAND_U17IV

+
WCDMA 3GPP AWS 1700/2100 MHz (Class IV)

 		 
 

 
Returns :
the "network-id" property of the setting

-

-

-

-
nm_setting_gsm_get_network_type ()

-
int                 nm_setting_gsm_get_network_type     (NMSettingGsm *setting);

-

----
-
-
-
-
+
+
-
-
-
-
-




setting :
the NMSettingGsm
+
NM_SETTING_GSM_BAND_U800

+
WCDMA 3GPP UMTS 800 MHz (Class VI)

 		 
 

 
Returns :
the "network-type" property of the setting

-

-

-

-
nm_setting_gsm_get_allowed_bands ()

-
guint32             nm_setting_gsm_get_allowed_bands    (NMSettingGsm *setting);

-

----
-
-
-
-
+
+
-
-
-
-
-




setting :
the NMSettingGsm
+
NM_SETTING_GSM_BAND_U850

+
WCDMA 3GPP UMTS 850 MHz (Class V)

 		 
 

 
Returns :
the "allowed-bands" property of the setting

-

-

-

-
nm_setting_gsm_get_pin ()

-
const char *        nm_setting_gsm_get_pin              (NMSettingGsm *setting);

-

----
-
-
-
-
+
+
-
-
-
-
-




setting :
the NMSettingGsm
+
NM_SETTING_GSM_BAND_U900

+
WCDMA 3GPP UMTS 900 MHz (Class VIII)

 		 
 

 
Returns :
the "pin" property of the setting

-

-

-

-
nm_setting_gsm_get_home_only ()

-
gboolean            nm_setting_gsm_get_home_only        (NMSettingGsm *setting);

-

----
-
-
-
-
+
+
-
-
-
-
-




setting :
the NMSettingGsm
+
NM_SETTING_GSM_BAND_U17IX

+
WCDMA 3GPP UMTS 1700 MHz (Class IX)

 		 
 

 
Returns :
the "home-only" property of the setting

-

-

-

-
nm_setting_gsm_get_pin_flags ()

-
NMSettingSecretFlags nm_setting_gsm_get_pin_flags       (NMSettingGsm *setting);

-

----
-
-
-
-
+
+
-
-
+
+




setting :
the NMSettingGsm
+
NM_SETTING_GSM_BAND_U1900

+
WCDMA 3GPP UMTS 1900 MHz (Class II)

 		 
 

 
Returns :
the NMSettingSecretFlags pertaining to the "pin"
+
NM_SETTING_GSM_BAND_U2600

+
WCDMA 3GPP UMTS 2600 MHz (Class VII, internal)

 		 
 

 
 

 

-

-

-
nm_setting_gsm_get_password_flags ()

-
NMSettingSecretFlags nm_setting_gsm_get_password_flags  (NMSettingGsm *setting);

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingGsm
-
Returns :
the NMSettingSecretFlags pertaining to the "password"
-

 

 

 

 
Property Details

 

-
The "allowed-bands" property

-
  "allowed-bands"            guint                 : Read / Write / Construct

-

-Bitfield of allowed frequency bands.  Note that not all devices allow
-frequency band control.  Permitted values are those specified by
-NMSettingGsmNetworkBand.
-

+
The “allowed-bands” property

+
  “allowed-bands”            guint

+
Bitfield of allowed frequency bands.  Note that not all devices allow frequency band control.

+
Flags: Read / Write / Construct

 
Allowed values: <= 16383

 
Default value: 1

 

 

 

-
The "apn" property

-
  "apn"                      gchar*                : Read / Write

-

-The GPRS Access Point Name specifying the APN used when establishing a
-data session with the GSM-based network.  The APN often determines how
-the user will be billed for their network usage and whether the user has
-access to the Internet or just a provider-specific walled-garden, so it
-is important to use the correct APN for the user's mobile broadband plan.
-The APN may only be composed of the characters a-z, 0-9, ., and - per
-GSM 03.60 Section 14.9.
-

+
The “apn” property

+
  “apn”                      gchar *

+
The GPRS Access Point Name specifying the APN used when establishing a data session with the GSM-based network.  The APN often determines how the user will be billed for their network usage and whether the user has access to the Internet or just a provider-specific walled-garden, so it is important to use the correct APN for the user's mobile broadband plan.  The APN may only be composed of the characters a-z, 0-9, ., and - per GSM 03.60 Section 14.9.

+
Flags: Read / Write

 
Default value: NULL

 

 

 

-
The "home-only" property

-
  "home-only"                gboolean              : Read / Write

-

-When TRUE, only connections to the home network will be allowed.
-Connections to roaming networks will not be made.
-

+
The “home-only” property

+
  “home-only”                gboolean

+
When TRUE, only connections to the home network will be allowed.  Connections to roaming networks will not be made.

+
Flags: Read / Write

 
Default value: FALSE

 

 

 

-
The "network-id" property

-
  "network-id"               gchar*                : Read / Write

-

-The Network ID (GSM LAI format, ie MCC-MNC) to force specific network
-registration.  If the Network ID is specified, NetworkManager will
-attempt to force the device to register only on the specified network.
-This can be used to ensure that the device does not roam when direct
-roaming control of the device is not otherwise possible.
-

+
The “network-id” property

+
  “network-id”               gchar *

+
The Network ID (GSM LAI format, ie MCC-MNC) to force specific network registration.  If the Network ID is specified, NetworkManager will attempt to force the device to register only on the specified network.  This can be used to ensure that the device does not roam when direct roaming control of the device is not otherwise possible.

+
Flags: Read / Write

 
Default value: NULL

 

 

 

-
The "network-type" property

-
  "network-type"             gint                  : Read / Write / Construct

-

-Network preference to force the device to only use specific network
-technologies.  Permitted values are those specified by
-NMSettingGsmNetworkType.  Note that not all devices allow network
-preference control.
-

+
The “network-type” property

+
  “network-type”             gint

+
Network preference to force the device to only use specific network technologies.  The permitted values are: -1: any, 0: 3G only, 1: GPRS/EDGE only, 2: prefer 3G, 3: prefer 2G, 4: prefer 4G/LTE, 5: 4G/LTE only. Note that not all devices allow network preference control.

+
Flags: Read / Write / Construct

 
Allowed values: [-1,5]

 
Default value: -1

 

 

 

-
The "number" property

-
  "number"                   gchar*                : Read / Write

-

-Number to dial when establishing a PPP data session with the GSM-based
-mobile broadband network.  Many modems do not require PPP for connections
-to the mobile network and thus this property should be left blank, which
-allows NetworkManager to select the appropriate settings automatically.
-

+
The “number” property

+
  “number”                   gchar *

+
Number to dial when establishing a PPP data session with the GSM-based mobile broadband network.  Many modems do not require PPP for connections to the mobile network and thus this property should be left blank, which allows NetworkManager to select the appropriate settings automatically.

+
Flags: Read / Write

 
Default value: NULL

 

 

 

-
The "password" property

-
  "password"                 gchar*                : Read / Write

-

-The password used to authenticate with the network, if required.  Many
-providers do not require a password, or accept any password.  But if a
-password is required, it is specified here.
-

+
The “password” property

+
  “password”                 gchar *

+
Password used to authenticate with the network, if required.  Note that many providers do not require a password or accept any password.

+
Flags: Read / Write

 
Default value: NULL

 

 

 

-
The "password-flags" property

-
  "password-flags"           guint                 : Read / Write

-

-Flags indicating how to handle "password":.
-

+
The “password-flags” property

+
  “password-flags”           guint

+
Flags indicating how to handle the GSM password.

+
Flags: Read / Write

 
Allowed values: <= 7

 
Default value: 0

 

 

 

-
The "pin" property

-
  "pin"                      gchar*                : Read / Write

-

-If the SIM is locked with a PIN it must be unlocked before any other
-operations are requested.  Specify the PIN here to allow operation of
-the device.
-

+
The “pin” property

+
  “pin”                      gchar *

+
If the SIM is locked with a PIN it must be unlocked before any other operations are requested.  Specify the PIN here to allow operation of the device.

+
Flags: Read / Write

 
Default value: NULL

 

 

 

-
The "pin-flags" property

-
  "pin-flags"                guint                 : Read / Write

-

-Flags indicating how to handle "pin".
-

+
The “pin-flags” property

+
  “pin-flags”                guint

+
Flags indicating how to handle the GSM SIM PIN.

+
Flags: Read / Write

 
Allowed values: <= 7

 
Default value: 0

 

 

 

-
The "username" property

-
  "username"                 gchar*                : Read / Write

-

-The username used to authenticate with the network, if required.  Many
-providers do not require a username, or accept any username.  But if a
-username is required, it is specified here.
-

+
The “username” property

+
  “username”                 gchar *

+
Username used to authenticate with the network, if required.  Note that many providers do not require a username or accept any username.

+
Flags: Read / Write

 
Default value: NULL

 

 

 
 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.20
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingIP4Config.html b/docs/libnm-util/html/NMSettingIP4Config.html
index 7e40149b..d177f3d5 100644
--- a/docs/libnm-util/html/NMSettingIP4Config.html
+++ b/docs/libnm-util/html/NMSettingIP4Config.html
@@ -2,34 +2,28 @@
 
 
 
-NMSettingIP4Config
+libnm-util Reference Manual: NMSettingIP4Config
 
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
 

 

 

@@ -37,1947 +31,2449 @@
 
NMSettingIP4Config
NMSettingIP4Config — Describes IPv4 addressing, routing, and name service properties

-
+

 
 
 

-

-
Synopsis

-
-#include <nm-setting-ip4-config.h>
-
-#define             NM_SETTING_IP4_CONFIG_SETTING_NAME
-enum                NMSettingIP4ConfigError;
-#define             NM_SETTING_IP4_CONFIG_ERROR
-GQuark              nm_setting_ip4_config_error_quark   (void);
-#define             NM_SETTING_IP4_CONFIG_METHOD
-#define             NM_SETTING_IP4_CONFIG_DNS
-#define             NM_SETTING_IP4_CONFIG_DNS_SEARCH
-#define             NM_SETTING_IP4_CONFIG_ADDRESSES
-#define             NM_SETTING_IP4_CONFIG_ROUTES
-#define             NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES
-#define             NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS
-#define             NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID
-#define             NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME
-#define             NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME
-#define             NM_SETTING_IP4_CONFIG_NEVER_DEFAULT
-#define             NM_SETTING_IP4_CONFIG_MAY_FAIL
-#define             NM_SETTING_IP4_CONFIG_METHOD_AUTO
-#define             NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL
-#define             NM_SETTING_IP4_CONFIG_METHOD_MANUAL
-#define             NM_SETTING_IP4_CONFIG_METHOD_SHARED
-#define             NM_SETTING_IP4_CONFIG_METHOD_DISABLED
-typedef             NMIP4Address;
-NMIP4Address *      nm_ip4_address_new                  (void);
-NMIP4Address *      nm_ip4_address_dup                  (NMIP4Address *source);
-void                nm_ip4_address_ref                  (NMIP4Address *address);
-void                nm_ip4_address_unref                (NMIP4Address *address);
-gboolean            nm_ip4_address_compare              (NMIP4Address *address,
-                                                         NMIP4Address *other);
-guint32             nm_ip4_address_get_address          (NMIP4Address *address);
-void                nm_ip4_address_set_address          (NMIP4Address *address,
-                                                         guint32 addr);
-guint32             nm_ip4_address_get_prefix           (NMIP4Address *address);
-void                nm_ip4_address_set_prefix           (NMIP4Address *address,
-                                                         guint32 prefix);
-guint32             nm_ip4_address_get_gateway          (NMIP4Address *address);
-void                nm_ip4_address_set_gateway          (NMIP4Address *address,
-                                                         guint32 gateway);
-typedef             NMIP4Route;
-NMIP4Route *        nm_ip4_route_new                    (void);
-NMIP4Route *        nm_ip4_route_dup                    (NMIP4Route *source);
-void                nm_ip4_route_ref                    (NMIP4Route *route);
-void                nm_ip4_route_unref                  (NMIP4Route *route);
-gboolean            nm_ip4_route_compare                (NMIP4Route *route,
-                                                         NMIP4Route *other);
-guint32             nm_ip4_route_get_dest               (NMIP4Route *route);
-void                nm_ip4_route_set_dest               (NMIP4Route *route,
-                                                         guint32 dest);
-guint32             nm_ip4_route_get_prefix             (NMIP4Route *route);
-void                nm_ip4_route_set_prefix             (NMIP4Route *route,
-                                                         guint32 prefix);
-guint32             nm_ip4_route_get_next_hop           (NMIP4Route *route);
-void                nm_ip4_route_set_next_hop           (NMIP4Route *route,
-                                                         guint32 next_hop);
-guint32             nm_ip4_route_get_metric             (NMIP4Route *route);
-void                nm_ip4_route_set_metric             (NMIP4Route *route,
-                                                         guint32 metric);
-                    NMSettingIP4Config;
-                    NMSettingIP4ConfigClass;
-NMSetting *         nm_setting_ip4_config_new           (void);
-const char *        nm_setting_ip4_config_get_method    (NMSettingIP4Config *setting);
-guint32             nm_setting_ip4_config_get_num_dns   (NMSettingIP4Config *setting);
-guint32             nm_setting_ip4_config_get_dns       (NMSettingIP4Config *setting,
-                                                         guint32 i);
-gboolean            nm_setting_ip4_config_add_dns       (NMSettingIP4Config *setting,
-                                                         guint32 dns);
-void                nm_setting_ip4_config_remove_dns    (NMSettingIP4Config *setting,
-                                                         guint32 i);
-void                nm_setting_ip4_config_clear_dns     (NMSettingIP4Config *setting);
-guint32             nm_setting_ip4_config_get_num_dns_searches
-                                                        (NMSettingIP4Config *setting);
-const char *        nm_setting_ip4_config_get_dns_search
-                                                        (NMSettingIP4Config *setting,
-                                                         guint32 i);
-gboolean            nm_setting_ip4_config_add_dns_search
-                                                        (NMSettingIP4Config *setting,
-                                                         const char *dns_search);
-void                nm_setting_ip4_config_remove_dns_search
-                                                        (NMSettingIP4Config *setting,
-                                                         guint32 i);
-void                nm_setting_ip4_config_clear_dns_searches
-                                                        (NMSettingIP4Config *setting);
-guint32             nm_setting_ip4_config_get_num_addresses
-                                                        (NMSettingIP4Config *setting);
-NMIP4Address *      nm_setting_ip4_config_get_address   (NMSettingIP4Config *setting,
-                                                         guint32 i);
-gboolean            nm_setting_ip4_config_add_address   (NMSettingIP4Config *setting,
-                                                         NMIP4Address *address);
-void                nm_setting_ip4_config_remove_address
-                                                        (NMSettingIP4Config *setting,
-                                                         guint32 i);
-void                nm_setting_ip4_config_clear_addresses
-                                                        (NMSettingIP4Config *setting);
-guint32             nm_setting_ip4_config_get_num_routes
-                                                        (NMSettingIP4Config *setting);
-NMIP4Route *        nm_setting_ip4_config_get_route     (NMSettingIP4Config *setting,
-                                                         guint32 i);
-gboolean            nm_setting_ip4_config_add_route     (NMSettingIP4Config *setting,
-                                                         NMIP4Route *route);
-void                nm_setting_ip4_config_remove_route  (NMSettingIP4Config *setting,
-                                                         guint32 i);
-void                nm_setting_ip4_config_clear_routes  (NMSettingIP4Config *setting);
-gboolean            nm_setting_ip4_config_get_ignore_auto_routes
-                                                        (NMSettingIP4Config *setting);
-gboolean            nm_setting_ip4_config_get_ignore_auto_dns
-                                                        (NMSettingIP4Config *setting);
-const char *        nm_setting_ip4_config_get_dhcp_client_id
-                                                        (NMSettingIP4Config *setting);
-gboolean            nm_setting_ip4_config_get_dhcp_send_hostname
-                                                        (NMSettingIP4Config *setting);
-const char *        nm_setting_ip4_config_get_dhcp_hostname
-                                                        (NMSettingIP4Config *setting);
-gboolean            nm_setting_ip4_config_get_never_default
-                                                        (NMSettingIP4Config *setting);
-gboolean            nm_setting_ip4_config_get_may_fail  (NMSettingIP4Config *setting);
-

-

 

-
Object Hierarchy

-
-  GEnum
-   +----NMSettingIP4ConfigError
-

-
-  GBoxed
-   +----NMIP4Address
-

-
-  GBoxed
-   +----NMIP4Route
-

-
-  GObject
-   +----NMSetting
-         +----NMSettingIP4Config
-

+
Functions

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





+GQuark
+
+nm_setting_ip4_config_error_quark ()
+

+NMIP4Address *
+
+nm_ip4_address_new ()
+

+NMIP4Address *
+
+nm_ip4_address_dup ()
+

+void
+
+nm_ip4_address_ref ()
+

+void
+
+nm_ip4_address_unref ()
+

+gboolean
+
+nm_ip4_address_compare ()
+

+guint32
+
+nm_ip4_address_get_address ()
+

+void
+
+nm_ip4_address_set_address ()
+

+guint32
+
+nm_ip4_address_get_prefix ()
+

+void
+
+nm_ip4_address_set_prefix ()
+

+guint32
+
+nm_ip4_address_get_gateway ()
+

+void
+
+nm_ip4_address_set_gateway ()
+

+NMIP4Route *
+
+nm_ip4_route_new ()
+

+NMIP4Route *
+
+nm_ip4_route_dup ()
+

+void
+
+nm_ip4_route_ref ()
+

+void
+
+nm_ip4_route_unref ()
+

+gboolean
+
+nm_ip4_route_compare ()
+

+guint32
+
+nm_ip4_route_get_dest ()
+

+void
+
+nm_ip4_route_set_dest ()
+

+guint32
+
+nm_ip4_route_get_prefix ()
+

+void
+
+nm_ip4_route_set_prefix ()
+

+guint32
+
+nm_ip4_route_get_next_hop ()
+

+void
+
+nm_ip4_route_set_next_hop ()
+

+guint32
+
+nm_ip4_route_get_metric ()
+

+void
+
+nm_ip4_route_set_metric ()
+

+NMSetting *
+
+nm_setting_ip4_config_new ()
+
const char *
+
+nm_setting_ip4_config_get_method ()
+

+guint32
+
+nm_setting_ip4_config_get_num_dns ()
+

+guint32
+
+nm_setting_ip4_config_get_dns ()
+

+gboolean
+
+nm_setting_ip4_config_add_dns ()
+

+void
+
+nm_setting_ip4_config_remove_dns ()
+

+void
+
+nm_setting_ip4_config_clear_dns ()
+

+guint32
+
+nm_setting_ip4_config_get_num_dns_searches ()
+
const char *
+
+nm_setting_ip4_config_get_dns_search ()
+

+gboolean
+
+nm_setting_ip4_config_add_dns_search ()
+

+void
+
+nm_setting_ip4_config_remove_dns_search ()
+

+void
+
+nm_setting_ip4_config_clear_dns_searches ()
+

+guint32
+
+nm_setting_ip4_config_get_num_addresses ()
+

+NMIP4Address *
+
+nm_setting_ip4_config_get_address ()
+

+gboolean
+
+nm_setting_ip4_config_add_address ()
+

+void
+
+nm_setting_ip4_config_remove_address ()
+

+void
+
+nm_setting_ip4_config_clear_addresses ()
+

+guint32
+
+nm_setting_ip4_config_get_num_routes ()
+

+NMIP4Route *
+
+nm_setting_ip4_config_get_route ()
+

+gboolean
+
+nm_setting_ip4_config_add_route ()
+

+void
+
+nm_setting_ip4_config_remove_route ()
+

+void
+
+nm_setting_ip4_config_clear_routes ()
+

+gboolean
+
+nm_setting_ip4_config_get_ignore_auto_routes ()
+

+gboolean
+
+nm_setting_ip4_config_get_ignore_auto_dns ()
+
const char *
+
+nm_setting_ip4_config_get_dhcp_client_id ()
+

+gboolean
+
+nm_setting_ip4_config_get_dhcp_send_hostname ()
+
const char *
+
+nm_setting_ip4_config_get_dhcp_hostname ()
+

+gboolean
+
+nm_setting_ip4_config_get_never_default ()
+

+gboolean
+
+nm_setting_ip4_config_get_may_fail ()
+

 

 

 
Properties

-
-  "addresses"                GPtrArray_GArray_guint__*  : Read / Write
-  "dhcp-client-id"           gchar*                : Read / Write
-  "dhcp-hostname"            gchar*                : Read / Write
-  "dhcp-send-hostname"       gboolean              : Read / Write / Construct
-  "dns"                      GArray_guint_*        : Read / Write
-  "dns-search"               GSList_gchararray_*   : Read / Write
-  "ignore-auto-dns"          gboolean              : Read / Write / Construct
-  "ignore-auto-routes"       gboolean              : Read / Write / Construct
-  "may-fail"                 gboolean              : Read / Write / Construct
-  "method"                   gchar*                : Read / Write
-  "never-default"            gboolean              : Read / Write / Construct
-  "routes"                   GPtrArray_GArray_guint__*  : Read / Write
-

-

-

-
Description

-

-The NMSettingIP4Config object is a NMSetting subclass that describes
-properties related to IPv4 addressing, routing, and Domain Name Service
-

-

-

-
Details

-

-
NM_SETTING_IP4_CONFIG_SETTING_NAME

-
#define NM_SETTING_IP4_CONFIG_SETTING_NAME "ipv4"
-

-

-

+

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+






+GPtrArray_GArray_guint__ *addressesRead / Write

+gchar *dhcp-client-idRead / Write

+gchar *dhcp-hostnameRead / Write
gbooleandhcp-send-hostnameRead / Write / Construct

+GArray_guint_ *dnsRead / Write

+GSList_gchararray_ *dns-searchRead / Write
gbooleanignore-auto-dnsRead / Write / Construct
gbooleanignore-auto-routesRead / Write / Construct
gbooleanmay-failRead / Write / Construct

+gchar *methodRead / Write
gbooleannever-defaultRead / Write / Construct

+GPtrArray_GArray_guint__ *routesRead / Write

 

-

-

-
enum NMSettingIP4ConfigError

-
typedef enum {
-	NM_SETTING_IP4_CONFIG_ERROR_UNKNOWN = 0,           /*< nick=UnknownError >*/
-	NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY,      /*< nick=InvalidProperty >*/
-	NM_SETTING_IP4_CONFIG_ERROR_MISSING_PROPERTY,      /*< nick=MissingProperty >*/
-	NM_SETTING_IP4_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD /*< nick=NotAllowedForMethod >*/
-} NMSettingIP4ConfigError;
-

-

+

+
Types and Values

+
--++
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+

 




 
 
 
NM_SETTING_IP4_CONFIG_ERROR_UNKNOWN
unknown or unclassified error
-#defineNM_SETTING_IP4_CONFIG_SETTING_NAME
enumNMSettingIP4ConfigError
#defineNM_SETTING_IP4_CONFIG_ERROR
#defineNM_SETTING_IP4_CONFIG_METHOD
#defineNM_SETTING_IP4_CONFIG_DNS
#defineNM_SETTING_IP4_CONFIG_DNS_SEARCH
#defineNM_SETTING_IP4_CONFIG_ADDRESSES
#defineNM_SETTING_IP4_CONFIG_ROUTES
#defineNM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES
#defineNM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS
#defineNM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID
#defineNM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME
#defineNM_SETTING_IP4_CONFIG_DHCP_HOSTNAME
#defineNM_SETTING_IP4_CONFIG_NEVER_DEFAULT
 

 
NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY
the property was invalid
-#defineNM_SETTING_IP4_CONFIG_MAY_FAIL
 

 
NM_SETTING_IP4_CONFIG_ERROR_MISSING_PROPERTY
the property was missing and is
-required
-#defineNM_SETTING_IP4_CONFIG_METHOD_AUTO
 

 
NM_SETTING_IP4_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD
the property's value is
-not valid with the given IP4 method
-#defineNM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL
#defineNM_SETTING_IP4_CONFIG_METHOD_MANUAL
#defineNM_SETTING_IP4_CONFIG_METHOD_SHARED
#defineNM_SETTING_IP4_CONFIG_METHOD_DISABLED
 

 
 

 

-

-

-
NM_SETTING_IP4_CONFIG_ERROR

-
#define NM_SETTING_IP4_CONFIG_ERROR nm_setting_ip4_config_error_quark ()
-

-

-

-

-

-

-
nm_setting_ip4_config_error_quark ()

-
GQuark              nm_setting_ip4_config_error_quark   (void);

-

-Registers an error quark for NMSettingIP4Config if necessary.
-

-

----
-
-
-
-
-




Returns :
the error quark used for NMSettingIP4Config errors.

-

-

-

-
NM_SETTING_IP4_CONFIG_METHOD

-
#define NM_SETTING_IP4_CONFIG_METHOD             "method"
-

-

-

-

-

-

-
NM_SETTING_IP4_CONFIG_DNS

-
#define NM_SETTING_IP4_CONFIG_DNS                "dns"
-

-

-

-

-

-

-
NM_SETTING_IP4_CONFIG_DNS_SEARCH

-
#define NM_SETTING_IP4_CONFIG_DNS_SEARCH         "dns-search"
-

-

-

-

-

-

-
NM_SETTING_IP4_CONFIG_ADDRESSES

-
#define NM_SETTING_IP4_CONFIG_ADDRESSES          "addresses"
-

-

-

-

-

-

-
NM_SETTING_IP4_CONFIG_ROUTES

-
#define NM_SETTING_IP4_CONFIG_ROUTES             "routes"
-

-

-

-

-

-

-
NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES

-
#define NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES "ignore-auto-routes"
-

-

-

-

-

-

-
NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS

-
#define NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS    "ignore-auto-dns"
-

-

-

-

-

-

-
NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID

-
#define NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID     "dhcp-client-id"
-

-

-

-

-

-

-
NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME

-
#define NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME "dhcp-send-hostname"
-

-

-

-

-

-

-
NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME

-
#define NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME      "dhcp-hostname"
-

-

-

-

-

-

-
NM_SETTING_IP4_CONFIG_NEVER_DEFAULT

-
#define NM_SETTING_IP4_CONFIG_NEVER_DEFAULT      "never-default"
-

-

-

-

-

-

-
NM_SETTING_IP4_CONFIG_MAY_FAIL

-
#define NM_SETTING_IP4_CONFIG_MAY_FAIL           "may-fail"
+

+
Object Hierarchy

+
    GBoxed
+    ├── NMIP4Address
+    ╰── NMIP4Route
+    GEnum
+    ╰── NMSettingIP4ConfigError
+    GObject
+    ╰── NMSetting
+        ╰── NMSettingIP4Config
 

-

-

 

-

-

-
NM_SETTING_IP4_CONFIG_METHOD_AUTO

-
#define NM_SETTING_IP4_CONFIG_METHOD_AUTO       "auto"
+

+
Includes

+
#include <nm-setting-ip4-config.h>
 

-

-IPv4 configuration should be automatically determined via a method appropriate
-for the hardware interface, ie DHCP or PPP or some other device-specific
-manner.
-

 

-

-

-
NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL

-
#define NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL "link-local"
-

-

-IPv4 configuration should be automatically configured for link-local-only
-operation.
-

+

+
Description

+
The NMSettingIP4Config object is a NMSetting subclass that describes
+properties related to IPv4 addressing, routing, and Domain Name Service

 

-

+

+
Functions

 

-
NM_SETTING_IP4_CONFIG_METHOD_MANUAL

-
#define NM_SETTING_IP4_CONFIG_METHOD_MANUAL     "manual"
-

-

-All necessary IPv4 configuration (addresses, prefix, DNS, etc) is specified
-in the setting's properties.
-

+
nm_setting_ip4_config_error_quark ()

+
GQuark
+nm_setting_ip4_config_error_quark (void);

+
Registers an error quark for NMSettingIP4Config if necessary.

+

+
Returns

+
 the error quark used for NMSettingIP4Config errors.

+

 

-

-

-
NM_SETTING_IP4_CONFIG_METHOD_SHARED

-
#define NM_SETTING_IP4_CONFIG_METHOD_SHARED     "shared"
-

-

-This connection specifies configuration that allows other computers to
-connect through it to the default network (usually the Internet).  The
-connection's interface will be assigned a private address, and a DHCP server,
-caching DNS server, and Network Address Translation (NAT) functionality will
-be started on this connection's interface to allow other devices to connect
-through that interface to the default network.
-

 

 

 

-
NM_SETTING_IP4_CONFIG_METHOD_DISABLED

-
#define NM_SETTING_IP4_CONFIG_METHOD_DISABLED   "disabled"
-

-

-This connection does not use or require IPv4 address and it should be disabled.
-

+
nm_ip4_address_new ()

+
NMIP4Address *
+nm_ip4_address_new (void);

+
Creates and returns a new NMIP4Address object.

+

+
Returns

+
 the new empty NMIP4Address object. 

+
[transfer full]

 

-

-

-
NMIP4Address

-
typedef struct NMIP4Address NMIP4Address;
-

-

-

 

 

 

-
nm_ip4_address_new ()

-
NMIP4Address *      nm_ip4_address_new                  (void);

-

-Creates and returns a new NMIP4Address object.
-

-

+
nm_ip4_address_dup ()

+
NMIP4Address *
+nm_ip4_address_dup (NMIP4Address *source);

+
Copies a given NMIP4Address object and returns the copy.

+

+
Parameters

+
--+++
-
-
+
+
+

 





 
 
Returns :
the new empty NMIP4Address object. [transfer full]
-
source
the NMIP4Address object to copy
 
 

 

 

-

-

-
nm_ip4_address_dup ()

-
NMIP4Address *      nm_ip4_address_dup                  (NMIP4Address *source);

-

-Copies a given NMIP4Address object and returns the copy.
-

-

----
-
-
-
-
-
-
-
-
-
-
-




source :
the NMIP4Address object to copy
Returns :
the copy of the given NMIP4Address copy. [transfer full]
-

+

+
Returns

+
 the copy of the given NMIP4Address copy. 

+
[transfer full]

+

 

 

 

-
nm_ip4_address_ref ()

-
void                nm_ip4_address_ref                  (NMIP4Address *address);

-

-Increases the reference count of the object.
-

-

+
nm_ip4_address_ref ()

+
void
+nm_ip4_address_ref (NMIP4Address *address);

+
Increases the reference count of the object.

+

+
Parameters

+
--+++
-
-
+
+
+

 





 
 
address :
the NMIP4Address
-
address
the NMIP4Address
 
 

 

 

+

 

 

-
nm_ip4_address_unref ()

-
void                nm_ip4_address_unref                (NMIP4Address *address);

-

-Decreases the reference count of the object.  If the reference count
-reaches zero, the object will be destroyed.
-

-

+
nm_ip4_address_unref ()

+
void
+nm_ip4_address_unref (NMIP4Address *address);

+
Decreases the reference count of the object.  If the reference count
+reaches zero, the object will be destroyed.

+

+
Parameters

+
--+++
-
-
+
+
+

 





 
 
address :
the NMIP4Address
-
address
the NMIP4Address
 
 

 

 

-

-

-
nm_ip4_address_compare ()

-
gboolean            nm_ip4_address_compare              (NMIP4Address *address,
-                                                         NMIP4Address *other);

-

-Determines if two NMIP4Address objects contain the same values.
-

-

----
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-




address :
the NMIP4Address
-
other :
the NMIP4Address to compare address to.
Returns :

-TRUE if the objects contain the same values, FALSE if they do not.

 

 

 

-
nm_ip4_address_get_address ()

-
guint32             nm_ip4_address_get_address          (NMIP4Address *address);

-

-Gets the IPv4 address property of this address object.
-

-

+
nm_ip4_address_compare ()

+
gboolean
+nm_ip4_address_compare (NMIP4Address *address,
+                        NMIP4Address *other);

+
Determines if two NMIP4Address objects contain the same values.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
address :
the NMIP4Address
-
address
the NMIP4Address
 
 

 
Returns :
the IPv4 address in network byte order
other
the NMIP4Address to compare address
+to.
 
 

 
 

 

-

-

-
nm_ip4_address_set_address ()

-
void                nm_ip4_address_set_address          (NMIP4Address *address,
-                                                         guint32 addr);

-

-Sets the IPv4 address property of this object.
-

-

----
-
-
-
-
-
-
-
-
-
-
-




address :
the NMIP4Address
-
addr :
the IPv4 address in network byte order

+

+
Returns

+
 TRUE if the objects contain the same values, FALSE if they do not.

+

+

 

 

 

-
nm_ip4_address_get_prefix ()

-
guint32             nm_ip4_address_get_prefix           (NMIP4Address *address);

-

-Gets the IPv4 address prefix (ie "24" or "30" etc) property of this address
-object.
-

-

+
nm_ip4_address_get_address ()

+
guint32
+nm_ip4_address_get_address (NMIP4Address *address);

+
Gets the IPv4 address property of this address object.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
address :
the NMIP4Address
-
Returns :
the IPv4 address prefix
address
the NMIP4Address
 

 

 

+

+
Returns

+
 the IPv4 address in network byte order

+

+

+

 

 

-
nm_ip4_address_set_prefix ()

-
void                nm_ip4_address_set_prefix           (NMIP4Address *address,
-                                                         guint32 prefix);

-

-Sets the IPv4 address prefix.
-

-

+
nm_ip4_address_set_address ()

+
void
+nm_ip4_address_set_address (NMIP4Address *address,
+                            guint32 addr);

+
Sets the IPv4 address property of this object.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
address :
the NMIP4Address
-
address
the NMIP4Address
 
 

 
prefix :
the address prefix, a number between 1 and 32 inclusive
addr
the IPv4 address in network byte order
 
 

 
 

 

+

 

 

-
nm_ip4_address_get_gateway ()

-
guint32             nm_ip4_address_get_gateway          (NMIP4Address *address);

-

-Gets the IPv4 default gateway property of this address object.
-

-

+
nm_ip4_address_get_prefix ()

+
guint32
+nm_ip4_address_get_prefix (NMIP4Address *address);

+
Gets the IPv4 address prefix (ie "24" or "30" etc) property of this address
+object.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
address :
the NMIP4Address
-
Returns :
the IPv4 gateway address in network byte order
address
the NMIP4Address
 

 

 

+

+
Returns

+
 the IPv4 address prefix

+

+

+

 

 

-
nm_ip4_address_set_gateway ()

-
void                nm_ip4_address_set_gateway          (NMIP4Address *address,
-                                                         guint32 gateway);

-

-Sets the IPv4 default gateway property of this address object.
-

-

+
nm_ip4_address_set_prefix ()

+
void
+nm_ip4_address_set_prefix (NMIP4Address *address,
+                           guint32 prefix);

+
Sets the IPv4 address prefix.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
address :
the NMIP4Address
-
address
the NMIP4Address
 
 

 
gateway :
the IPv4 default gateway in network byte order
prefix
the address prefix, a number between 1 and 32 inclusive
 
 

 
 

 

-

-

-
NMIP4Route

-
typedef struct NMIP4Route NMIP4Route;
-

-

-

 

 

 

-
nm_ip4_route_new ()

-
NMIP4Route *        nm_ip4_route_new                    (void);

-

-Creates and returns a new NMIP4Route object.
-

-

+
nm_ip4_address_get_gateway ()

+
guint32
+nm_ip4_address_get_gateway (NMIP4Address *address);

+
Gets the IPv4 default gateway property of this address object.

+

+
Parameters

+
--+++
-
-
+
+
+

 





 
 
Returns :
the new empty NMIP4Route object. [transfer full]
-
address
the NMIP4Address
 
 

 

 

+

+
Returns

+
 the IPv4 gateway address in network byte order

+

+

+

 

 

-
nm_ip4_route_dup ()

-
NMIP4Route *        nm_ip4_route_dup                    (NMIP4Route *source);

-

-Copies a given NMIP4Route object and returns the copy.
-

-

+
nm_ip4_address_set_gateway ()

+
void
+nm_ip4_address_set_gateway (NMIP4Address *address,
+                            guint32 gateway);

+
Sets the IPv4 default gateway property of this address object.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
source :
the NMIP4Route object to copy
address
the NMIP4Address
 
 

 
Returns :
the copy of the given NMIP4Route copy. [transfer full]
-
gateway
the IPv4 default gateway in network byte order
 
 

 
 

 

+

 

 

-
nm_ip4_route_ref ()

-
void                nm_ip4_route_ref                    (NMIP4Route *route);

-

-Increases the reference count of the object.
-

-

+
nm_ip4_route_new ()

+
NMIP4Route *
+nm_ip4_route_new (void);

+
Creates and returns a new NMIP4Route object.

+

+
Returns

+
 the new empty NMIP4Route object. 

+
[transfer full]

+

+
+

+

+
nm_ip4_route_dup ()

+
NMIP4Route *
+nm_ip4_route_dup (NMIP4Route *source);

+
Copies a given NMIP4Route object and returns the copy.

+

+
Parameters

+
--+++
-
-
+
+
+

 





 
 
route :
the NMIP4Route
-
source
the NMIP4Route object to copy
 
 

 

 

+

+
Returns

+
 the copy of the given NMIP4Route copy. 

+
[transfer full]

+

+

 

 

-
nm_ip4_route_unref ()

-
void                nm_ip4_route_unref                  (NMIP4Route *route);

-

-Decreases the reference count of the object.  If the reference count
-reaches zero, the object will be destroyed.
-

-

+
nm_ip4_route_ref ()

+
void
+nm_ip4_route_ref (NMIP4Route *route);

+
Increases the reference count of the object.

+

+
Parameters

+
--+++
-
-
+
+
+

 





 
 
route :
the NMIP4Route
-
route
the NMIP4Route
 
 

 

 

+

 

 

-
nm_ip4_route_compare ()

-
gboolean            nm_ip4_route_compare                (NMIP4Route *route,
-                                                         NMIP4Route *other);

-

-Determines if two NMIP4Route objects contain the same values.
-

-

+
nm_ip4_route_unref ()

+
void
+nm_ip4_route_unref (NMIP4Route *route);

+
Decreases the reference count of the object.  If the reference count
+reaches zero, the object will be destroyed.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
route :
the NMIP4Route
-
other :
the NMIP4Route to compare route to.
Returns :

-TRUE if the objects contain the same values, FALSE if they do not.
route
the NMIP4Route
 

 

 

+
 

 

-
nm_ip4_route_get_dest ()

-
guint32             nm_ip4_route_get_dest               (NMIP4Route *route);

-

-Gets the IPv4 destination address property of this route object.
-

-

+
nm_ip4_route_compare ()

+
gboolean
+nm_ip4_route_compare (NMIP4Route *route,
+                      NMIP4Route *other);

+
Determines if two NMIP4Route objects contain the same values.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
route :
the NMIP4Route
-
route
the NMIP4Route
 
 

 
Returns :
the IPv4 address in network byte order
other
the NMIP4Route to compare route
+to.
 
 

 
 

 

+

+
Returns

+
 TRUE if the objects contain the same values, FALSE if they do not.

+

+

+
 

 

-
nm_ip4_route_set_dest ()

-
void                nm_ip4_route_set_dest               (NMIP4Route *route,
-                                                         guint32 dest);

-

-Sets the IPv4 destination address property of this route object.
-

-

+
nm_ip4_route_get_dest ()

+
guint32
+nm_ip4_route_get_dest (NMIP4Route *route);

+
Gets the IPv4 destination address property of this route object.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
route :
the NMIP4Route
-
dest :
the destination address in network byte order
route
the NMIP4Route
 

 

 

+

+
Returns

+
 the IPv4 address in network byte order

+

+

+
 

 

-
nm_ip4_route_get_prefix ()

-
guint32             nm_ip4_route_get_prefix             (NMIP4Route *route);

-

-Gets the IPv4 prefix (ie "24" or "30" etc) of this route.
-

-

+
nm_ip4_route_set_dest ()

+
void
+nm_ip4_route_set_dest (NMIP4Route *route,
+                       guint32 dest);

+
Sets the IPv4 destination address property of this route object.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
route :
the NMIP4Route
-
route
the NMIP4Route
 
 

 
Returns :
the IPv4 prefix
dest
the destination address in network byte order
 
 

 
 

 

+
 

 

-
nm_ip4_route_set_prefix ()

-
void                nm_ip4_route_set_prefix             (NMIP4Route *route,
-                                                         guint32 prefix);

-

-Sets the IPv4 prefix of this route.
-

-

+
nm_ip4_route_get_prefix ()

+
guint32
+nm_ip4_route_get_prefix (NMIP4Route *route);

+
Gets the IPv4 prefix (ie "24" or "30" etc) of this route.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
route :
the NMIP4Route
-
prefix :
the prefix, a number between 1 and 32 inclusive
route
the NMIP4Route
 

 

 

+

+
Returns

+
 the IPv4 prefix

+

+

+
 

 

-
nm_ip4_route_get_next_hop ()

-
guint32             nm_ip4_route_get_next_hop           (NMIP4Route *route);

-

-Gets the IPv4 address of the next hop of this route.
-

-

+
nm_ip4_route_set_prefix ()

+
void
+nm_ip4_route_set_prefix (NMIP4Route *route,
+                         guint32 prefix);

+
Sets the IPv4 prefix of this route.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
route :
the NMIP4Route
-
route
the NMIP4Route
 
 

 
Returns :
the IPv4 address in network byte order
prefix
the prefix, a number between 1 and 32 inclusive
 
 

 
 

 

+
 

 

-
nm_ip4_route_set_next_hop ()

-
void                nm_ip4_route_set_next_hop           (NMIP4Route *route,
-                                                         guint32 next_hop);

-

-Sets the IPv4 address of the next hop of this route.
-

-

+
nm_ip4_route_get_next_hop ()

+
guint32
+nm_ip4_route_get_next_hop (NMIP4Route *route);

+
Gets the IPv4 address of the next hop of this route.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
route :
the NMIP4Route
-
next_hop :
the IPv4 address of the next hop in network byte order
route
the NMIP4Route
 

 

 

+

+
Returns

+
 the IPv4 address in network byte order

+

+

+
 

 

-
nm_ip4_route_get_metric ()

-
guint32             nm_ip4_route_get_metric             (NMIP4Route *route);

-

-Gets the route metric property of this route object; lower values indicate
-"better" or more preferred routes.
-

-

+
nm_ip4_route_set_next_hop ()

+
void
+nm_ip4_route_set_next_hop (NMIP4Route *route,
+                           guint32 next_hop);

+
Sets the IPv4 address of the next hop of this route.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
route :
the NMIP4Route
-
route
the NMIP4Route
 
 

 
Returns :
the route metric
next_hop
the IPv4 address of the next hop in network byte order
 
 

 
 

 

+
 

 

-
nm_ip4_route_set_metric ()

-
void                nm_ip4_route_set_metric             (NMIP4Route *route,
-                                                         guint32 metric);

-

-Sets the route metric property of this route object; lower values indicate
-"better" or more preferred routes.
-

-

+
nm_ip4_route_get_metric ()

+
guint32
+nm_ip4_route_get_metric (NMIP4Route *route);

+
Gets the route metric property of this route object; lower values indicate
+"better" or more preferred routes.

+

+
Parameters

+

+++++
+
+
+
+
+
+





route
the NMIP4Route
 

+

+

+
Returns

+
 the route metric

+

+

+
+

+

+
nm_ip4_route_set_metric ()

+
void
+nm_ip4_route_set_metric (NMIP4Route *route,
+                         guint32 metric);

+
Sets the route metric property of this route object; lower values indicate
+"better" or more preferred routes.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
route :
the NMIP4Route
-
route
the NMIP4Route
 
 

 
metric :
the route metric
metric
the route metric
 
 

 
 

 

-

-

-
NMSettingIP4Config

-
typedef struct _NMSettingIP4Config NMSettingIP4Config;

-

-

 

 

 

-
NMSettingIP4ConfigClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingIP4ConfigClass;
-

-

-

+
nm_setting_ip4_config_new ()

+
NMSetting *
+nm_setting_ip4_config_new (void);

+
Creates a new NMSettingIP4Config object with default values.

+

+
Returns

+
 the new empty NMSettingIP4Config object. 

+
[transfer full]

+

 

 

 

-
nm_setting_ip4_config_new ()

-
NMSetting *         nm_setting_ip4_config_new           (void);

-

-Creates a new NMSettingIP4Config object with default values.
-

-

+
nm_setting_ip4_config_get_method ()

+
const char *
+nm_setting_ip4_config_get_method (NMSettingIP4Config *setting);

+

+
Parameters

+
--+++
-
-
+
+
+

 





 
 
Returns :
the new empty NMSettingIP4Config object. [transfer full]
-
setting
the NMSettingIP4Config
 
 

 

 

+

+
Returns

+
 the “method” property of the setting

+

+

+

 

 

-
nm_setting_ip4_config_get_method ()

-
const char *        nm_setting_ip4_config_get_method    (NMSettingIP4Config *setting);

-

+
nm_setting_ip4_config_get_num_dns ()

+
guint32
+nm_setting_ip4_config_get_num_dns (NMSettingIP4Config *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingIP4Config
-
Returns :
the "method" property of the setting
setting
the NMSettingIP4Config
 

 

 

+

+
Returns

+
 the number of configured DNS servers

+

+

+
 

 

-
nm_setting_ip4_config_get_num_dns ()

-
guint32             nm_setting_ip4_config_get_num_dns   (NMSettingIP4Config *setting);

-

+
nm_setting_ip4_config_get_dns ()

+
guint32
+nm_setting_ip4_config_get_dns (NMSettingIP4Config *setting,
+                               guint32 i);

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingIP4Config
-
setting
the NMSettingIP4Config
 
 

 
Returns :
the number of configured DNS servers
i
index number of the DNS server to return
 
 

 
 

 

-

-

-
nm_setting_ip4_config_get_dns ()

-
guint32             nm_setting_ip4_config_get_dns       (NMSettingIP4Config *setting,
-                                                         guint32 i);

-

----
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingIP4Config
-
i :
index number of the DNS server to return
Returns :
the IPv4 address (network byte order) of the DNS server at index
+

+
Returns

+
 the IPv4 address (network byte order) of the DNS server at index
 i
-

+

+

+

 
 

 

-
nm_setting_ip4_config_add_dns ()

-
gboolean            nm_setting_ip4_config_add_dns       (NMSettingIP4Config *setting,
-                                                         guint32 dns);

-

-Adds a new DNS server to the setting.
-

-

+
nm_setting_ip4_config_add_dns ()

+
gboolean
+nm_setting_ip4_config_add_dns (NMSettingIP4Config *setting,
+                               guint32 dns);

+
Adds a new DNS server to the setting.

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingIP4Config
-
dns :
the IPv4 address (network byte order) of the DNS server to add
setting
the NMSettingIP4Config
 
 

 
Returns :

-TRUE if the DNS server was added; FALSE if the server was already
-known
dns
the IPv4 address (network byte order) of the DNS server to add
 
 

 
 

 

+

+
Returns

+
 TRUE if the DNS server was added; FALSE if the server was already
+known

+

+

+
 

 

-
nm_setting_ip4_config_remove_dns ()

-
void                nm_setting_ip4_config_remove_dns    (NMSettingIP4Config *setting,
-                                                         guint32 i);

-

-Removes the DNS server at index i.
-

-

+
nm_setting_ip4_config_remove_dns ()

+
void
+nm_setting_ip4_config_remove_dns (NMSettingIP4Config *setting,
+                                  guint32 i);

+
Removes the DNS server at index i
+.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingIP4Config
-
setting
the NMSettingIP4Config
 
 

 
i :
index number of the DNS server to remove
i
index number of the DNS server to remove
 
 

 
 

 

+
 

 

-
nm_setting_ip4_config_clear_dns ()

-
void                nm_setting_ip4_config_clear_dns     (NMSettingIP4Config *setting);

-

-Removes all configured DNS servers.
-

-

+
nm_setting_ip4_config_clear_dns ()

+
void
+nm_setting_ip4_config_clear_dns (NMSettingIP4Config *setting);

+
Removes all configured DNS servers.

+

+
Parameters

+
--+++
-
-
+
+
+

 





 
 
setting :
the NMSettingIP4Config
-
setting
the NMSettingIP4Config
 
 

 

 

+
 

 

-
nm_setting_ip4_config_get_num_dns_searches ()

-
guint32             nm_setting_ip4_config_get_num_dns_searches
-                                                        (NMSettingIP4Config *setting);

-

+
nm_setting_ip4_config_get_num_dns_searches ()

+
guint32
+nm_setting_ip4_config_get_num_dns_searches
+                               (NMSettingIP4Config *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingIP4Config
-
Returns :
the number of configured DNS search domains
setting
the NMSettingIP4Config
 

 

 

+

+
Returns

+
 the number of configured DNS search domains

+

+

+
 

 

-
nm_setting_ip4_config_get_dns_search ()

-
const char *        nm_setting_ip4_config_get_dns_search
-                                                        (NMSettingIP4Config *setting,
-                                                         guint32 i);

-

+
nm_setting_ip4_config_get_dns_search ()

+
const char *
+nm_setting_ip4_config_get_dns_search (NMSettingIP4Config *setting,
+                                      guint32 i);

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingIP4Config
-
i :
index number of the DNS search domain to return
setting
the NMSettingIP4Config
 
 

 
Returns :
the DNS search domain at index i
-
i
index number of the DNS search domain to return
 
 

 
 

 

+

+
Returns

+
 the DNS search domain at index i
+

+

+

+
 

 

-
nm_setting_ip4_config_add_dns_search ()

-
gboolean            nm_setting_ip4_config_add_dns_search
-                                                        (NMSettingIP4Config *setting,
-                                                         const char *dns_search);

-

-Adds a new DNS search domain to the setting.
-

-

+
nm_setting_ip4_config_add_dns_search ()

+
gboolean
+nm_setting_ip4_config_add_dns_search (NMSettingIP4Config *setting,
+                                      const char *dns_search);

+
Adds a new DNS search domain to the setting.

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingIP4Config
-
dns_search :
the search domain to add
setting
the NMSettingIP4Config
 
 

 
Returns :

-TRUE if the DNS search domain was added; FALSE if the search
-domain was already known
dns_search
the search domain to add
 
 

 
 

 

+

+
Returns

+
 TRUE if the DNS search domain was added; FALSE if the search
+domain was already known

+

+

+
 

 

-
nm_setting_ip4_config_remove_dns_search ()

-
void                nm_setting_ip4_config_remove_dns_search
-                                                        (NMSettingIP4Config *setting,
-                                                         guint32 i);

-

-Removes the DNS search domain at index i.
-

-

+
nm_setting_ip4_config_remove_dns_search ()

+
void
+nm_setting_ip4_config_remove_dns_search
+                               (NMSettingIP4Config *setting,
+                                guint32 i);

+
Removes the DNS search domain at index i
+.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingIP4Config
-
setting
the NMSettingIP4Config
 
 

 
i :
index number of the DNS search domain
i
index number of the DNS search domain
 
 

 
 

 

+
 

 

-
nm_setting_ip4_config_clear_dns_searches ()

-
void                nm_setting_ip4_config_clear_dns_searches
-                                                        (NMSettingIP4Config *setting);

-

-Removes all configured DNS search domains.
-

-

+
nm_setting_ip4_config_clear_dns_searches ()

+
void
+nm_setting_ip4_config_clear_dns_searches
+                               (NMSettingIP4Config *setting);

+
Removes all configured DNS search domains.

+

+
Parameters

+
--+++
-
-
+
+
+

 





 
 
setting :
the NMSettingIP4Config
-
setting
the NMSettingIP4Config
 
 

 

 

+
 

 

-
nm_setting_ip4_config_get_num_addresses ()

-
guint32             nm_setting_ip4_config_get_num_addresses
-                                                        (NMSettingIP4Config *setting);

-

+
nm_setting_ip4_config_get_num_addresses ()

+
guint32
+nm_setting_ip4_config_get_num_addresses
+                               (NMSettingIP4Config *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingIP4Config
-
Returns :
the number of configured addresses
setting
the NMSettingIP4Config
 

 

 

+

+
Returns

+
 the number of configured addresses

+

+

+
 

 

-
nm_setting_ip4_config_get_address ()

-
NMIP4Address *      nm_setting_ip4_config_get_address   (NMSettingIP4Config *setting,
-                                                         guint32 i);

-

+
nm_setting_ip4_config_get_address ()

+
NMIP4Address *
+nm_setting_ip4_config_get_address (NMSettingIP4Config *setting,
+                                   guint32 i);

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingIP4Config
-
i :
index number of the address to return
setting
the NMSettingIP4Config
 
 

 
Returns :
the address at index i
-
i
index number of the address to return
 
 

 
 

 

+

+
Returns

+
 the address at index i
+

+

+

+
 

 

-
nm_setting_ip4_config_add_address ()

-
gboolean            nm_setting_ip4_config_add_address   (NMSettingIP4Config *setting,
-                                                         NMIP4Address *address);

-

-Adds a new IPv4 address and associated information to the setting.  The
-given address is duplicated internally and is not changed by this function.
-

-

+
nm_setting_ip4_config_add_address ()

+
gboolean
+nm_setting_ip4_config_add_address (NMSettingIP4Config *setting,
+                                   NMIP4Address *address);

+
Adds a new IPv4 address and associated information to the setting.  The
+given address is duplicated internally and is not changed by this function.

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingIP4Config
-
address :
the new address to add
setting
the NMSettingIP4Config
 
 

 
Returns :

-TRUE if the address was added; FALSE if the address was already
-known.
address
the new address to add
 
 

 
 

 

+

+
Returns

+
 TRUE if the address was added; FALSE if the address was already
+known.

+

+

+
 

 

-
nm_setting_ip4_config_remove_address ()

-
void                nm_setting_ip4_config_remove_address
-                                                        (NMSettingIP4Config *setting,
-                                                         guint32 i);

-

-Removes the address at index i.
-

-

+
nm_setting_ip4_config_remove_address ()

+
void
+nm_setting_ip4_config_remove_address (NMSettingIP4Config *setting,
+                                      guint32 i);

+
Removes the address at index i
+.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingIP4Config
-
setting
the NMSettingIP4Config
 
 

 
i :
index number of the address to remove
i
index number of the address to remove
 
 

 
 

 

+
 

 

-
nm_setting_ip4_config_clear_addresses ()

-
void                nm_setting_ip4_config_clear_addresses
-                                                        (NMSettingIP4Config *setting);

-

-Removes all configured addresses.
-

-

+
nm_setting_ip4_config_clear_addresses ()

+
void
+nm_setting_ip4_config_clear_addresses (NMSettingIP4Config *setting);

+
Removes all configured addresses.

+

+
Parameters

+
--+++
-
-
+
+
+

 





 
 
setting :
the NMSettingIP4Config
-
setting
the NMSettingIP4Config
 
 

 

 

+
 

 

-
nm_setting_ip4_config_get_num_routes ()

-
guint32             nm_setting_ip4_config_get_num_routes
-                                                        (NMSettingIP4Config *setting);

-

+
nm_setting_ip4_config_get_num_routes ()

+
guint32
+nm_setting_ip4_config_get_num_routes (NMSettingIP4Config *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingIP4Config
-
Returns :
the number of configured routes
setting
the NMSettingIP4Config
 

 

 

+

+
Returns

+
 the number of configured routes

+

+

+
 

 

-
nm_setting_ip4_config_get_route ()

-
NMIP4Route *        nm_setting_ip4_config_get_route     (NMSettingIP4Config *setting,
-                                                         guint32 i);

-

+
nm_setting_ip4_config_get_route ()

+
NMIP4Route *
+nm_setting_ip4_config_get_route (NMSettingIP4Config *setting,
+                                 guint32 i);

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingIP4Config
-
i :
index number of the route to return
setting
the NMSettingIP4Config
 
 

 
Returns :
the route at index i
-
i
index number of the route to return
 
 

 
 

 

+

+
Returns

+
 the route at index i
+

+

+

+
 

 

-
nm_setting_ip4_config_add_route ()

-
gboolean            nm_setting_ip4_config_add_route     (NMSettingIP4Config *setting,
-                                                         NMIP4Route *route);

-

-Adds a new IPv4 route and associated information to the setting.  The
-given route is duplicated internally and is not changed by this function.
-

-

+
nm_setting_ip4_config_add_route ()

+
gboolean
+nm_setting_ip4_config_add_route (NMSettingIP4Config *setting,
+                                 NMIP4Route *route);

+
Adds a new IPv4 route and associated information to the setting.  The
+given route is duplicated internally and is not changed by this function.

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingIP4Config
-
route :
the route to add
setting
the NMSettingIP4Config
 
 

 
Returns :

-TRUE if the route was added; FALSE if the route was already known.
route
the route to add
 
 

 
 

 

+

+
Returns

+
 TRUE if the route was added; FALSE if the route was already known.

+

+

+
 

 

-
nm_setting_ip4_config_remove_route ()

-
void                nm_setting_ip4_config_remove_route  (NMSettingIP4Config *setting,
-                                                         guint32 i);

-

-Removes the route at index i.
-

-

+
nm_setting_ip4_config_remove_route ()

+
void
+nm_setting_ip4_config_remove_route (NMSettingIP4Config *setting,
+                                    guint32 i);

+
Removes the route at index i
+.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingIP4Config
-
setting
the NMSettingIP4Config
 
 

 
i :
index number of the route
i
index number of the route
 
 

 
 

 

+
 

 

-
nm_setting_ip4_config_clear_routes ()

-
void                nm_setting_ip4_config_clear_routes  (NMSettingIP4Config *setting);

-

-Removes all configured routes.
-

-

+
nm_setting_ip4_config_clear_routes ()

+
void
+nm_setting_ip4_config_clear_routes (NMSettingIP4Config *setting);

+
Removes all configured routes.

+

+
Parameters

+
--+++
-
-
+
+
+

 





 
 
setting :
the NMSettingIP4Config
-
setting
the NMSettingIP4Config
 
 

 

 

+
 

 

-
nm_setting_ip4_config_get_ignore_auto_routes ()

-
gboolean            nm_setting_ip4_config_get_ignore_auto_routes
-                                                        (NMSettingIP4Config *setting);

-

-Returns the value contained in the "ignore-auto-routes"
-property.
-

-

+
nm_setting_ip4_config_get_ignore_auto_routes ()

+
gboolean
+nm_setting_ip4_config_get_ignore_auto_routes
+                               (NMSettingIP4Config *setting);

+
Returns the value contained in the “ignore-auto-routes”
+property.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingIP4Config
-
Returns :

-TRUE if automatically configured (ie via DHCP) routes should be
-ignored.
setting
the NMSettingIP4Config
 

 

 

+

+
Returns

+
 TRUE if automatically configured (ie via DHCP) routes should be
+ignored.

+

+

+
 

 

-
nm_setting_ip4_config_get_ignore_auto_dns ()

-
gboolean            nm_setting_ip4_config_get_ignore_auto_dns
-                                                        (NMSettingIP4Config *setting);

-

-Returns the value contained in the "ignore-auto-dns"
-property.
-

-

+
nm_setting_ip4_config_get_ignore_auto_dns ()

+
gboolean
+nm_setting_ip4_config_get_ignore_auto_dns
+                               (NMSettingIP4Config *setting);

+
Returns the value contained in the “ignore-auto-dns”
+property.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingIP4Config
-
Returns :

-TRUE if automatically configured (ie via DHCP) DNS information
-should be ignored.
setting
the NMSettingIP4Config
 

 

 

+

+
Returns

+
 TRUE if automatically configured (ie via DHCP) DNS information
+should be ignored.

+

+

+
 

 

-
nm_setting_ip4_config_get_dhcp_client_id ()

-
const char *        nm_setting_ip4_config_get_dhcp_client_id
-                                                        (NMSettingIP4Config *setting);

-

-Returns the value contained in the "dhcp-client-id"
-property.
-

-

+
nm_setting_ip4_config_get_dhcp_client_id ()

+
const char *
+nm_setting_ip4_config_get_dhcp_client_id
+                               (NMSettingIP4Config *setting);

+
Returns the value contained in the “dhcp-client-id”
+property.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingIP4Config
-
Returns :
the configured Client ID to send to the DHCP server when requesting
-addresses via DHCP.
setting
the NMSettingIP4Config
 

 

 

+

+
Returns

+
 the configured Client ID to send to the DHCP server when requesting
+addresses via DHCP.

+

+

+
 

 

-
nm_setting_ip4_config_get_dhcp_send_hostname ()

-
gboolean            nm_setting_ip4_config_get_dhcp_send_hostname
-                                                        (NMSettingIP4Config *setting);

-

-Returns the value contained in the "dhcp-send-hostname"
-property.
-

-

+
nm_setting_ip4_config_get_dhcp_send_hostname ()

+
gboolean
+nm_setting_ip4_config_get_dhcp_send_hostname
+                               (NMSettingIP4Config *setting);

+
Returns the value contained in the “dhcp-send-hostname”
+property.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingIP4Config
-
Returns :

-TRUE if NetworkManager should send the machine hostname to the
-DHCP server when requesting addresses to allow the server to automatically
-update DNS information for this machine.
setting
the NMSettingIP4Config
 

 

 

+

+
Returns

+
 TRUE if NetworkManager should send the machine hostname to the
+DHCP server when requesting addresses to allow the server to automatically
+update DNS information for this machine.

+

+

+
 

 

-
nm_setting_ip4_config_get_dhcp_hostname ()

-
const char *        nm_setting_ip4_config_get_dhcp_hostname
-                                                        (NMSettingIP4Config *setting);

-

-Returns the value contained in the "dhcp-hostname"
-property.
-

-

+
nm_setting_ip4_config_get_dhcp_hostname ()

+
const char *
+nm_setting_ip4_config_get_dhcp_hostname
+                               (NMSettingIP4Config *setting);

+
Returns the value contained in the “dhcp-hostname”
+property.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingIP4Config
-
Returns :
the configured hostname to send to the DHCP server
setting
the NMSettingIP4Config
 

 

 

+

+
Returns

+
 the configured hostname to send to the DHCP server

+

+

+
 

 

-
nm_setting_ip4_config_get_never_default ()

-
gboolean            nm_setting_ip4_config_get_never_default
-                                                        (NMSettingIP4Config *setting);

-

-Returns the value contained in the "never-default"
-property.
-

-

+
nm_setting_ip4_config_get_never_default ()

+
gboolean
+nm_setting_ip4_config_get_never_default
+                               (NMSettingIP4Config *setting);

+
Returns the value contained in the “never-default”
+property.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingIP4Config
-
Returns :

-TRUE if this connection should never be the default connection
-for IPv4 addressing
setting
the NMSettingIP4Config
 

 

 

+

+
Returns

+
 TRUE if this connection should never be the default connection
+for IPv4 addressing

+

+

+
 

 

-
nm_setting_ip4_config_get_may_fail ()

-
gboolean            nm_setting_ip4_config_get_may_fail  (NMSettingIP4Config *setting);

+
nm_setting_ip4_config_get_may_fail ()

+
gboolean
+nm_setting_ip4_config_get_may_fail (NMSettingIP4Config *setting);

+
Returns the value contained in the “may-fail”
+property.

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingIP4Config
 

+

+

+
Returns

+
 TRUE if this connection doesn't require IPv4 addressing to complete
+for the connection to succeed.

+

+

+

+
+

+
Types and Values

+

+
NM_SETTING_IP4_CONFIG_SETTING_NAME

+
#define NM_SETTING_IP4_CONFIG_SETTING_NAME "ipv4"
+

 

-Returns the value contained in the "may-fail"
-property.
 

-

+
+

+

+
enum NMSettingIP4ConfigError

+

+
Members

+
--+++
-
-
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+

 





 
 
 
setting :
the NMSettingIP4Config
+
NM_SETTING_IP4_CONFIG_ERROR_UNKNOWN

+
unknown or unclassified error

+		 
NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY

+
the property was invalid

 		 
 

 
Returns :

-TRUE if this connection doesn't require IPv4 addressing to complete
-for the connection to succeed.
NM_SETTING_IP4_CONFIG_ERROR_MISSING_PROPERTY

+
the property was missing and is
+required

+		 
NM_SETTING_IP4_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD

+
the property's value is
+not valid with the given IP4 method

+		 
 

 
 

 

 

-

-
Property Details

+

+

+
NM_SETTING_IP4_CONFIG_ERROR

+
#define NM_SETTING_IP4_CONFIG_ERROR nm_setting_ip4_config_error_quark ()
+

+

+

+

+

 

-
The "addresses" property

-
  "addresses"                GPtrArray_GArray_guint__*  : Read / Write

+
NM_SETTING_IP4_CONFIG_METHOD

+
#define NM_SETTING_IP4_CONFIG_METHOD             "method"
+

 

-Array of IPv4 address structures.  Each IPv4 address structure is
-composed of 3 32-bit values; the first being the IPv4 address (network
-byte order), the second the prefix (1 - 32), and last the IPv4 gateway
-(network byte order). The gateway may be left as 0 if no gateway exists
-for that subnet.  For the 'auto' method, given IP addresses are appended
-to those returned by automatic configuration.  Addresses cannot be used
-with the 'shared', 'link-local', or 'disabled' methods as addressing is
-either automatic or disabled with these methods.
 

 

 

 

-
The "dhcp-client-id" property

-
  "dhcp-client-id"           gchar*                : Read / Write

+
NM_SETTING_IP4_CONFIG_DNS

+
#define NM_SETTING_IP4_CONFIG_DNS                "dns"
+

 

-A string sent to the DHCP server to identify the local machine which the
-DHCP server may use to customize the DHCP lease and options.
 

-
Default value: NULL

 

 

 

-
The "dhcp-hostname" property

-
  "dhcp-hostname"            gchar*                : Read / Write

+
NM_SETTING_IP4_CONFIG_DNS_SEARCH

+
#define NM_SETTING_IP4_CONFIG_DNS_SEARCH         "dns-search"
+

 

-If the "dhcp-send-hostname" property is TRUE, then the
-specified name will be sent to the DHCP server when acquiring a lease.
 

-
Default value: NULL

 

 

 

-
The "dhcp-send-hostname" property

-
  "dhcp-send-hostname"       gboolean              : Read / Write / Construct

+
NM_SETTING_IP4_CONFIG_ADDRESSES

+
#define NM_SETTING_IP4_CONFIG_ADDRESSES          "addresses"
+

 

-If TRUE, a hostname is sent to the DHCP server when acquiring a lease.
-Some DHCP servers use this hostname to update DNS databases, essentially
-providing a static hostname for the computer.  If
-"dhcp-hostname" is empty and this property is TRUE,
-the current persistent hostname of the computer is sent.
 

-
Default value: TRUE

 

 

 

-
The "dns" property

-
  "dns"                      GArray_guint_*        : Read / Write

+
NM_SETTING_IP4_CONFIG_ROUTES

+
#define NM_SETTING_IP4_CONFIG_ROUTES             "routes"
+

 

-List of DNS servers (network byte order).  For the 'auto' method, these
-DNS servers are appended to those (if any) returned by automatic
-configuration.  DNS servers cannot be used with the 'shared', 'link-local',
-or 'disabled' methods as there is no upstream network.  In all other
-methods, these DNS servers are used as the only DNS servers for this
-connection.
 

 

 

 

-
The "dns-search" property

-
  "dns-search"               GSList_gchararray_*   : Read / Write

+
NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES

+
#define NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES "ignore-auto-routes"
+

 

-List of DNS search domains.  For the 'auto' method, these search domains
-are appended to those returned by automatic configuration. Search domains
-cannot be used with the 'shared', 'link-local', or 'disabled' methods as
-there is no upstream network.  In all other methods, these search domains
-are used as the only search domains for this connection.
 

 

 

 

-
The "ignore-auto-dns" property

-
  "ignore-auto-dns"          gboolean              : Read / Write / Construct

+
NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS

+
#define NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS    "ignore-auto-dns"
+

 

-When the method is set to 'auto' and this property to TRUE, automatically
-configured nameservers and search domains are ignored and only nameservers
-and search domains specified in "dns" and
-"dns-search", if any, are used.
 

-
Default value: FALSE

 

 

 

-
The "ignore-auto-routes" property

-
  "ignore-auto-routes"       gboolean              : Read / Write / Construct

+
NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID

+
#define NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID     "dhcp-client-id"
+

 

-When the method is set to 'auto' and this property to TRUE, automatically
-configured routes are ignored and only routes specified in
-"routes", if any, are used.
 

-
Default value: FALSE

 

 

 

-
The "may-fail" property

-
  "may-fail"                 gboolean              : Read / Write / Construct

+
NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME

+
#define NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME "dhcp-send-hostname"
+

 

-If TRUE, allow overall network configuration to proceed even if IPv4
-configuration times out.  Note that at least one IP configuration
-must succeed or overall network configuration will still fail.  For
-example, in IPv6-only networks, setting this property to TRUE allows
-the overall network configuration to succeed if IPv4 configuration fails
-but IPv6 configuration completes successfully.
 

-
Default value: TRUE

 

 

 

-
The "method" property

-
  "method"                   gchar*                : Read / Write

+
NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME

+
#define NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME      "dhcp-hostname"
+

 

-IPv4 configuration method.  If 'auto' is specified then the appropriate
-automatic method (DHCP, PPP, etc) is used for the interface and most
-other properties can be left unset.  If 'link-local' is specified, then a
-link-local address in the 169.254/16 range will be assigned to the
-interface.  If 'manual' is specified, static IP addressing is used and at
-least one IP address must be given in the 'addresses' property.  If
-'shared' is specified (indicating that this connection will provide
-network access to other computers) then the interface is assigned an
-address in the 10.42.x.1/24 range and a DHCP and forwarding DNS server
-are started, and the interface is NAT-ed to the current default network
-connection.  'disabled' means IPv4 will not be used on this connection.
-This property must be set.
 

-
Default value: NULL

 

 

 

-
The "never-default" property

-
  "never-default"            gboolean              : Read / Write / Construct

+
NM_SETTING_IP4_CONFIG_NEVER_DEFAULT

+
#define NM_SETTING_IP4_CONFIG_NEVER_DEFAULT      "never-default"
+

 

-If TRUE, this connection will never be the default IPv4 connection,
-meaning it will never be assigned the default route by NetworkManager.
 

-
Default value: FALSE

 

 

 

-
The "routes" property

-
  "routes"                   GPtrArray_GArray_guint__*  : Read / Write

+
NM_SETTING_IP4_CONFIG_MAY_FAIL

+
#define NM_SETTING_IP4_CONFIG_MAY_FAIL           "may-fail"
+

 

-Array of IPv4 route structures.  Each IPv4 route structure is composed
-of 4 32-bit values; the first being the destination IPv4 network or
-address (network byte order), the second the destination network or
-address prefix (1 - 32), the third being the next-hop (network byte
-order) if any, and the fourth being the route metric. For the 'auto'
-method, given IP routes are appended to those returned by automatic
-configuration.  Routes cannot be used with the 'shared', 'link-local',
-or 'disabled' methods because there is no upstream network.
 

 

+

+

+
NM_SETTING_IP4_CONFIG_METHOD_AUTO

+
#define NM_SETTING_IP4_CONFIG_METHOD_AUTO       "auto"
+

+
IPv4 configuration should be automatically determined via a method appropriate
+for the hardware interface, ie DHCP or PPP or some other device-specific
+manner.

+

+

+

+
NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL

+
#define NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL "link-local"
+

+
IPv4 configuration should be automatically configured for link-local-only
+operation.

+

+

+

+
NM_SETTING_IP4_CONFIG_METHOD_MANUAL

+
#define NM_SETTING_IP4_CONFIG_METHOD_MANUAL     "manual"
+

+
All necessary IPv4 configuration (addresses, prefix, DNS, etc) is specified
+in the setting's properties.

+

+

+

+
NM_SETTING_IP4_CONFIG_METHOD_SHARED

+
#define NM_SETTING_IP4_CONFIG_METHOD_SHARED     "shared"
+

+
This connection specifies configuration that allows other computers to
+connect through it to the default network (usually the Internet).  The
+connection's interface will be assigned a private address, and a DHCP server,
+caching DNS server, and Network Address Translation (NAT) functionality will
+be started on this connection's interface to allow other devices to connect
+through that interface to the default network.

+

+

+

+
NM_SETTING_IP4_CONFIG_METHOD_DISABLED

+
#define NM_SETTING_IP4_CONFIG_METHOD_DISABLED   "disabled"
+

+
This connection does not use or require IPv4 address and it should be disabled.

+

+

+

+
Property Details

+

+
The “addresses” property

+
  “addresses”                GPtrArray_GArray_guint__ *

+
Array of IPv4 address structures.  Each IPv4 address structure is composed of 3 32-bit values; the first being the IPv4 address (network byte order), the second the prefix (1 - 32), and last the IPv4 gateway (network byte order). The gateway may be left as 0 if no gateway exists for that subnet.  For the 'auto' method, given IP addresses are appended to those returned by automatic configuration.  Addresses cannot be used with the 'shared', 'link-local', or 'disabled' methods as addressing is either automatic or disabled with these methods.

+
Flags: Read / Write

+

+

+

+
The “dhcp-client-id” property

+
  “dhcp-client-id”           gchar *

+
A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options.

+
Flags: Read / Write

+
Default value: NULL

+

+

+

+
The “dhcp-hostname” property

+
  “dhcp-hostname”            gchar *

+
If the 'dhcp-send-hostname' property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease.

+
Flags: Read / Write

+
Default value: NULL

+

+

+

+
The “dhcp-send-hostname” property

+
  “dhcp-send-hostname”       gboolean

+
If TRUE, a hostname is sent to the DHCP server when acquiring a lease.  Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer.  If the 'dhcp-hostname' property is empty and this property is TRUE, the current persistent hostname of the computer is sent.

+
Flags: Read / Write / Construct

+
Default value: TRUE

+

+

+

+
The “dns” property

+
  “dns”                      GArray_guint_ *

+
List of DNS servers (network byte order). For the 'auto' method, these DNS servers are appended to those (if any) returned by automatic configuration.  DNS servers cannot be used with the 'shared', 'link-local', or 'disabled' methods as there is no upstream network.  In all other methods, these DNS servers are used as the only DNS servers for this connection.

+
Flags: Read / Write

+

+

+

+
The “dns-search” property

+
  “dns-search”               GSList_gchararray_ *

+
List of DNS search domains.  For the 'auto' method, these search domains are appended to those returned by automatic configuration. Search domains cannot be used with the 'shared', 'link-local', or 'disabled' methods as there is no upstream network.  In all other methods, these search domains are used as the only search domains for this connection.

+
Flags: Read / Write

+

+

+

+
The “ignore-auto-dns” property

+
  “ignore-auto-dns”          gboolean

+
When the method is set to 'auto' and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the 'dns' and 'dns-search' properties, if any, are used.

+
Flags: Read / Write / Construct

+
Default value: FALSE

+

+

+

+
The “ignore-auto-routes” property

+
  “ignore-auto-routes”       gboolean

+
When the method is set to 'auto' and this property to TRUE, automatically configured routes are ignored and only routes specified in the 'routes' property, if any, are used.

+
Flags: Read / Write / Construct

+
Default value: FALSE

+

+

+

+
The “may-fail” property

+
  “may-fail”                 gboolean

+
If TRUE, allow overall network configuration to proceed even if IPv4 configuration times out. Note that at least one IP configuration must succeed or overall network configuration will still fail.  For example, in IPv6-only networks, setting this property to TRUE allows the overall network configuration to succeed if IPv4 configuration fails but IPv6 configuration completes successfully.

+
Flags: Read / Write / Construct

+
Default value: TRUE

+

+

+

+
The “method” property

+
  “method”                   gchar *

+
IPv4 configuration method.  If 'auto' is specified then the appropriate automatic method (DHCP, PPP, etc) is used for the interface and most other properties can be left unset.  If 'link-local' is specified, then a link-local address in the 169.254/16 range will be assigned to the interface.  If 'manual' is specified, static IP addressing is used and at least one IP address must be given in the 'addresses' property.  If 'shared' is specified (indicating that this connection will provide network access to other computers) then the interface is assigned an address in the 10.42.x.1/24 range and a DHCP and forwarding DNS server are started, and the interface is NAT-ed to the current default network connection.  'disabled' means IPv4 will not be used on this connection.  This property must be set.

+
Flags: Read / Write

+
Default value: NULL

+

+

+

+
The “never-default” property

+
  “never-default”            gboolean

+
If TRUE, this connection will never be the default IPv4 connection, meaning it will never be assigned the default route by NetworkManager.

+
Flags: Read / Write / Construct

+
Default value: FALSE

+

+

+

+
The “routes” property

+
  “routes”                   GPtrArray_GArray_guint__ *

+
Array of IPv4 route structures.  Each IPv4 route structure is composed of 4 32-bit values; the first being the destination IPv4 network or address (network byte order), the second the destination network or address prefix (1 - 32), the third being the next-hop (network byte order) if any, and the fourth being the route metric. For the 'auto' method, given IP routes are appended to those returned by automatic configuration.  Routes cannot be used with the 'shared', 'link-local', or 'disabled', methods as there is no upstream network.

+
Flags: Read / Write

+

 

 
 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.20
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingIP6Config.html b/docs/libnm-util/html/NMSettingIP6Config.html
index 9df4ad93..a3d62b10 100644
--- a/docs/libnm-util/html/NMSettingIP6Config.html
+++ b/docs/libnm-util/html/NMSettingIP6Config.html
@@ -2,34 +2,28 @@
 
 
 
-NMSettingIP6Config
+libnm-util Reference Manual: NMSettingIP6Config
 
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
 

 

 

@@ -37,1963 +31,2444 @@
 
NMSettingIP6Config
NMSettingIP6Config — Describes IPv6 addressing, routing, and name service properties

-
+

 
 
 

-

-
Synopsis

-
-#include <nm-setting-ip6-config.h>
-
-#define             NM_SETTING_IP6_CONFIG_SETTING_NAME
-enum                NMSettingIP6ConfigError;
-#define             NM_SETTING_IP6_CONFIG_ERROR
-GQuark              nm_setting_ip6_config_error_quark   (void);
-#define             NM_SETTING_IP6_CONFIG_METHOD
-#define             NM_SETTING_IP6_CONFIG_DNS
-#define             NM_SETTING_IP6_CONFIG_DNS_SEARCH
-#define             NM_SETTING_IP6_CONFIG_ADDRESSES
-#define             NM_SETTING_IP6_CONFIG_ROUTES
-#define             NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES
-#define             NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS
-#define             NM_SETTING_IP6_CONFIG_NEVER_DEFAULT
-#define             NM_SETTING_IP6_CONFIG_MAY_FAIL
-#define             NM_SETTING_IP6_CONFIG_IP6_PRIVACY
-#define             NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME
-#define             NM_SETTING_IP6_CONFIG_METHOD_IGNORE
-#define             NM_SETTING_IP6_CONFIG_METHOD_AUTO
-#define             NM_SETTING_IP6_CONFIG_METHOD_DHCP
-#define             NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL
-#define             NM_SETTING_IP6_CONFIG_METHOD_MANUAL
-#define             NM_SETTING_IP6_CONFIG_METHOD_SHARED
-enum                NMSettingIP6ConfigPrivacy;
-typedef             NMIP6Address;
-NMIP6Address *      nm_ip6_address_new                  (void);
-NMIP6Address *      nm_ip6_address_dup                  (NMIP6Address *source);
-void                nm_ip6_address_ref                  (NMIP6Address *address);
-void                nm_ip6_address_unref                (NMIP6Address *address);
-gboolean            nm_ip6_address_compare              (NMIP6Address *address,
-                                                         NMIP6Address *other);
-const struct in6_addr * nm_ip6_address_get_address      (NMIP6Address *address);
-void                nm_ip6_address_set_address          (NMIP6Address *address,
-                                                         const struct in6_addr *addr);
-guint32             nm_ip6_address_get_prefix           (NMIP6Address *address);
-void                nm_ip6_address_set_prefix           (NMIP6Address *address,
-                                                         guint32 prefix);
-const struct in6_addr * nm_ip6_address_get_gateway      (NMIP6Address *address);
-void                nm_ip6_address_set_gateway          (NMIP6Address *address,
-                                                         const struct in6_addr *gateway);
-typedef             NMIP6Route;
-NMIP6Route *        nm_ip6_route_new                    (void);
-NMIP6Route *        nm_ip6_route_dup                    (NMIP6Route *source);
-void                nm_ip6_route_ref                    (NMIP6Route *route);
-void                nm_ip6_route_unref                  (NMIP6Route *route);
-gboolean            nm_ip6_route_compare                (NMIP6Route *route,
-                                                         NMIP6Route *other);
-const struct in6_addr * nm_ip6_route_get_dest           (NMIP6Route *route);
-void                nm_ip6_route_set_dest               (NMIP6Route *route,
-                                                         const struct in6_addr *dest);
-guint32             nm_ip6_route_get_prefix             (NMIP6Route *route);
-void                nm_ip6_route_set_prefix             (NMIP6Route *route,
-                                                         guint32 prefix);
-const struct in6_addr * nm_ip6_route_get_next_hop       (NMIP6Route *route);
-void                nm_ip6_route_set_next_hop           (NMIP6Route *route,
-                                                         const struct in6_addr *next_hop);
-guint32             nm_ip6_route_get_metric             (NMIP6Route *route);
-void                nm_ip6_route_set_metric             (NMIP6Route *route,
-                                                         guint32 metric);
-                    NMSettingIP6Config;
-                    NMSettingIP6ConfigClass;
-NMSetting *         nm_setting_ip6_config_new           (void);
-const char *        nm_setting_ip6_config_get_method    (NMSettingIP6Config *setting);
-guint32             nm_setting_ip6_config_get_num_dns   (NMSettingIP6Config *setting);
-const struct in6_addr * nm_setting_ip6_config_get_dns   (NMSettingIP6Config *setting,
-                                                         guint32 i);
-gboolean            nm_setting_ip6_config_add_dns       (NMSettingIP6Config *setting,
-                                                         const struct in6_addr *dns);
-void                nm_setting_ip6_config_remove_dns    (NMSettingIP6Config *setting,
-                                                         guint32 i);
-void                nm_setting_ip6_config_clear_dns     (NMSettingIP6Config *setting);
-guint32             nm_setting_ip6_config_get_num_dns_searches
-                                                        (NMSettingIP6Config *setting);
-const char *        nm_setting_ip6_config_get_dns_search
-                                                        (NMSettingIP6Config *setting,
-                                                         guint32 i);
-gboolean            nm_setting_ip6_config_add_dns_search
-                                                        (NMSettingIP6Config *setting,
-                                                         const char *dns_search);
-void                nm_setting_ip6_config_remove_dns_search
-                                                        (NMSettingIP6Config *setting,
-                                                         guint32 i);
-void                nm_setting_ip6_config_clear_dns_searches
-                                                        (NMSettingIP6Config *setting);
-guint32             nm_setting_ip6_config_get_num_addresses
-                                                        (NMSettingIP6Config *setting);
-NMIP6Address *      nm_setting_ip6_config_get_address   (NMSettingIP6Config *setting,
-                                                         guint32 i);
-gboolean            nm_setting_ip6_config_add_address   (NMSettingIP6Config *setting,
-                                                         NMIP6Address *address);
-void                nm_setting_ip6_config_remove_address
-                                                        (NMSettingIP6Config *setting,
-                                                         guint32 i);
-void                nm_setting_ip6_config_clear_addresses
-                                                        (NMSettingIP6Config *setting);
-guint32             nm_setting_ip6_config_get_num_routes
-                                                        (NMSettingIP6Config *setting);
-NMIP6Route *        nm_setting_ip6_config_get_route     (NMSettingIP6Config *setting,
-                                                         guint32 i);
-gboolean            nm_setting_ip6_config_add_route     (NMSettingIP6Config *setting,
-                                                         NMIP6Route *route);
-void                nm_setting_ip6_config_remove_route  (NMSettingIP6Config *setting,
-                                                         guint32 i);
-void                nm_setting_ip6_config_clear_routes  (NMSettingIP6Config *setting);
-gboolean            nm_setting_ip6_config_get_ignore_auto_routes
-                                                        (NMSettingIP6Config *setting);
-gboolean            nm_setting_ip6_config_get_ignore_auto_dns
-                                                        (NMSettingIP6Config *setting);
-const char *        nm_setting_ip6_config_get_dhcp_hostname
-                                                        (NMSettingIP6Config *setting);
-gboolean            nm_setting_ip6_config_get_never_default
-                                                        (NMSettingIP6Config *setting);
-gboolean            nm_setting_ip6_config_get_may_fail  (NMSettingIP6Config *setting);
-NMSettingIP6ConfigPrivacy nm_setting_ip6_config_get_ip6_privacy
-                                                        (NMSettingIP6Config *setting);
-

-

 

-
Object Hierarchy

-
-  GEnum
-   +----NMSettingIP6ConfigError
-

-
-  GEnum
-   +----NMSettingIP6ConfigPrivacy
-

-
-  GBoxed
-   +----NMIP6Address
-

-
-  GBoxed
-   +----NMIP6Route
-

-
-  GObject
-   +----NMSetting
-         +----NMSettingIP6Config
-

+
Functions

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





+GQuark
+
+nm_setting_ip6_config_error_quark ()
+

+NMIP6Address *
+
+nm_ip6_address_new ()
+

+NMIP6Address *
+
+nm_ip6_address_dup ()
+

+void
+
+nm_ip6_address_ref ()
+

+void
+
+nm_ip6_address_unref ()
+

+gboolean
+
+nm_ip6_address_compare ()
+
const struct in6_addr *
+
+nm_ip6_address_get_address ()
+

+void
+
+nm_ip6_address_set_address ()
+

+guint32
+
+nm_ip6_address_get_prefix ()
+

+void
+
+nm_ip6_address_set_prefix ()
+
const struct in6_addr *
+
+nm_ip6_address_get_gateway ()
+

+void
+
+nm_ip6_address_set_gateway ()
+

+NMIP6Route *
+
+nm_ip6_route_new ()
+

+NMIP6Route *
+
+nm_ip6_route_dup ()
+

+void
+
+nm_ip6_route_ref ()
+

+void
+
+nm_ip6_route_unref ()
+

+gboolean
+
+nm_ip6_route_compare ()
+
const struct in6_addr *
+
+nm_ip6_route_get_dest ()
+

+void
+
+nm_ip6_route_set_dest ()
+

+guint32
+
+nm_ip6_route_get_prefix ()
+

+void
+
+nm_ip6_route_set_prefix ()
+
const struct in6_addr *
+
+nm_ip6_route_get_next_hop ()
+

+void
+
+nm_ip6_route_set_next_hop ()
+

+guint32
+
+nm_ip6_route_get_metric ()
+

+void
+
+nm_ip6_route_set_metric ()
+

+NMSetting *
+
+nm_setting_ip6_config_new ()
+
const char *
+
+nm_setting_ip6_config_get_method ()
+

+guint32
+
+nm_setting_ip6_config_get_num_dns ()
+
const struct in6_addr *
+
+nm_setting_ip6_config_get_dns ()
+

+gboolean
+
+nm_setting_ip6_config_add_dns ()
+

+void
+
+nm_setting_ip6_config_remove_dns ()
+

+void
+
+nm_setting_ip6_config_clear_dns ()
+

+guint32
+
+nm_setting_ip6_config_get_num_dns_searches ()
+
const char *
+
+nm_setting_ip6_config_get_dns_search ()
+

+gboolean
+
+nm_setting_ip6_config_add_dns_search ()
+

+void
+
+nm_setting_ip6_config_remove_dns_search ()
+

+void
+
+nm_setting_ip6_config_clear_dns_searches ()
+

+guint32
+
+nm_setting_ip6_config_get_num_addresses ()
+

+NMIP6Address *
+
+nm_setting_ip6_config_get_address ()
+

+gboolean
+
+nm_setting_ip6_config_add_address ()
+

+void
+
+nm_setting_ip6_config_remove_address ()
+

+void
+
+nm_setting_ip6_config_clear_addresses ()
+

+guint32
+
+nm_setting_ip6_config_get_num_routes ()
+

+NMIP6Route *
+
+nm_setting_ip6_config_get_route ()
+

+gboolean
+
+nm_setting_ip6_config_add_route ()
+

+void
+
+nm_setting_ip6_config_remove_route ()
+

+void
+
+nm_setting_ip6_config_clear_routes ()
+

+gboolean
+
+nm_setting_ip6_config_get_ignore_auto_routes ()
+

+gboolean
+
+nm_setting_ip6_config_get_ignore_auto_dns ()
+
const char *
+
+nm_setting_ip6_config_get_dhcp_hostname ()
+

+gboolean
+
+nm_setting_ip6_config_get_never_default ()
+

+gboolean
+
+nm_setting_ip6_config_get_may_fail ()
+

+NMSettingIP6ConfigPrivacy
+
+nm_setting_ip6_config_get_ip6_privacy ()
+

 

 

 
Properties

-
-  "addresses"                GPtrArray_GValueArray_GArray_guchar_+guint+GArray_guchar___*  : Read / Write
-  "dhcp-hostname"            gchar*                : Read / Write
-  "dns"                      GPtrArray_GArray_guchar__*  : Read / Write
-  "dns-search"               GSList_gchararray_*   : Read / Write
-  "ignore-auto-dns"          gboolean              : Read / Write / Construct
-  "ignore-auto-routes"       gboolean              : Read / Write / Construct
-  "ip6-privacy"              gint                  : Read / Write / Construct
-  "may-fail"                 gboolean              : Read / Write / Construct
-  "method"                   gchar*                : Read / Write
-  "never-default"            gboolean              : Read / Write / Construct
-  "routes"                   GPtrArray_GValueArray_GArray_guchar_+guint+GArray_guchar_+guint__*  : Read / Write
-

-

-

-
Description

-

-The NMSettingIP6Config object is a NMSetting subclass that describes
-properties related to IPv6 addressing, routing, and Domain Name Service
-

-

-

-
Details

-

-
NM_SETTING_IP6_CONFIG_SETTING_NAME

-
#define NM_SETTING_IP6_CONFIG_SETTING_NAME "ipv6"
-

-

-

+

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





GPtrArray_GValueArray_GArray_guchar_+guint+GArray_guchar___*addressesRead / Write

+gchar *dhcp-hostnameRead / Write

+GPtrArray_GArray_guchar__ *dnsRead / Write

+GSList_gchararray_ *dns-searchRead / Write
gbooleanignore-auto-dnsRead / Write / Construct
gbooleanignore-auto-routesRead / Write / Construct
gintip6-privacyRead / Write / Construct
gbooleanmay-failRead / Write / Construct

+gchar *methodRead / Write
gbooleannever-defaultRead / Write / Construct
GPtrArray_GValueArray_GArray_guchar_+guint+GArray_guchar_+guint__*routesRead / Write

 

-

-

-
enum NMSettingIP6ConfigError

-
typedef enum {
-	NM_SETTING_IP6_CONFIG_ERROR_UNKNOWN = 0,           /*< nick=UnknownError >*/
-	NM_SETTING_IP6_CONFIG_ERROR_INVALID_PROPERTY,      /*< nick=InvalidProperty >*/
-	NM_SETTING_IP6_CONFIG_ERROR_MISSING_PROPERTY,      /*< nick=MissingProperty >*/
-	NM_SETTING_IP6_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD /*< nick=NotAllowedForMethod >*/
-} NMSettingIP6ConfigError;
-

-

+

+
Types and Values

+
--++
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+

 




 
 
 
NM_SETTING_IP6_CONFIG_ERROR_UNKNOWN
unknown or unclassified error
-#defineNM_SETTING_IP6_CONFIG_SETTING_NAME
 

 
NM_SETTING_IP6_CONFIG_ERROR_INVALID_PROPERTY
the property was invalid
-enumNMSettingIP6ConfigError
 

 
NM_SETTING_IP6_CONFIG_ERROR_MISSING_PROPERTY
the property was missing and is
-required
-#defineNM_SETTING_IP6_CONFIG_ERROR
#defineNM_SETTING_IP6_CONFIG_METHOD
#defineNM_SETTING_IP6_CONFIG_DNS
#defineNM_SETTING_IP6_CONFIG_DNS_SEARCH
#defineNM_SETTING_IP6_CONFIG_ADDRESSES
#defineNM_SETTING_IP6_CONFIG_ROUTES
#defineNM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES
#defineNM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS
#defineNM_SETTING_IP6_CONFIG_NEVER_DEFAULT
#defineNM_SETTING_IP6_CONFIG_MAY_FAIL
#defineNM_SETTING_IP6_CONFIG_IP6_PRIVACY
#defineNM_SETTING_IP6_CONFIG_DHCP_HOSTNAME
#defineNM_SETTING_IP6_CONFIG_METHOD_IGNORE
#defineNM_SETTING_IP6_CONFIG_METHOD_AUTO
#defineNM_SETTING_IP6_CONFIG_METHOD_DHCP
#defineNM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL
#defineNM_SETTING_IP6_CONFIG_METHOD_MANUAL
#defineNM_SETTING_IP6_CONFIG_METHOD_SHARED
 

 
NM_SETTING_IP6_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD
the property's value is
-not valid with the given IPv6 method
-enumNMSettingIP6ConfigPrivacy
 

 
 

 

+

+
Object Hierarchy

+
    GBoxed
+    ├── NMIP6Address
+    ╰── NMIP6Route
+    GEnum
+    ├── NMSettingIP6ConfigError
+    ╰── NMSettingIP6ConfigPrivacy
+    GObject
+    ╰── NMSetting
+        ╰── NMSettingIP6Config
+

+

+

+
Includes

+
#include <nm-setting-ip6-config.h>
+

+

+

+
Description

+
The NMSettingIP6Config object is a NMSetting subclass that describes
+properties related to IPv6 addressing, routing, and Domain Name Service

+

+

+
Functions

+

+
nm_setting_ip6_config_error_quark ()

+
GQuark
+nm_setting_ip6_config_error_quark (void);

+
Registers an error quark for NMSettingIP6Config if necessary.

+

+
Returns

+
 the error quark used for NMSettingIP6Config errors.

+

+

+

 

 

-
NM_SETTING_IP6_CONFIG_ERROR

-
#define NM_SETTING_IP6_CONFIG_ERROR nm_setting_ip6_config_error_quark ()
-

-

-

+
nm_ip6_address_new ()

+
NMIP6Address *
+nm_ip6_address_new (void);

+
Creates and returns a new NMIP6Address object.

+

+
Returns

+
 the new empty NMIP6Address object. 

+
[transfer full]

+

 

 

 

-
nm_setting_ip6_config_error_quark ()

-
GQuark              nm_setting_ip6_config_error_quark   (void);

-

-Registers an error quark for NMSettingIP6Config if necessary.
-

-

+
nm_ip6_address_dup ()

+
NMIP6Address *
+nm_ip6_address_dup (NMIP6Address *source);

+
Copies a given NMIP6Address object and returns the copy.

+

+
Parameters

+
--+++
-
-
+
+
+

 





 
 
Returns :
the error quark used for NMSettingIP6Config errors.
source
the NMIP6Address object to copy
 
 

 

 

-

-

-
NM_SETTING_IP6_CONFIG_METHOD

-
#define NM_SETTING_IP6_CONFIG_METHOD             "method"
-

-

-

+

+
Returns

+
 the copy of the given NMIP6Address copy. 

+
[transfer full]

 

-

-

-
NM_SETTING_IP6_CONFIG_DNS

-
#define NM_SETTING_IP6_CONFIG_DNS                "dns"
-

-

-

 

 

 

-
NM_SETTING_IP6_CONFIG_DNS_SEARCH

-
#define NM_SETTING_IP6_CONFIG_DNS_SEARCH         "dns-search"
-

-

-

+
nm_ip6_address_ref ()

+
void
+nm_ip6_address_ref (NMIP6Address *address);

+
Increases the reference count of the object.

+

+
Parameters

+

+++++
+
+
+
+
+
+





address
the NMIP6Address
 

 

-

-

-
NM_SETTING_IP6_CONFIG_ADDRESSES

-
#define NM_SETTING_IP6_CONFIG_ADDRESSES          "addresses"
-

-

-

 

 

 

-
NM_SETTING_IP6_CONFIG_ROUTES

-
#define NM_SETTING_IP6_CONFIG_ROUTES             "routes"
-

-

-

+
nm_ip6_address_unref ()

+
void
+nm_ip6_address_unref (NMIP6Address *address);

+
Decreases the reference count of the object.  If the reference count
+reaches zero, the object will be destroyed.

+

+
Parameters

+

+++++
+
+
+
+
+
+





address
the NMIP6Address
 

 

-

-

-
NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES

-
#define NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES "ignore-auto-routes"
-

-

-

 

 

 

-
NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS

-
#define NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS    "ignore-auto-dns"
-

-

-

+
nm_ip6_address_compare ()

+
gboolean
+nm_ip6_address_compare (NMIP6Address *address,
+                        NMIP6Address *other);

+
Determines if two NMIP6Address objects contain the same values.

+

+
Parameters

+

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+





address
the NMIP6Address
 
other
the NMIP6Address to compare address
+to.
 

 

-

-

-
NM_SETTING_IP6_CONFIG_NEVER_DEFAULT

-
#define NM_SETTING_IP6_CONFIG_NEVER_DEFAULT      "never-default"
-

-

-

+

+
Returns

+
 TRUE if the objects contain the same values, FALSE if they do not.

+

 

-

-

-
NM_SETTING_IP6_CONFIG_MAY_FAIL

-
#define NM_SETTING_IP6_CONFIG_MAY_FAIL           "may-fail"
-

-

-

 

 

 

-
NM_SETTING_IP6_CONFIG_IP6_PRIVACY

-
#define NM_SETTING_IP6_CONFIG_IP6_PRIVACY        "ip6-privacy"
-

-

-

+
nm_ip6_address_get_address ()

+
const struct in6_addr *
+nm_ip6_address_get_address (NMIP6Address *address);

+
Gets the IPv6 address property of this address object.

+

+
Parameters

+

+++++
+
+
+
+
+
+





address
the NMIP6Address
 

 

-

-

-
NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME

-
#define NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME      "dhcp-hostname"
-

-

-

+

+
Returns

+
         the IPv6 address. 

+
[array fixed-size=16][element-type guint8][transfer none]

 

-

-

-
NM_SETTING_IP6_CONFIG_METHOD_IGNORE

-
#define NM_SETTING_IP6_CONFIG_METHOD_IGNORE     "ignore"
-

-

-IPv6 is not required or is handled by some other mechanism, and NetworkManager
-should not configure IPv6 for this connection.
-

 

 

 

-
NM_SETTING_IP6_CONFIG_METHOD_AUTO

-
#define NM_SETTING_IP6_CONFIG_METHOD_AUTO       "auto"
-

-

-IPv6 configuration should be automatically determined via a method appropriate
-for the hardware interface, ie router advertisements, DHCP, or PPP or some
-other device-specific manner.
-

+
nm_ip6_address_set_address ()

+
void
+nm_ip6_address_set_address (NMIP6Address *address,
+                            const struct in6_addr *addr);

+
Sets the IPv6 address property of this object.

+

+
Parameters

+

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+





address
the NMIP6Address
 
addr
the IPv6 address
 

 

-

-

-
NM_SETTING_IP6_CONFIG_METHOD_DHCP

-
#define NM_SETTING_IP6_CONFIG_METHOD_DHCP       "dhcp"
-

-

-IPv6 configuration should be automatically determined via DHCPv6 only and
-router advertisements should be ignored.
-

 

 

 

-
NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL

-
#define NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL "link-local"
-

-

-IPv6 configuration should be automatically configured for link-local-only
-operation.
-

+
nm_ip6_address_get_prefix ()

+
guint32
+nm_ip6_address_get_prefix (NMIP6Address *address);

+
Gets the IPv6 address prefix property of this address object.

+

+
Parameters

+

+++++
+
+
+
+
+
+





address
the NMIP6Address
 

 

-

-

-
NM_SETTING_IP6_CONFIG_METHOD_MANUAL

-
#define NM_SETTING_IP6_CONFIG_METHOD_MANUAL     "manual"
-

-

-All necessary IPv6 configuration (addresses, prefix, DNS, etc) is specified
-in the setting's properties.
-

+

+
Returns

+
 the IPv6 address prefix

+

 

-

-

-
NM_SETTING_IP6_CONFIG_METHOD_SHARED

-
#define NM_SETTING_IP6_CONFIG_METHOD_SHARED     "shared"
-

-

-This connection specifies configuration that allows other computers to
-connect through it to the default network (usually the Internet).  The
-connection's interface will be assigned a private address, and router
-advertisements, a caching DNS server, and Network Address Translation (NAT)
-functionality will be started on this connection's interface to allow other
-devices to connect through that interface to the default network. (not yet
-supported for IPv6)
-

 

 

 

-
enum NMSettingIP6ConfigPrivacy

-
typedef enum {
-	NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN = -1,
-	NM_SETTING_IP6_CONFIG_PRIVACY_DISABLED = 0,
-	NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_PUBLIC_ADDR = 1,
-	NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR = 2
-} NMSettingIP6ConfigPrivacy;
-

-

-NMSettingIP6ConfigPrivacy values indicate if and how IPv6 Privacy
-Extensions are used (RFC4941).
-

-

+
nm_ip6_address_set_prefix ()

+
void
+nm_ip6_address_set_prefix (NMIP6Address *address,
+                           guint32 prefix);

+
Sets the IPv6 address prefix.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
+
+
+

 





 
 
 
NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN
unknown or no value specified
-
NM_SETTING_IP6_CONFIG_PRIVACY_DISABLED
IPv6 Privacy Extensions are disabled
-
NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_PUBLIC_ADDR
IPv6 Privacy Extensions
-are enabled, but public addresses are preferred over temporary addresses
-
address
the NMIP6Address
 
 

 
NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR
IPv6 Privacy Extensions
-are enabled and temporary addresses are preferred over public addresses
-
prefix
the address prefix, a number between 0 and 128 inclusive
 
 

 
 

 

-

-

-
NMIP6Address

-
typedef struct NMIP6Address NMIP6Address;
-

-

-

 

 

 

-
nm_ip6_address_new ()

-
NMIP6Address *      nm_ip6_address_new                  (void);

-

-Creates and returns a new NMIP6Address object.
-

-

+
nm_ip6_address_get_gateway ()

+
const struct in6_addr *
+nm_ip6_address_get_gateway (NMIP6Address *address);

+
Gets the IPv6 default gateway property of this address object.

+

+
Parameters

+
--+++
-
-
+
+
+

 





 
 
Returns :
the new empty NMIP6Address object. [transfer full]
-
address
the NMIP6Address
 
 

 

 

+

+
Returns

+
         the IPv6 gateway address. 

+
[array fixed-size=16][element-type guint8][transfer none]

+

+

 

 

-
nm_ip6_address_dup ()

-
NMIP6Address *      nm_ip6_address_dup                  (NMIP6Address *source);

-

-Copies a given NMIP6Address object and returns the copy.
-

-

+
nm_ip6_address_set_gateway ()

+
void
+nm_ip6_address_set_gateway (NMIP6Address *address,
+                            const struct in6_addr *gateway);

+
Sets the IPv6 default gateway property of this address object.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
source :
the NMIP6Address object to copy
address
the NMIP6Address
 
 

 
Returns :
the copy of the given NMIP6Address copy. [transfer full]
-
gateway
the IPv6 default gateway
 
 

 
 

 

+

 

 

-
nm_ip6_address_ref ()

-
void                nm_ip6_address_ref                  (NMIP6Address *address);

-

-Increases the reference count of the object.
-

-

+
nm_ip6_route_new ()

+
NMIP6Route *
+nm_ip6_route_new (void);

+
Creates and returns a new NMIP6Route object.

+

+
Returns

+
 the new empty NMIP6Route object. 

+
[transfer full]

+

+
+

+

+
nm_ip6_route_dup ()

+
NMIP6Route *
+nm_ip6_route_dup (NMIP6Route *source);

+
Copies a given NMIP6Route object and returns the copy.

+

+
Parameters

+
--+++
-
-
+
+
+

 





 
 
address :
the NMIP6Address
-
source
the NMIP6Route object to copy
 
 

 

 

+

+
Returns

+
 the copy of the given NMIP6Route copy. 

+
[transfer full]

+

+

 

 

-
nm_ip6_address_unref ()

-
void                nm_ip6_address_unref                (NMIP6Address *address);

-

-Decreases the reference count of the object.  If the reference count
-reaches zero, the object will be destroyed.
-

-

+
nm_ip6_route_ref ()

+
void
+nm_ip6_route_ref (NMIP6Route *route);

+
Increases the reference count of the object.

+

+
Parameters

+
--+++
-
-
+
+
+

 





 
 
address :
the NMIP6Address
-
route
the NMIP6Route
 
 

 

 

+

 

 

-
nm_ip6_address_compare ()

-
gboolean            nm_ip6_address_compare              (NMIP6Address *address,
-                                                         NMIP6Address *other);

-

-Determines if two NMIP6Address objects contain the same values.
-

-

+
nm_ip6_route_unref ()

+
void
+nm_ip6_route_unref (NMIP6Route *route);

+
Decreases the reference count of the object.  If the reference count
+reaches zero, the object will be destroyed.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
address :
the NMIP6Address
-
other :
the NMIP6Address to compare address to.
Returns :

-TRUE if the objects contain the same values, FALSE if they do not.
route
the NMIP6Route
 

 

 

+

 

 

-
nm_ip6_address_get_address ()

-
const struct in6_addr * nm_ip6_address_get_address      (NMIP6Address *address);

-

-Gets the IPv6 address property of this address object.
-

-

+
nm_ip6_route_compare ()

+
gboolean
+nm_ip6_route_compare (NMIP6Route *route,
+                      NMIP6Route *other);

+
Determines if two NMIP6Route objects contain the same values.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
address :
the NMIP6Address
-
route
the NMIP6Route
 
 

 
Returns :
the IPv6 address. [transfer none]
-
other
the NMIP6Route to compare route
+to.
 
 

 
 

 

+

+
Returns

+
 TRUE if the objects contain the same values, FALSE if they do not.

+

+

+

 

 

-
nm_ip6_address_set_address ()

-
void                nm_ip6_address_set_address          (NMIP6Address *address,
-                                                         const struct in6_addr *addr);

-

-Sets the IPv6 address property of this object.
-

-

+
nm_ip6_route_get_dest ()

+
const struct in6_addr *
+nm_ip6_route_get_dest (NMIP6Route *route);

+
Gets the IPv6 destination address property of this route object.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
address :
the NMIP6Address
-
addr :
the IPv6 address
route
the NMIP6Route
 

 

 

+

+
Returns

+
         the IPv6 address of destination. 

+
[array fixed-size=16][element-type guint8][transfer none]

+

+

 

 

-
nm_ip6_address_get_prefix ()

-
guint32             nm_ip6_address_get_prefix           (NMIP6Address *address);

-

-Gets the IPv6 address prefix property of this address object.
-

-

+
nm_ip6_route_set_dest ()

+
void
+nm_ip6_route_set_dest (NMIP6Route *route,
+                       const struct in6_addr *dest);

+
Sets the IPv6 destination address property of this route object.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
address :
the NMIP6Address
-
route
the NMIP6Route
 
 

 
Returns :
the IPv6 address prefix
dest
the destination address
 
 

 
 

 

+

+

+

+
nm_ip6_route_get_prefix ()

+
guint32
+nm_ip6_route_get_prefix (NMIP6Route *route);

+
Gets the IPv6 prefix (ie "32" or "64" etc) of this route.

+

+
Parameters

+

+++++
+
+
+
+
+
+





route
the NMIP6Route
 

+

+

+
Returns

+
 the IPv6 prefix

+

+

+

 

 

-
nm_ip6_address_set_prefix ()

-
void                nm_ip6_address_set_prefix           (NMIP6Address *address,
-                                                         guint32 prefix);

-

-Sets the IPv6 address prefix.
-

-

+
nm_ip6_route_set_prefix ()

+
void
+nm_ip6_route_set_prefix (NMIP6Route *route,
+                         guint32 prefix);

+
Sets the IPv6 prefix of this route.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
address :
the NMIP6Address
-
route
the NMIP6Route
 
 

 
prefix :
the address prefix, a number between 0 and 128 inclusive
prefix
the prefix, a number between 1 and 128 inclusive
 
 

 
 

 

+

 

 

-
nm_ip6_address_get_gateway ()

-
const struct in6_addr * nm_ip6_address_get_gateway      (NMIP6Address *address);

-

-Gets the IPv6 default gateway property of this address object.
-

-

+
nm_ip6_route_get_next_hop ()

+
const struct in6_addr *
+nm_ip6_route_get_next_hop (NMIP6Route *route);

+
Gets the IPv6 address of the next hop of this route.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
address :
the NMIP6Address
-
Returns :
the IPv6 gateway address. [transfer none]
-
route
the NMIP6Route
 

 

 

+

+
Returns

+
         the IPv6 address of next hop. 

+
[array fixed-size=16][element-type guint8][transfer none]

+

+

 

 

-
nm_ip6_address_set_gateway ()

-
void                nm_ip6_address_set_gateway          (NMIP6Address *address,
-                                                         const struct in6_addr *gateway);

-

-Sets the IPv6 default gateway property of this address object.
-

-

+
nm_ip6_route_set_next_hop ()

+
void
+nm_ip6_route_set_next_hop (NMIP6Route *route,
+                           const struct in6_addr *next_hop);

+
Sets the IPv6 address of the next hop of this route.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
address :
the NMIP6Address
-
route
the NMIP6Route
 
 

 
gateway :
the IPv6 default gateway
next_hop
the IPv6 address of the next hop
 
 

 
 

 

-

-

-
NMIP6Route

-
typedef struct NMIP6Route NMIP6Route;
-

-

-

 

 

 

-
nm_ip6_route_new ()

-
NMIP6Route *        nm_ip6_route_new                    (void);

-

-Creates and returns a new NMIP6Route object.
-

-

+
nm_ip6_route_get_metric ()

+
guint32
+nm_ip6_route_get_metric (NMIP6Route *route);

+
Gets the route metric property of this route object; lower values indicate
+"better" or more preferred routes.

+

+
Parameters

+
--+++
-
-
+
+
+

 





 
 
Returns :
the new empty NMIP6Route object. [transfer full]
-
route
the NMIP6Route
 
 

 

 

+

+
Returns

+
 the route metric

+

+

+

 

 

-
nm_ip6_route_dup ()

-
NMIP6Route *        nm_ip6_route_dup                    (NMIP6Route *source);

-

-Copies a given NMIP6Route object and returns the copy.
-

-

+
nm_ip6_route_set_metric ()

+
void
+nm_ip6_route_set_metric (NMIP6Route *route,
+                         guint32 metric);

+
Sets the route metric property of this route object; lower values indicate
+"better" or more preferred routes.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
source :
the NMIP6Route object to copy
route
the NMIP6Route
 
 

 
Returns :
the copy of the given NMIP6Route copy. [transfer full]
-
metric
the route metric
 
 

 
 

 

+

 

 

-
nm_ip6_route_ref ()

-
void                nm_ip6_route_ref                    (NMIP6Route *route);

-

-Increases the reference count of the object.
-

-

+
nm_setting_ip6_config_new ()

+
NMSetting *
+nm_setting_ip6_config_new (void);

+
Creates a new NMSettingIP6Config object with default values.

+

+
Returns

+
 the new empty NMSettingIP6Config object. 

+
[transfer full]

+

+
+

+

+
nm_setting_ip6_config_get_method ()

+
const char *
+nm_setting_ip6_config_get_method (NMSettingIP6Config *setting);

+

+
Parameters

+
--+++
-
-
+
+
+

 





 
 
route :
the NMIP6Route
-
setting
the NMSettingIP6Config
 
 

 

 

+

+
Returns

+
 the “method” property of the setting

+

+

+

 

 

-
nm_ip6_route_unref ()

-
void                nm_ip6_route_unref                  (NMIP6Route *route);

-

-Decreases the reference count of the object.  If the reference count
-reaches zero, the object will be destroyed.
-

-

+
nm_setting_ip6_config_get_num_dns ()

+
guint32
+nm_setting_ip6_config_get_num_dns (NMSettingIP6Config *setting);

+

+
Parameters

+
--+++
-
-
+
+
+

 





 
 
route :
the NMIP6Route
-
setting
the NMSettingIP6Config
 
 

 

 

+

+
Returns

+
 the number of configured DNS servers

+

+

+
 

 

-
nm_ip6_route_compare ()

-
gboolean            nm_ip6_route_compare                (NMIP6Route *route,
-                                                         NMIP6Route *other);

-

-Determines if two NMIP6Route objects contain the same values.
-

-

+
nm_setting_ip6_config_get_dns ()

+
const struct in6_addr *
+nm_setting_ip6_config_get_dns (NMSettingIP6Config *setting,
+                               guint32 i);

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+

 





 
 
 
route :
the NMIP6Route
-
other :
the NMIP6Route to compare route to.
setting
the NMSettingIP6Config
 
 

 
Returns :

-TRUE if the objects contain the same values, FALSE if they do not.
i
index number of the DNS server to return
 
 

 
 

 

+

+
Returns

+
 the IPv6 address of the DNS server at index i
+. 

+
[transfer none]

+

+
 

 

-
nm_ip6_route_get_dest ()

-
const struct in6_addr * nm_ip6_route_get_dest           (NMIP6Route *route);

-

-Gets the IPv6 destination address property of this route object.
-

-

+
nm_setting_ip6_config_add_dns ()

+
gboolean
+nm_setting_ip6_config_add_dns (NMSettingIP6Config *setting,
+                               const struct in6_addr *dns);

+
Adds a new DNS server to the setting.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
route :
the NMIP6Route
-
setting
the NMSettingIP6Config
 
 

 
Returns :
the IPv6 address
dns
the IPv6 address of the DNS server to add
 
 

 
 

 

+

+
Returns

+
 TRUE if the DNS server was added; FALSE if the server was already
+known

+

+

+
 

 

-
nm_ip6_route_set_dest ()

-
void                nm_ip6_route_set_dest               (NMIP6Route *route,
-                                                         const struct in6_addr *dest);

-

-Sets the IPv6 destination address property of this route object.
-

-

+
nm_setting_ip6_config_remove_dns ()

+
void
+nm_setting_ip6_config_remove_dns (NMSettingIP6Config *setting,
+                                  guint32 i);

+
Removes the DNS server at index i
+.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
route :
the NMIP6Route
-
setting
the NMSettingIP6Config
 
 

 
dest :
the destination address
i
index number of the DNS server to remove
 
 

 
 

 

+
 

 

-
nm_ip6_route_get_prefix ()

-
guint32             nm_ip6_route_get_prefix             (NMIP6Route *route);

-

-Gets the IPv6 prefix (ie "32" or "64" etc) of this route.
-

-

+
nm_setting_ip6_config_clear_dns ()

+
void
+nm_setting_ip6_config_clear_dns (NMSettingIP6Config *setting);

+
Removes all configured DNS servers.

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingIP6Config
 

+

+
+

+

+
nm_setting_ip6_config_get_num_dns_searches ()

+
guint32
+nm_setting_ip6_config_get_num_dns_searches
+                               (NMSettingIP6Config *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingIP6Config
 

+

+

+
Returns

+
 the number of configured DNS search domains

+

+

+

+

+

+
nm_setting_ip6_config_get_dns_search ()

+
const char *
+nm_setting_ip6_config_get_dns_search (NMSettingIP6Config *setting,
+                                      guint32 i);

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
route :
the NMIP6Route
-
setting
the NMSettingIP6Config
 
 

 
Returns :
the IPv6 prefix
i
index number of the DNS search domain to return
 
 

 
 

 

+

+
Returns

+
 the DNS search domain at index i
+

+

+

+

 

 

-
nm_ip6_route_set_prefix ()

-
void                nm_ip6_route_set_prefix             (NMIP6Route *route,
-                                                         guint32 prefix);

-

-Sets the IPv6 prefix of this route.
-

-

+
nm_setting_ip6_config_add_dns_search ()

+
gboolean
+nm_setting_ip6_config_add_dns_search (NMSettingIP6Config *setting,
+                                      const char *dns_search);

+
Adds a new DNS search domain to the setting.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
route :
the NMIP6Route
-
setting
the NMSettingIP6Config
 
 

 
prefix :
the prefix, a number between 1 and 128 inclusive
dns_search
the search domain to add
 
 

 
 

 

+

+
Returns

+
 TRUE if the DNS search domain was added; FALSE if the search
+domain was already known

+

+

+
 

 

-
nm_ip6_route_get_next_hop ()

-
const struct in6_addr * nm_ip6_route_get_next_hop       (NMIP6Route *route);

-

-Gets the IPv6 address of the next hop of this route.
-

-

+
nm_setting_ip6_config_remove_dns_search ()

+
void
+nm_setting_ip6_config_remove_dns_search
+                               (NMSettingIP6Config *setting,
+                                guint32 i);

+
Removes the DNS search domain at index i
+.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
route :
the NMIP6Route
-
setting
the NMSettingIP6Config
 
 

 
Returns :
the IPv6 address
i
index number of the DNS search domain
 
 

 
 

 

+
 

 

-
nm_ip6_route_set_next_hop ()

-
void                nm_ip6_route_set_next_hop           (NMIP6Route *route,
-                                                         const struct in6_addr *next_hop);

-

-Sets the IPv6 address of the next hop of this route.
-

-

+
nm_setting_ip6_config_clear_dns_searches ()

+
void
+nm_setting_ip6_config_clear_dns_searches
+                               (NMSettingIP6Config *setting);

+
Removes all configured DNS search domains.

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingIP6Config
 

+

+
+

+

+
nm_setting_ip6_config_get_num_addresses ()

+
guint32
+nm_setting_ip6_config_get_num_addresses
+                               (NMSettingIP6Config *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingIP6Config
 

+

+

+
Returns

+
 the number of configured addresses

+

+

+

+

+

+
nm_setting_ip6_config_get_address ()

+
NMIP6Address *
+nm_setting_ip6_config_get_address (NMSettingIP6Config *setting,
+                                   guint32 i);

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
route :
the NMIP6Route
-
setting
the NMSettingIP6Config
 
 

 
next_hop :
the IPv6 address of the next hop
i
index number of the address to return
 
 

 
 

 

+

+
Returns

+
 the address at index i
+

+

+

+

 

 

-
nm_ip6_route_get_metric ()

-
guint32             nm_ip6_route_get_metric             (NMIP6Route *route);

-

-Gets the route metric property of this route object; lower values indicate
-"better" or more preferred routes.
-

-

+
nm_setting_ip6_config_add_address ()

+
gboolean
+nm_setting_ip6_config_add_address (NMSettingIP6Config *setting,
+                                   NMIP6Address *address);

+
Adds a new IPv6 address and associated information to the setting.  The
+given address is duplicated internally and is not changed by this function.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
route :
the NMIP6Route
-
setting
the NMSettingIP6Config
 
 

 
Returns :
the route metric
address
the new address to add
 
 

 
 

 

+

+
Returns

+
 TRUE if the address was added; FALSE if the address was already
+known.

+

+

+
 

 

-
nm_ip6_route_set_metric ()

-
void                nm_ip6_route_set_metric             (NMIP6Route *route,
-                                                         guint32 metric);

-

-Sets the route metric property of this route object; lower values indicate
-"better" or more preferred routes.
-

-

+
nm_setting_ip6_config_remove_address ()

+
void
+nm_setting_ip6_config_remove_address (NMSettingIP6Config *setting,
+                                      guint32 i);

+
Removes the address at index i
+.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
route :
the NMIP6Route
-
setting
the NMSettingIP6Config
 
 

 
metric :
the route metric
i
index number of the address to remove
 
 

 
 

 

-

-

-
NMSettingIP6Config

-
typedef struct _NMSettingIP6Config NMSettingIP6Config;

-

-

-

-

-

-
NMSettingIP6ConfigClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingIP6ConfigClass;
-

-

-

 

 

 

-
nm_setting_ip6_config_new ()

-
NMSetting *         nm_setting_ip6_config_new           (void);

-

-Creates a new NMSettingIP6Config object with default values.
-

-

+
nm_setting_ip6_config_clear_addresses ()

+
void
+nm_setting_ip6_config_clear_addresses (NMSettingIP6Config *setting);

+
Removes all configured addresses.

+

+
Parameters

+
--+++
-
-
+
+
+

 





 
 
Returns :
the new empty NMSettingIP6Config object. [transfer full]
-
setting
the NMSettingIP6Config
 
 

 

 

+
 

 

-
nm_setting_ip6_config_get_method ()

-
const char *        nm_setting_ip6_config_get_method    (NMSettingIP6Config *setting);

-

+
nm_setting_ip6_config_get_num_routes ()

+
guint32
+nm_setting_ip6_config_get_num_routes (NMSettingIP6Config *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingIP6Config
-
Returns :
the "method" property of the setting
setting
the NMSettingIP6Config
 

 

 

+

+
Returns

+
 the number of configured routes

+

+

+
 

 

-
nm_setting_ip6_config_get_num_dns ()

-
guint32             nm_setting_ip6_config_get_num_dns   (NMSettingIP6Config *setting);

-

+
nm_setting_ip6_config_get_route ()

+
NMIP6Route *
+nm_setting_ip6_config_get_route (NMSettingIP6Config *setting,
+                                 guint32 i);

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingIP6Config
-
setting
the NMSettingIP6Config
 
 

 
Returns :
the number of configured DNS servers
i
index number of the route to return
 
 

 
 

 

+

+
Returns

+
 the route at index i
+

+

+

+
 

 

-
nm_setting_ip6_config_get_dns ()

-
const struct in6_addr * nm_setting_ip6_config_get_dns   (NMSettingIP6Config *setting,
-                                                         guint32 i);

-

+
nm_setting_ip6_config_add_route ()

+
gboolean
+nm_setting_ip6_config_add_route (NMSettingIP6Config *setting,
+                                 NMIP6Route *route);

+
Adds a new IPv6 route and associated information to the setting.  The
+given route is duplicated internally and is not changed by this function.

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingIP6Config
-
i :
index number of the DNS server to return
setting
the NMSettingIP6Config
 
 

 
Returns :
the IPv6 address of the DNS server at index i. [transfer none]
-
route
the route to add
 
 

 
 

 

+

+
Returns

+
 TRUE if the route was added; FALSE if the route was already known.

+

+

+
 

 

-
nm_setting_ip6_config_add_dns ()

-
gboolean            nm_setting_ip6_config_add_dns       (NMSettingIP6Config *setting,
-                                                         const struct in6_addr *dns);

-

-Adds a new DNS server to the setting.
-

-

+
nm_setting_ip6_config_remove_route ()

+
void
+nm_setting_ip6_config_remove_route (NMSettingIP6Config *setting,
+                                    guint32 i);

+
Removes the route at index i
+.

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingIP6Config
-
dns :
the IPv6 address of the DNS server to add
setting
the NMSettingIP6Config
 
 

 
Returns :

-TRUE if the DNS server was added; FALSE if the server was already
-known
i
index number of the route
 
 

 
 

 

+
 

 

-
nm_setting_ip6_config_remove_dns ()

-
void                nm_setting_ip6_config_remove_dns    (NMSettingIP6Config *setting,
-                                                         guint32 i);

-

-Removes the DNS server at index i.
-

-

+
nm_setting_ip6_config_clear_routes ()

+
void
+nm_setting_ip6_config_clear_routes (NMSettingIP6Config *setting);

+
Removes all configured routes.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingIP6Config
-
i :
index number of the DNS server to remove
setting
the NMSettingIP6Config
 

 

 

+
 

 

-
nm_setting_ip6_config_clear_dns ()

-
void                nm_setting_ip6_config_clear_dns     (NMSettingIP6Config *setting);

-

-Removes all configured DNS servers.
-

-

+
nm_setting_ip6_config_get_ignore_auto_routes ()

+
gboolean
+nm_setting_ip6_config_get_ignore_auto_routes
+                               (NMSettingIP6Config *setting);

+
Returns the value contained in the “ignore-auto-routes”
+property.

+

+
Parameters

+
--+++
-
-
+
+
+

 





 
 
setting :
the NMSettingIP6Config
-
setting
the NMSettingIP6Config
 
 

 

 

+

+
Returns

+
 TRUE if automatically configured (ie via DHCP) routes should be
+ignored.

+

+

+
 

 

-
nm_setting_ip6_config_get_num_dns_searches ()

-
guint32             nm_setting_ip6_config_get_num_dns_searches
-                                                        (NMSettingIP6Config *setting);

-

+
nm_setting_ip6_config_get_ignore_auto_dns ()

+
gboolean
+nm_setting_ip6_config_get_ignore_auto_dns
+                               (NMSettingIP6Config *setting);

+
Returns the value contained in the “ignore-auto-dns”
+property.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingIP6Config
-
Returns :
the number of configured DNS search domains
setting
the NMSettingIP6Config
 

 

 

+

+
Returns

+
 TRUE if automatically configured (ie via DHCP or router
+advertisements) DNS information should be ignored.

+

+

+
 

 

-
nm_setting_ip6_config_get_dns_search ()

-
const char *        nm_setting_ip6_config_get_dns_search
-                                                        (NMSettingIP6Config *setting,
-                                                         guint32 i);

-

+
nm_setting_ip6_config_get_dhcp_hostname ()

+
const char *
+nm_setting_ip6_config_get_dhcp_hostname
+                               (NMSettingIP6Config *setting);

+
Returns the value contained in the “dhcp-hostname”
+property.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingIP6Config
-
i :
index number of the DNS search domain to return
Returns :
the DNS search domain at index i
-
setting
the NMSettingIP6Config
 

 

 

+

+
Returns

+
 the configured hostname to send to the DHCP server

+

+

+
Since 0.9.8

+
 

 

-
nm_setting_ip6_config_add_dns_search ()

-
gboolean            nm_setting_ip6_config_add_dns_search
-                                                        (NMSettingIP6Config *setting,
-                                                         const char *dns_search);

-

-Adds a new DNS search domain to the setting.
-

-

+
nm_setting_ip6_config_get_never_default ()

+
gboolean
+nm_setting_ip6_config_get_never_default
+                               (NMSettingIP6Config *setting);

+
Returns the value contained in the “never-default”
+property.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingIP6Config
-
dns_search :
the search domain to add
Returns :

-TRUE if the DNS search domain was added; FALSE if the search
-domain was already known
setting
the NMSettingIP6Config
 

 

 

+

+
Returns

+
 TRUE if this connection should never be the default connection
+for IPv6 addressing

+

+

+
 

 

-
nm_setting_ip6_config_remove_dns_search ()

-
void                nm_setting_ip6_config_remove_dns_search
-                                                        (NMSettingIP6Config *setting,
-                                                         guint32 i);

-

-Removes the DNS search domain at index i.
-

-

+
nm_setting_ip6_config_get_may_fail ()

+
gboolean
+nm_setting_ip6_config_get_may_fail (NMSettingIP6Config *setting);

+
Returns the value contained in the “may-fail”
+property.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingIP6Config
-
i :
index number of the DNS search domain
setting
the NMSettingIP6Config
 

 

 

+

+
Returns

+
 TRUE if this connection doesn't require IPv6 addressing to complete
+for the connection to succeed.

+

+

+
 

 

-
nm_setting_ip6_config_clear_dns_searches ()

-
void                nm_setting_ip6_config_clear_dns_searches
-                                                        (NMSettingIP6Config *setting);

-

-Removes all configured DNS search domains.
-

-

+
nm_setting_ip6_config_get_ip6_privacy ()

+
NMSettingIP6ConfigPrivacy
+nm_setting_ip6_config_get_ip6_privacy (NMSettingIP6Config *setting);

+
Returns the value contained in the “ip6-privacy”
+property.

+

+
Parameters

+
--+++
-
-
+
+
+

 





 
 
setting :
the NMSettingIP6Config
-
setting
the NMSettingIP6Config
 
 

 

 

+

+
Returns

+
 IPv6 Privacy Extensions configuration value (NMSettingIP6ConfigPrivacy).

+

+

+
+
+

+
Types and Values

+

+
NM_SETTING_IP6_CONFIG_SETTING_NAME

+
#define NM_SETTING_IP6_CONFIG_SETTING_NAME "ipv6"
+

+

+

+

 

 

-
nm_setting_ip6_config_get_num_addresses ()

-
guint32             nm_setting_ip6_config_get_num_addresses
-                                                        (NMSettingIP6Config *setting);

-

+
enum NMSettingIP6ConfigError

+

+
Members

+
--+++
-
-
+
+
-
-
-
-
-

 





 
 
 
setting :
the NMSettingIP6Config
+
NM_SETTING_IP6_CONFIG_ERROR_UNKNOWN

+
unknown or unclassified error

 		 
 

 
Returns :
the number of configured addresses

-

-

-

-
nm_setting_ip6_config_get_address ()

-
NMIP6Address *      nm_setting_ip6_config_get_address   (NMSettingIP6Config *setting,
-                                                         guint32 i);

-

----
-
-
-
-
+
+
-
-
+
+
+
-
-
+
+




setting :
the NMSettingIP6Config
+
NM_SETTING_IP6_CONFIG_ERROR_INVALID_PROPERTY

+
the property was invalid

 		 
 

 
i :
index number of the address to return
NM_SETTING_IP6_CONFIG_ERROR_MISSING_PROPERTY

+
the property was missing and is
+required

+		 
 

 
Returns :
the address at index i
+
NM_SETTING_IP6_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD

+
the property's value is
+not valid with the given IPv6 method

 		 
 

 
 

 

+

 

 

-
nm_setting_ip6_config_add_address ()

-
gboolean            nm_setting_ip6_config_add_address   (NMSettingIP6Config *setting,
-                                                         NMIP6Address *address);

+
NM_SETTING_IP6_CONFIG_ERROR

+
#define NM_SETTING_IP6_CONFIG_ERROR nm_setting_ip6_config_error_quark ()
+

 

-Adds a new IPv6 address and associated information to the setting.  The
-given address is duplicated internally and is not changed by this function.
 

-

----
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingIP6Config
-
address :
the new address to add
Returns :

-TRUE if the address was added; FALSE if the address was already
-known.

 

 

 

-
nm_setting_ip6_config_remove_address ()

-
void                nm_setting_ip6_config_remove_address
-                                                        (NMSettingIP6Config *setting,
-                                                         guint32 i);

+
NM_SETTING_IP6_CONFIG_METHOD

+
#define NM_SETTING_IP6_CONFIG_METHOD             "method"
+

 

-Removes the address at index i.
 

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingIP6Config
-
i :
index number of the address to remove

 

 

 

-
nm_setting_ip6_config_clear_addresses ()

-
void                nm_setting_ip6_config_clear_addresses
-                                                        (NMSettingIP6Config *setting);

+
NM_SETTING_IP6_CONFIG_DNS

+
#define NM_SETTING_IP6_CONFIG_DNS                "dns"
+

 

-Removes all configured addresses.
 

-

----
-
-
-
-
-




setting :
the NMSettingIP6Config
-

 

 

 

-
nm_setting_ip6_config_get_num_routes ()

-
guint32             nm_setting_ip6_config_get_num_routes
-                                                        (NMSettingIP6Config *setting);

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingIP6Config
-
Returns :
the number of configured routes

+
NM_SETTING_IP6_CONFIG_DNS_SEARCH

+
#define NM_SETTING_IP6_CONFIG_DNS_SEARCH         "dns-search"
+

+

+

 

 

 

-
nm_setting_ip6_config_get_route ()

-
NMIP6Route *        nm_setting_ip6_config_get_route     (NMSettingIP6Config *setting,
-                                                         guint32 i);

-

----
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingIP6Config
-
i :
index number of the route to return
Returns :
the route at index i
-

+
NM_SETTING_IP6_CONFIG_ADDRESSES

+
#define NM_SETTING_IP6_CONFIG_ADDRESSES          "addresses"
+

+

+

 

 

 

-
nm_setting_ip6_config_add_route ()

-
gboolean            nm_setting_ip6_config_add_route     (NMSettingIP6Config *setting,
-                                                         NMIP6Route *route);

+
NM_SETTING_IP6_CONFIG_ROUTES

+
#define NM_SETTING_IP6_CONFIG_ROUTES             "routes"
+

 

-Adds a new IPv6 route and associated information to the setting.  The
-given route is duplicated internally and is not changed by this function.
 

-

----
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingIP6Config
-
route :
the route to add
Returns :

-TRUE if the route was added; FALSE if the route was already known.

 

 

 

-
nm_setting_ip6_config_remove_route ()

-
void                nm_setting_ip6_config_remove_route  (NMSettingIP6Config *setting,
-                                                         guint32 i);

+
NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES

+
#define NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES "ignore-auto-routes"
+

 

-Removes the route at index i.
 

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingIP6Config
-
i :
index number of the route

 

 

 

-
nm_setting_ip6_config_clear_routes ()

-
void                nm_setting_ip6_config_clear_routes  (NMSettingIP6Config *setting);

+
NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS

+
#define NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS    "ignore-auto-dns"
+

 

-Removes all configured routes.
 

-

----
-
-
-
-
-




setting :
the NMSettingIP6Config
-

 

 

 

-
nm_setting_ip6_config_get_ignore_auto_routes ()

-
gboolean            nm_setting_ip6_config_get_ignore_auto_routes
-                                                        (NMSettingIP6Config *setting);

+
NM_SETTING_IP6_CONFIG_NEVER_DEFAULT

+
#define NM_SETTING_IP6_CONFIG_NEVER_DEFAULT      "never-default"
+

 

-Returns the value contained in the "ignore-auto-routes"
-property.
 

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingIP6Config
-
Returns :

-TRUE if automatically configured (ie via DHCP) routes should be
-ignored.

 

 

 

-
nm_setting_ip6_config_get_ignore_auto_dns ()

-
gboolean            nm_setting_ip6_config_get_ignore_auto_dns
-                                                        (NMSettingIP6Config *setting);

+
NM_SETTING_IP6_CONFIG_MAY_FAIL

+
#define NM_SETTING_IP6_CONFIG_MAY_FAIL           "may-fail"
+

 

-Returns the value contained in the "ignore-auto-dns"
-property.
 

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingIP6Config
-
Returns :

-TRUE if automatically configured (ie via DHCP or router
-advertisements) DNS information should be ignored.

 

 

 

-
nm_setting_ip6_config_get_dhcp_hostname ()

-
const char *        nm_setting_ip6_config_get_dhcp_hostname
-                                                        (NMSettingIP6Config *setting);

+
NM_SETTING_IP6_CONFIG_IP6_PRIVACY

+
#define NM_SETTING_IP6_CONFIG_IP6_PRIVACY        "ip6-privacy"
+

 

-Returns the value contained in the "dhcp-hostname"
-property.
 

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingIP6Config
-
Returns :
the configured hostname to send to the DHCP server

-
Since 0.9.8

 

 

 

-
nm_setting_ip6_config_get_never_default ()

-
gboolean            nm_setting_ip6_config_get_never_default
-                                                        (NMSettingIP6Config *setting);

+
NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME

+
#define NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME      "dhcp-hostname"
+

 

-Returns the value contained in the "never-default"
-property.
 

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingIP6Config
-
Returns :

-TRUE if this connection should never be the default connection
-for IPv6 addressing

 

 

 

-
nm_setting_ip6_config_get_may_fail ()

-
gboolean            nm_setting_ip6_config_get_may_fail  (NMSettingIP6Config *setting);

-

-Returns the value contained in the "may-fail"
-property.
-

-

+
NM_SETTING_IP6_CONFIG_METHOD_IGNORE

+
#define NM_SETTING_IP6_CONFIG_METHOD_IGNORE     "ignore"
+

+
IPv6 is not required or is handled by some other mechanism, and NetworkManager
+should not configure IPv6 for this connection.

+
+

+

+
NM_SETTING_IP6_CONFIG_METHOD_AUTO

+
#define NM_SETTING_IP6_CONFIG_METHOD_AUTO       "auto"
+

+
IPv6 configuration should be automatically determined via a method appropriate
+for the hardware interface, ie router advertisements, DHCP, or PPP or some
+other device-specific manner.

+

+

+

+
NM_SETTING_IP6_CONFIG_METHOD_DHCP

+
#define NM_SETTING_IP6_CONFIG_METHOD_DHCP       "dhcp"
+

+
IPv6 configuration should be automatically determined via DHCPv6 only and
+router advertisements should be ignored.

+

+

+

+
NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL

+
#define NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL "link-local"
+

+
IPv6 configuration should be automatically configured for link-local-only
+operation.

+

+

+

+
NM_SETTING_IP6_CONFIG_METHOD_MANUAL

+
#define NM_SETTING_IP6_CONFIG_METHOD_MANUAL     "manual"
+

+
All necessary IPv6 configuration (addresses, prefix, DNS, etc) is specified
+in the setting's properties.

+

+

+

+
NM_SETTING_IP6_CONFIG_METHOD_SHARED

+
#define NM_SETTING_IP6_CONFIG_METHOD_SHARED     "shared"
+

+
This connection specifies configuration that allows other computers to
+connect through it to the default network (usually the Internet).  The
+connection's interface will be assigned a private address, and router
+advertisements, a caching DNS server, and Network Address Translation (NAT)
+functionality will be started on this connection's interface to allow other
+devices to connect through that interface to the default network. (not yet
+supported for IPv6)

+

+

+

+
enum NMSettingIP6ConfigPrivacy

+
NMSettingIP6ConfigPrivacy values indicate if and how IPv6 Privacy
+Extensions are used (RFC4941).

+

+
Members

+
--+++
-
-
+
+
-
-
+
+
+
-
-

 





 
 
 
setting :
the NMSettingIP6Config
+
NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN

+
unknown or no value specified

 		 
 

 
Returns :

-TRUE if this connection doesn't require IPv6 addressing to complete
-for the connection to succeed.
NM_SETTING_IP6_CONFIG_PRIVACY_DISABLED

+
IPv6 Privacy Extensions are disabled

+		 
 

-

-

-

-
nm_setting_ip6_config_get_ip6_privacy ()

-
NMSettingIP6ConfigPrivacy nm_setting_ip6_config_get_ip6_privacy
-                                                        (NMSettingIP6Config *setting);

-

-Returns the value contained in the "ip6-privacy"
-property.
-

-

----
-
-
-
+
+
-
-
+
+
+




 
setting :
the NMSettingIP6Config
+
NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_PUBLIC_ADDR

+
IPv6 Privacy Extensions
+are enabled, but public addresses are preferred over temporary addresses

 		 
 

 
Returns :
IPv6 Privacy Extensions configuration value (NMSettingIP6ConfigPrivacy).
NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR

+
IPv6 Privacy Extensions
+are enabled and temporary addresses are preferred over public addresses

+		 
 

 
 

 

 
+
 

 
Property Details

 

-
The "addresses" property

-
  "addresses"                GPtrArray_GValueArray_GArray_guchar_+guint+GArray_guchar___*  : Read / Write

-

-Array of IPv6 address structures.  Each IPv6 address structure is
-composed of 3 members, the first being a byte array containing the IPv6
-address (network byte order), the second a 32-bit integer containing the
-IPv6 address prefix, and the third a byte array containing the IPv6
-address (network byte order) of the gateway associated with this address,
-if any.  If no gateway is given, the third element should be given as
-all zeros.  For the 'auto' method, given IP addresses are appended to
-those returned by automatic configuration.  Addresses cannot be used with
-the 'shared' or 'link-local' methods as the interface is automatically
-assigned an address with these methods.
-

+
The “addresses” property

+
  “addresses”                GPtrArray_GValueArray_GArray_guchar_+guint+GArray_guchar___*

+
Array of IPv6 address structures.  Each IPv6 address structure is composed of 3 members, the first being a byte array containing the IPv6 address (network byte order), the second a 32-bit integer containing the IPv6 address prefix, and the third a byte array containing the IPv6 address (network byte order) of the gateway associated with this address, if any. If no gateway is given, the third element should be given as all zeros.  For the 'auto' method, given IP addresses are appended to those returned by automatic configuration.  Addresses cannot be used with the 'shared' or 'link-local' methods as the interface is automatically assigned an address with these methods.

+
Flags: Read / Write

 

 

 

-
The "dhcp-hostname" property

-
  "dhcp-hostname"            gchar*                : Read / Write

-

-The specified name will be sent to the DHCP server when acquiring a lease.
-

+
The “dhcp-hostname” property

+
  “dhcp-hostname”            gchar *

+
The specified name will be sent to the DHCP server when acquiring a lease.

+
Flags: Read / Write

 
Default value: NULL

 
Since 0.9.8

 

 

 

-
The "dns" property

-
  "dns"                      GPtrArray_GArray_guchar__*  : Read / Write

-

-Array of DNS servers, where each member of the array is a byte array
-containing the IPv6 address of the DNS server (in network byte order).
-For the 'auto' method, these DNS servers are appended to those (if any)
-returned by automatic configuration.  DNS servers cannot be used with
-the 'shared' or 'link-local' methods as there is no usptream network. In
-all other methods, these DNS servers are used as the only DNS servers for
-this connection.
-

+
The “dns” property

+
  “dns”                      GPtrArray_GArray_guchar__ *

+
Array of DNS servers, where each member of the array is a byte array containing the IPv6 address of the DNS server (in network byte order). For the 'auto' method, these DNS servers are appended to those (if any) returned by automatic configuration.  DNS servers cannot be used with the 'shared' or 'link-local' methods as there is no usptream network.  In all other methods, these DNS servers are used as the only DNS servers for this connection.

+
Flags: Read / Write

 

 

 

-
The "dns-search" property

-
  "dns-search"               GSList_gchararray_*   : Read / Write

-

-List of DNS search domains.  For the 'auto' method, these search domains
-are appended to those returned by automatic configuration. Search domains
-cannot be used with the 'shared' or 'link-local' methods as there is no
-upstream network.  In all other methods, these search domains are used
-as the only search domains for this connection.
-

+
The “dns-search” property

+
  “dns-search”               GSList_gchararray_ *

+
List of DNS search domains.  For the 'auto' method, these search domains are appended to those returned by automatic configuration. Search domains cannot be used with the 'shared' or 'link-local' methods as there is no upstream network.  In all other methods, these search domains are used as the only search domains for this connection.

+
Flags: Read / Write

 

 

 

-
The "ignore-auto-dns" property

-
  "ignore-auto-dns"          gboolean              : Read / Write / Construct

-

-When the method is set to 'auto' or 'dhcp' and this property is set to
-TRUE, automatically configured nameservers and search domains are ignored
-and only nameservers and search domains specified in
-"dns" and "dns-search", if any, are
-used.
-

+
The “ignore-auto-dns” property

+
  “ignore-auto-dns”          gboolean

+
When the method is set to 'auto' or 'dhcp' and this property is set to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the 'dns' and 'dns-search' properties, if any, are used.

+
Flags: Read / Write / Construct

 
Default value: FALSE

 

 

 

-
The "ignore-auto-routes" property

-
  "ignore-auto-routes"       gboolean              : Read / Write / Construct

-

-When the method is set to 'auto' or 'dhcp' and this property is set to
-TRUE, automatically configured routes are ignored and only routes
-specified in "routes", if any, are used.
-

+
The “ignore-auto-routes” property

+
  “ignore-auto-routes”       gboolean

+
When the method is set to 'auto' or 'dhcp' and this property is set to TRUE, automatically configured routes are ignored and only routes specified in the 'routes' property, if any, are used.

+
Flags: Read / Write / Construct

 
Default value: FALSE

 

 

 

-
The "ip6-privacy" property

-
  "ip6-privacy"              gint                  : Read / Write / Construct

-

-Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941.
-If enabled, it makes the kernel generate a temporary IPv6 address
-in addition to the public one generated from MAC address via
-modified EUI-64.  This enhances privacy, but could cause problems
-in some applications, on the other hand.  The permitted values
-are: 0: disabled, 1: enabled (prefer public address),
-2: enabled (prefer temporary addresses).
-

+
The “ip6-privacy” property

+
  “ip6-privacy”              gint

+
Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941.  If enabled, it makes the kernel generate a temporary IPv6 address in addition to the public one generated from MAC address via modified EUI-64.  This enhances privacy, but could cause problems in some applications, on the other hand.  The permitted values are: 0: disabled, 1: enabled (prefer public address), 2: enabled (prefer temporary addresses).

+
Flags: Read / Write / Construct

 
Allowed values: [-1,2]

 
Default value: -1

 

 

 

-
The "may-fail" property

-
  "may-fail"                 gboolean              : Read / Write / Construct

-

-If TRUE, allow overall network configuration to proceed even if IPv6
-configuration times out.  Note that at least one IP configuration
-must succeed or overall network configuration will still fail.  For
-example, in IPv4-only networks, setting this property to TRUE allows
-the overall network configuration to succeed if IPv6 configuration fails
-but IPv4 configuration completes successfully.
-

+
The “may-fail” property

+
  “may-fail”                 gboolean

+
If TRUE, allow overall network configuration to proceed even if IPv6 configuration times out. Note that at least one IP configuration must succeed or overall network configuration will still fail.  For example, in IPv4-only networks, setting this property to TRUE allows the overall network configuration to succeed if IPv6 configuration fails but IPv4 configuration completes successfully.

+
Flags: Read / Write / Construct

 
Default value: TRUE

 

 

 

-
The "method" property

-
  "method"                   gchar*                : Read / Write

-

-IPv6 configuration method.  If 'auto' is specified then the appropriate
-automatic method (DHCP, PPP, advertisement, etc) is used for the
-interface and most other properties can be left unset.  To force the use
-of DHCP only, specify 'dhcp'; this  method is only valid for ethernet-
-based hardware.  If 'link-local' is specified, then an IPv6 link-local
-address will be assigned to the interface.  If 'manual' is specified,
-static IP addressing is used and at least one IP address must be given
-in the 'addresses' property.  If 'ignore' is specified, IPv6
-configuration is not done. This property must be set.  NOTE: the 'shared'
-method are not yet supported.
-

+
The “method” property

+
  “method”                   gchar *

+
IPv6 configuration method.  If 'auto' is specified then the appropriate automatic method (PPP, router advertisement, etc) is used for the device and most other properties can be left unset.  To force the use of DHCP only, specify 'dhcp'; this method is only valid for ethernet-based hardware.  If 'link-local' is specified, then an IPv6 link-local address will be assigned to the interface.  If 'manual' is specified, static IP addressing is used and at least one IP address must be given in  the 'addresses' property.  If 'ignore' is specified, IPv6 configuration is not done. This property must be set.  NOTE: the 'shared' methodis not yet supported.

+
Flags: Read / Write

 
Default value: NULL

 

 

 

-
The "never-default" property

-
  "never-default"            gboolean              : Read / Write / Construct

-

-If TRUE, this connection will never be the default IPv6 connection,
-meaning it will never be assigned the default IPv6 route by NetworkManager.
-

+
The “never-default” property

+
  “never-default”            gboolean

+
If TRUE, this connection will never be the default IPv6 connection, meaning it will never be assigned the default IPv6 route by NetworkManager.

+
Flags: Read / Write / Construct

 
Default value: FALSE

 

 

 

-
The "routes" property

-
  "routes"                   GPtrArray_GValueArray_GArray_guchar_+guint+GArray_guchar_+guint__*  : Read / Write

-

-Array of IPv6 route structures.  Each IPv6 route structure is composed
-of 4 members; the first being the destination IPv6 network or
-address (network byte order) as a byte array, the second the destination
-network or address IPv6 prefix, the third being the next-hop IPv6 address
-(network byte order) if any, and the fourth being the route metric. For
-the 'auto' method, given IP routes are appended to those returned by
-automatic configuration.  Routes cannot be used with the 'shared' or
-'link-local' methods because there is no upstream network.
-

+
The “routes” property

+
  “routes”                   GPtrArray_GValueArray_GArray_guchar_+guint+GArray_guchar_+guint__*

+
Array of IPv6 route structures.  Each IPv6 route structure is composed of 4 members; the first being the destination IPv6 network or address (network byte order) as a byte array, the second the destination network or address IPv6 prefix, the third being the next-hop IPv6 address (network byte order) if any, and the fourth being the route metric. For the 'auto' method, given IP routes are appended to those returned by automatic configuration.  Routes cannot be used with the 'shared' or 'link-local' methods because there is no upstream network.

+
Flags: Read / Write

 

 

 
 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.20
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingInfiniband.html b/docs/libnm-util/html/NMSettingInfiniband.html
index a5c4b46c..aa2612f8 100644
--- a/docs/libnm-util/html/NMSettingInfiniband.html
+++ b/docs/libnm-util/html/NMSettingInfiniband.html
@@ -2,34 +2,28 @@
 
 
 
-NMSettingInfiniband
+libnm-util Reference Manual: NMSettingInfiniband
 
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
 

 

 

@@ -37,300 +31,355 @@
 
NMSettingInfiniband
NMSettingInfiniband — Describes connection properties for IP-over-InfiniBand networks

-
+

 
 
 

-

-
Synopsis

-
-#include <nm-setting-infiniband.h>
-
-#define             NM_SETTING_INFINIBAND_SETTING_NAME
-enum                NMSettingInfinibandError;
-#define             NM_SETTING_INFINIBAND_ERROR
-GQuark              nm_setting_infiniband_error_quark   (void);
-#define             NM_SETTING_INFINIBAND_MAC_ADDRESS
-#define             NM_SETTING_INFINIBAND_MTU
-#define             NM_SETTING_INFINIBAND_TRANSPORT_MODE
-                    NMSettingInfiniband;
-                    NMSettingInfinibandClass;
-NMSetting *         nm_setting_infiniband_new           (void);
-const GByteArray *  nm_setting_infiniband_get_mac_address
-                                                        (NMSettingInfiniband *setting);
-guint32             nm_setting_infiniband_get_mtu       (NMSettingInfiniband *setting);
-const char *        nm_setting_infiniband_get_transport_mode
-                                                        (NMSettingInfiniband *setting);
-

-

-

-
Object Hierarchy

-
-  GEnum
-   +----NMSettingInfinibandError
-

-
-  GObject
-   +----NMSetting
-         +----NMSettingInfiniband
-

-

-

-
Properties

-
-  "mac-address"              GArray_guchar_*       : Read / Write
-  "mtu"                      guint                 : Read / Write / Construct
-  "transport-mode"           gchar*                : Read / Write / Construct
-

-

-

-
Description

-

-The NMSettingInfiniband object is a NMSetting subclass that describes properties
-necessary for connection to IP-over-InfiniBand networks.
-

-

 

-
Details

-

-
NM_SETTING_INFINIBAND_SETTING_NAME

-
#define NM_SETTING_INFINIBAND_SETTING_NAME "infiniband"
-

-

-

-

-

-

-
enum NMSettingInfinibandError

-
typedef enum {
-	NM_SETTING_INFINIBAND_ERROR_UNKNOWN = 0,      /*< nick=UnknownError >*/
-	NM_SETTING_INFINIBAND_ERROR_INVALID_PROPERTY, /*< nick=InvalidProperty >*/
-	NM_SETTING_INFINIBAND_ERROR_MISSING_PROPERTY  /*< nick=MissingProperty >*/
-} NMSettingInfinibandError;
-

-

+
Functions

+
--++
-
-
+
+
+
+
+
-
-
+
-
-
+
+
+
+
+

 




 
 
 
NM_SETTING_INFINIBAND_ERROR_UNKNOWN
unknown or unclassified error
+
+GQuark
+
+nm_setting_infiniband_error_quark ()
+

+NMSetting *
+
+nm_setting_infiniband_new ()
 
 

 
NM_SETTING_INFINIBAND_ERROR_INVALID_PROPERTY
the property was invalid
+const GByteArray *
+
+nm_setting_infiniband_get_mac_address ()
 
 

 
NM_SETTING_INFINIBAND_ERROR_MISSING_PROPERTY
the property was missing and is
-required
+
+guint32
+
+nm_setting_infiniband_get_mtu ()
+
const char *
+
+nm_setting_infiniband_get_transport_mode ()
 
 

 
 

 

-

-

-
NM_SETTING_INFINIBAND_ERROR

-
#define NM_SETTING_INFINIBAND_ERROR nm_setting_infiniband_error_quark ()
-

-

-

+

+
Properties

+

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+






+GArray_guchar_ *mac-addressRead / Write
guintmtuRead / Write / Construct

+gchar *transport-modeRead / Write / Construct

 

-

-

-
nm_setting_infiniband_error_quark ()

-
GQuark              nm_setting_infiniband_error_quark   (void);

-

-Registers an error quark for NMSettingInfiniband if necessary.
-

-

+

+
Types and Values

+
--++
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

 




 
Returns :
the error quark used for NMSettingInfiniband errors.
#defineNM_SETTING_INFINIBAND_SETTING_NAME
enumNMSettingInfinibandError
#defineNM_SETTING_INFINIBAND_ERROR
#defineNM_SETTING_INFINIBAND_MAC_ADDRESS
#defineNM_SETTING_INFINIBAND_MTU
#defineNM_SETTING_INFINIBAND_TRANSPORT_MODE

 

 

-

-

-
NM_SETTING_INFINIBAND_MAC_ADDRESS

-
#define NM_SETTING_INFINIBAND_MAC_ADDRESS    "mac-address"
+

+
Object Hierarchy

+
    GEnum
+    ╰── NMSettingInfinibandError
+    GObject
+    ╰── NMSetting
+        ╰── NMSettingInfiniband
 

-

-

 

-

-

-
NM_SETTING_INFINIBAND_MTU

-
#define NM_SETTING_INFINIBAND_MTU            "mtu"
+

+
Includes

+
#include <nm-setting-infiniband.h>
 

-

-

 

-

-

-
NM_SETTING_INFINIBAND_TRANSPORT_MODE

-
#define NM_SETTING_INFINIBAND_TRANSPORT_MODE "transport-mode"
-

-

-

+

+
Description

+
The NMSettingInfiniband object is a NMSetting subclass that describes properties
+necessary for connection to IP-over-InfiniBand networks.

 

-

+

+
Functions

 

-
NMSettingInfiniband

-
typedef struct _NMSettingInfiniband NMSettingInfiniband;

-

-

+
nm_setting_infiniband_error_quark ()

+
GQuark
+nm_setting_infiniband_error_quark (void);

+
Registers an error quark for NMSettingInfiniband if necessary.

+

+
Returns

+
 the error quark used for NMSettingInfiniband errors.

+

+

 

 

 

-
NMSettingInfinibandClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingInfinibandClass;
-

-

-

+
nm_setting_infiniband_new ()

+
NMSetting *
+nm_setting_infiniband_new (void);

+
Creates a new NMSettingInfiniband object with default values.

+

+
Returns

+
 the new empty NMSettingInfiniband object. 

+
[transfer full]

+

 

 

 

-
nm_setting_infiniband_new ()

-
NMSetting *         nm_setting_infiniband_new           (void);

-

-Creates a new NMSettingInfiniband object with default values.
-

-

+
nm_setting_infiniband_get_mac_address ()

+
const GByteArray *
+nm_setting_infiniband_get_mac_address (NMSettingInfiniband *setting);

+

+
Parameters

+
--+++
-
-
+
+
+

 





 
 
Returns :
the new empty NMSettingInfiniband object. [transfer full]
-
setting
the NMSettingInfiniband
 
 

 

 

+

+
Returns

+
 the “mac-address” property of the setting

+

+

+

 

 

-
nm_setting_infiniband_get_mac_address ()

-
const GByteArray *  nm_setting_infiniband_get_mac_address
-                                                        (NMSettingInfiniband *setting);

-

+
nm_setting_infiniband_get_mtu ()

+
guint32
+nm_setting_infiniband_get_mtu (NMSettingInfiniband *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingInfiniband
-
Returns :
the "mac-address" property of the setting
setting
the NMSettingInfiniband
 

 

 

+

+
Returns

+
 the “mtu” property of the setting

+

+

+

 

 

-
nm_setting_infiniband_get_mtu ()

-
guint32             nm_setting_infiniband_get_mtu       (NMSettingInfiniband *setting);

-

+
nm_setting_infiniband_get_transport_mode ()

+
const char *
+nm_setting_infiniband_get_transport_mode
+                               (NMSettingInfiniband *setting);

+
Returns the transport mode for this device. Either 'datagram' or
+'connected'.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingInfiniband
-
Returns :
the "mtu" property of the setting
setting
the NMSettingInfiniband
 

 

 

-

+

+
Returns

+
 the IPoIB transport mode

+

+

+

+

+

+
Types and Values

 

-
nm_setting_infiniband_get_transport_mode ()

-
const char *        nm_setting_infiniband_get_transport_mode
-                                                        (NMSettingInfiniband *setting);

+
NM_SETTING_INFINIBAND_SETTING_NAME

+
#define NM_SETTING_INFINIBAND_SETTING_NAME "infiniband"
+

 

-Returns the transport mode for this device. Either 'datagram' or
-'connected'.
 

-

+
+

+

+
enum NMSettingInfinibandError

+

+
Members

+
--+++
-
-
+
+
-
-
+
+
+
+
+
+
+
+

 





 
 
 
setting :
the NMSettingInfiniband
+
NM_SETTING_INFINIBAND_ERROR_UNKNOWN

+
unknown or unclassified error

 		 
 

 
Returns :
the IPoIB transport mode
NM_SETTING_INFINIBAND_ERROR_INVALID_PROPERTY

+
the property was invalid

+		 
NM_SETTING_INFINIBAND_ERROR_MISSING_PROPERTY

+
the property was missing and is
+required

+		 
 

 
 

 

 

-

-
Property Details

+

 

-
The "mac-address" property

-
  "mac-address"              GArray_guchar_*       : Read / Write

+
NM_SETTING_INFINIBAND_ERROR

+
#define NM_SETTING_INFINIBAND_ERROR nm_setting_infiniband_error_quark ()
+

 

-If specified, this connection will only apply to the IPoIB
-device whose permanent MAC address matches. This property does
-not change the MAC address of the device (i.e. MAC spoofing).
 

 

 

 

-
The "mtu" property

-
  "mtu"                      guint                 : Read / Write / Construct

+
NM_SETTING_INFINIBAND_MAC_ADDRESS

+
#define NM_SETTING_INFINIBAND_MAC_ADDRESS    "mac-address"
+

 

-If non-zero, only transmit packets of the specified size or smaller,
-breaking larger packets up into multiple frames.
 

-
Default value: 0

 

 

 

-
The "transport-mode" property

-
  "transport-mode"           gchar*                : Read / Write / Construct

+
NM_SETTING_INFINIBAND_MTU

+
#define NM_SETTING_INFINIBAND_MTU            "mtu"
+

+

+

+

+

+

+
NM_SETTING_INFINIBAND_TRANSPORT_MODE

+
#define NM_SETTING_INFINIBAND_TRANSPORT_MODE "transport-mode"
+

 

-The IP-over-InfiniBand transport mode. Either 'datagram' or
-'connected'.
 

+

+

+

+
Property Details

+

+
The “mac-address” property

+
  “mac-address”              GArray_guchar_ *

+
If specified, this connection will only apply to the IPoIB device whose permanent MAC address matches.  This property does not change the MAC address of the device (i.e. MAC spoofing).

+
Flags: Read / Write

+

+

+

+
The “mtu” property

+
  “mtu”                      guint

+
If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames.

+
Flags: Read / Write / Construct

+
Default value: 0

+

+

+

+
The “transport-mode” property

+
  “transport-mode”           gchar *

+
The IPoIB transport mode. Either 'datagram' or 'connected'.

+
Flags: Read / Write / Construct

 
Default value: NULL

 

 

 

 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.20

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingOlpcMesh.html b/docs/libnm-util/html/NMSettingOlpcMesh.html
index 4b622152..59c0ad6f 100644
--- a/docs/libnm-util/html/NMSettingOlpcMesh.html
+++ b/docs/libnm-util/html/NMSettingOlpcMesh.html
@@ -2,34 +2,28 @@
 
 
 
-NMSettingOlpcMesh
+libnm-util Reference Manual: NMSettingOlpcMesh
 
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
 

 

 

@@ -37,193 +31,274 @@
 
NMSettingOlpcMesh
NMSettingOlpcMesh

-
+

 
 
 

-

-
Synopsis

-
#define             NM_SETTING_OLPC_MESH_SETTING_NAME
-enum                NMSettingOlpcMeshError;
-#define             NM_SETTING_OLPC_MESH_ERROR
-GQuark              nm_setting_olpc_mesh_error_quark    (void);
-#define             NM_SETTING_OLPC_MESH_SSID
-#define             NM_SETTING_OLPC_MESH_CHANNEL
-#define             NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS
-                    NMSettingOlpcMesh;
-                    NMSettingOlpcMeshClass;
-NMSetting *         nm_setting_olpc_mesh_new            (void);
-const GByteArray *  nm_setting_olpc_mesh_get_ssid       (NMSettingOlpcMesh *setting);
-guint32             nm_setting_olpc_mesh_get_channel    (NMSettingOlpcMesh *setting);
-const GByteArray *  nm_setting_olpc_mesh_get_dhcp_anycast_address
-                                                        (NMSettingOlpcMesh *setting);
-

-

 

-
Object Hierarchy

-
-  GEnum
-   +----NMSettingOlpcMeshError
-

-
-  GObject
-   +----NMSetting
-         +----NMSettingOlpcMesh
-

+
Functions

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





+GQuark
+
+nm_setting_olpc_mesh_error_quark ()
+

+NMSetting *
+
+nm_setting_olpc_mesh_new ()
+
const GByteArray *
+
+nm_setting_olpc_mesh_get_ssid ()
+

+guint32
+
+nm_setting_olpc_mesh_get_channel ()
+
const GByteArray *
+
+nm_setting_olpc_mesh_get_dhcp_anycast_address ()
+

 

 

 
Properties

-
-  "channel"                  guint                 : Read / Write / Construct
-  "dhcp-anycast-address"     GArray_guchar_*       : Read / Write
-  "ssid"                     GArray_guchar_*       : Read / Write
-

-

-

-
Description

-

-

+

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





guintchannelRead / Write / Construct

+GArray_guchar_ *dhcp-anycast-addressRead / Write

+GArray_guchar_ *ssidRead / Write

 

 

-
Details

-

-
NM_SETTING_OLPC_MESH_SETTING_NAME

-
#define NM_SETTING_OLPC_MESH_SETTING_NAME "802-11-olpc-mesh"
-

-

-

-

-

-

-
enum NMSettingOlpcMeshError

-
typedef enum {
-	NM_SETTING_OLPC_MESH_ERROR_UNKNOWN = 0,      /*< nick=UnknownError >*/
-	NM_SETTING_OLPC_MESH_ERROR_INVALID_PROPERTY, /*< nick=InvalidProperty >*/
-	NM_SETTING_OLPC_MESH_ERROR_MISSING_PROPERTY  /*< nick=MissingProperty >*/
-} NMSettingOlpcMeshError;
-

-

+
Types and Values

+
--++
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+

 




 
 
 
NM_SETTING_OLPC_MESH_ERROR_UNKNOWN
unknown or unclassified error
-#defineNM_SETTING_OLPC_MESH_SETTING_NAME
 

 
NM_SETTING_OLPC_MESH_ERROR_INVALID_PROPERTY
the property was invalid
-enumNMSettingOlpcMeshError
 

 
NM_SETTING_OLPC_MESH_ERROR_MISSING_PROPERTY
the property was missing and is
-required
-#defineNM_SETTING_OLPC_MESH_ERROR
#defineNM_SETTING_OLPC_MESH_SSID
#defineNM_SETTING_OLPC_MESH_CHANNEL
#defineNM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS
 

 
 

 

-

-

-
NM_SETTING_OLPC_MESH_ERROR

-
#define NM_SETTING_OLPC_MESH_ERROR nm_setting_olpc_mesh_error_quark ()
+

+
Object Hierarchy

+
    GEnum
+    ╰── NMSettingOlpcMeshError
+    GObject
+    ╰── NMSetting
+        ╰── NMSettingOlpcMesh
 

+

+

+
Description

 

 

 

-

+

+
Functions

 

-
nm_setting_olpc_mesh_error_quark ()

-
GQuark              nm_setting_olpc_mesh_error_quark    (void);

+
nm_setting_olpc_mesh_error_quark ()

+
GQuark
+nm_setting_olpc_mesh_error_quark (void);

 

 

+

+
Returns

+

+

 

 

 

-
NM_SETTING_OLPC_MESH_SSID

-
#define NM_SETTING_OLPC_MESH_SSID                 "ssid"
-

-

-

+
nm_setting_olpc_mesh_new ()

+
NMSetting *
+nm_setting_olpc_mesh_new (void);

+
Creates a new NMSettingOlpcMesh object with default values.

+

+
Returns

+
 the new empty NMSettingOlpcMesh object

+

+

 

 

 

-
NM_SETTING_OLPC_MESH_CHANNEL

-
#define NM_SETTING_OLPC_MESH_CHANNEL              "channel"
-

+
nm_setting_olpc_mesh_get_ssid ()

+
const GByteArray *
+nm_setting_olpc_mesh_get_ssid (NMSettingOlpcMesh *setting);

 

 

+

+
Returns

+

+

 

 

 

-
NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS

-
#define NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS "dhcp-anycast-address"
-

+
nm_setting_olpc_mesh_get_channel ()

+
guint32
+nm_setting_olpc_mesh_get_channel (NMSettingOlpcMesh *setting);

 

 

+

+
Returns

+

+

 

 

 

-
NMSettingOlpcMesh

-
typedef struct _NMSettingOlpcMesh NMSettingOlpcMesh;

+
nm_setting_olpc_mesh_get_dhcp_anycast_address ()

+
const GByteArray *
+nm_setting_olpc_mesh_get_dhcp_anycast_address
+                               (NMSettingOlpcMesh *setting);

 

 

+

+
Returns

+

 

-

+

+

+

+
Types and Values

 

-
NMSettingOlpcMeshClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingOlpcMeshClass;
+
NM_SETTING_OLPC_MESH_SETTING_NAME

+
#define NM_SETTING_OLPC_MESH_SETTING_NAME "802-11-olpc-mesh"
 

 

 

 

 

 

-
nm_setting_olpc_mesh_new ()

-
NMSetting *         nm_setting_olpc_mesh_new            (void);

-

-Creates a new NMSettingOlpcMesh object with default values.
-

-

+
enum NMSettingOlpcMeshError

+

+
Members

+
--+++
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

 





 
Returns :
the new empty NMSettingOlpcMesh object
NM_SETTING_OLPC_MESH_ERROR_UNKNOWN

+
unknown or unclassified error

+		 
NM_SETTING_OLPC_MESH_ERROR_INVALID_PROPERTY

+
the property was invalid

+		 
NM_SETTING_OLPC_MESH_ERROR_MISSING_PROPERTY

+
the property was missing and is
+required

+		 

 

 

+

+

+

+
NM_SETTING_OLPC_MESH_ERROR

+
#define NM_SETTING_OLPC_MESH_ERROR nm_setting_olpc_mesh_error_quark ()
+

+

+

+

 

 

-
nm_setting_olpc_mesh_get_ssid ()

-
const GByteArray *  nm_setting_olpc_mesh_get_ssid       (NMSettingOlpcMesh *setting);

+
NM_SETTING_OLPC_MESH_SSID

+
#define NM_SETTING_OLPC_MESH_SSID                 "ssid"
+

 

 

 

 

 

-
nm_setting_olpc_mesh_get_channel ()

-
guint32             nm_setting_olpc_mesh_get_channel    (NMSettingOlpcMesh *setting);

+
NM_SETTING_OLPC_MESH_CHANNEL

+
#define NM_SETTING_OLPC_MESH_CHANNEL              "channel"
+

 

 

 

 

 

-
nm_setting_olpc_mesh_get_dhcp_anycast_address ()

-
const GByteArray *  nm_setting_olpc_mesh_get_dhcp_anycast_address
-                                                        (NMSettingOlpcMesh *setting);

+
NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS

+
#define NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS "dhcp-anycast-address"
+

 

 

 

@@ -231,35 +306,30 @@ Creates a new 
 
Property Details

 

-
The "channel" property

-
  "channel"                  guint                 : Read / Write / Construct

-

-Channel on which the mesh network to join is located.
-

+
The “channel” property

+
  “channel”                  guint

+
Channel on which the mesh network to join is located.

+
Flags: Read / Write / Construct

 
Default value: 0

 

 

 

-
The "dhcp-anycast-address" property

-
  "dhcp-anycast-address"     GArray_guchar_*       : Read / Write

-

-Anycast DHCP address used when requesting an IP address via DHCP.  The
-specific anycast address used determines which DHCP server class answers
-the request.
-

+
The “dhcp-anycast-address” property

+
  “dhcp-anycast-address”     GArray_guchar_ *

+
Anycast DHCP MAC address used when requesting an IP address via DHCP.  The specific anycast address used determines which DHCP server class answers the the request.

+
Flags: Read / Write

 

 

 

-
The "ssid" property

-
  "ssid"                     GArray_guchar_*       : Read / Write

-

-SSID of the mesh network to join.
-

+
The “ssid” property

+
  “ssid”                     GArray_guchar_ *

+
SSID of the mesh network to join.

+
Flags: Read / Write

 

 

 

 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.20

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingPPP.html b/docs/libnm-util/html/NMSettingPPP.html
index 9e13b48b..f064b8ed 100644
--- a/docs/libnm-util/html/NMSettingPPP.html
+++ b/docs/libnm-util/html/NMSettingPPP.html
@@ -2,34 +2,28 @@
 
 
 
-NMSettingPPP
+libnm-util Reference Manual: NMSettingPPP
 
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
 

 

 

@@ -38,951 +32,1248 @@
 
NMSettingPPP — Describes connection properties for devices/networks
 that require PPP to deliver IP capability

-
+

 
 

-

-
Synopsis

-
-#include <nm-setting-ppp.h>
-
-#define             NM_SETTING_PPP_SETTING_NAME
-enum                NMSettingPPPError;
-#define             NM_SETTING_PPP_ERROR
-GQuark              nm_setting_ppp_error_quark          (void);
-#define             NM_SETTING_PPP_NOAUTH
-#define             NM_SETTING_PPP_REFUSE_EAP
-#define             NM_SETTING_PPP_REFUSE_PAP
-#define             NM_SETTING_PPP_REFUSE_CHAP
-#define             NM_SETTING_PPP_REFUSE_MSCHAP
-#define             NM_SETTING_PPP_REFUSE_MSCHAPV2
-#define             NM_SETTING_PPP_NOBSDCOMP
-#define             NM_SETTING_PPP_NODEFLATE
-#define             NM_SETTING_PPP_NO_VJ_COMP
-#define             NM_SETTING_PPP_REQUIRE_MPPE
-#define             NM_SETTING_PPP_REQUIRE_MPPE_128
-#define             NM_SETTING_PPP_MPPE_STATEFUL
-#define             NM_SETTING_PPP_CRTSCTS
-#define             NM_SETTING_PPP_BAUD
-#define             NM_SETTING_PPP_MRU
-#define             NM_SETTING_PPP_MTU
-#define             NM_SETTING_PPP_LCP_ECHO_FAILURE
-#define             NM_SETTING_PPP_LCP_ECHO_INTERVAL
-                    NMSettingPPP;
-                    NMSettingPPPClass;
-NMSetting *         nm_setting_ppp_new                  (void);
-gboolean            nm_setting_ppp_get_noauth           (NMSettingPPP *setting);
-gboolean            nm_setting_ppp_get_refuse_eap       (NMSettingPPP *setting);
-gboolean            nm_setting_ppp_get_refuse_pap       (NMSettingPPP *setting);
-gboolean            nm_setting_ppp_get_refuse_chap      (NMSettingPPP *setting);
-gboolean            nm_setting_ppp_get_refuse_mschap    (NMSettingPPP *setting);
-gboolean            nm_setting_ppp_get_refuse_mschapv2  (NMSettingPPP *setting);
-gboolean            nm_setting_ppp_get_nobsdcomp        (NMSettingPPP *setting);
-gboolean            nm_setting_ppp_get_nodeflate        (NMSettingPPP *setting);
-gboolean            nm_setting_ppp_get_no_vj_comp       (NMSettingPPP *setting);
-gboolean            nm_setting_ppp_get_require_mppe     (NMSettingPPP *setting);
-gboolean            nm_setting_ppp_get_require_mppe_128 (NMSettingPPP *setting);
-gboolean            nm_setting_ppp_get_mppe_stateful    (NMSettingPPP *setting);
-gboolean            nm_setting_ppp_get_crtscts          (NMSettingPPP *setting);
-guint32             nm_setting_ppp_get_baud             (NMSettingPPP *setting);
-guint32             nm_setting_ppp_get_mru              (NMSettingPPP *setting);
-guint32             nm_setting_ppp_get_mtu              (NMSettingPPP *setting);
-guint32             nm_setting_ppp_get_lcp_echo_failure (NMSettingPPP *setting);
-guint32             nm_setting_ppp_get_lcp_echo_interval
-                                                        (NMSettingPPP *setting);
-

-

-

-
Object Hierarchy

-
-  GEnum
-   +----NMSettingPPPError
-

-
-  GObject
-   +----NMSetting
-         +----NMSettingPPP
-

-

-

-
Properties

-
-  "baud"                     guint                 : Read / Write / Construct
-  "crtscts"                  gboolean              : Read / Write / Construct
-  "lcp-echo-failure"         guint                 : Read / Write / Construct
-  "lcp-echo-interval"        guint                 : Read / Write / Construct
-  "mppe-stateful"            gboolean              : Read / Write / Construct
-  "mru"                      guint                 : Read / Write / Construct
-  "mtu"                      guint                 : Read / Write / Construct
-  "no-vj-comp"               gboolean              : Read / Write / Construct
-  "noauth"                   gboolean              : Read / Write / Construct
-  "nobsdcomp"                gboolean              : Read / Write / Construct
-  "nodeflate"                gboolean              : Read / Write / Construct
-  "refuse-chap"              gboolean              : Read / Write / Construct
-  "refuse-eap"               gboolean              : Read / Write / Construct
-  "refuse-mschap"            gboolean              : Read / Write / Construct
-  "refuse-mschapv2"          gboolean              : Read / Write / Construct
-  "refuse-pap"               gboolean              : Read / Write / Construct
-  "require-mppe"             gboolean              : Read / Write / Construct
-  "require-mppe-128"         gboolean              : Read / Write / Construct
-

-

-

-
Description

-

-The NMSettingPPP object is a NMSetting subclass that describes properties
-necessary for connection to networks that require PPP transport, like PPPoE
-cable and DSL modems and some mobile broadband devices.
-

-

 

-
Details

-

-
NM_SETTING_PPP_SETTING_NAME

-
#define NM_SETTING_PPP_SETTING_NAME "ppp"
-

-

-

-

-

-

-
enum NMSettingPPPError

-
typedef enum {
-	NM_SETTING_PPP_ERROR_UNKNOWN = 0,             /*< nick=UnknownError >*/
-	NM_SETTING_PPP_ERROR_INVALID_PROPERTY,        /*< nick=InvalidProperty >*/
-	NM_SETTING_PPP_ERROR_MISSING_PROPERTY,        /*< nick=MissingProperty >*/
-	NM_SETTING_PPP_ERROR_REQUIRE_MPPE_NOT_ALLOWED /*< nick=RequireMPPENotAllowed >*/
-} NMSettingPPPError;
-

-

+
Functions

+
--++
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
-
+
-
-
+

 




 
 
 
NM_SETTING_PPP_ERROR_UNKNOWN
unknown or unclassified error
+
+GQuark
+
+nm_setting_ppp_error_quark ()
+

+NMSetting *
+
+nm_setting_ppp_new ()
+

+gboolean
+
+nm_setting_ppp_get_noauth ()
+

+gboolean
+
+nm_setting_ppp_get_refuse_eap ()
+

+gboolean
+
+nm_setting_ppp_get_refuse_pap ()
+

+gboolean
+
+nm_setting_ppp_get_refuse_chap ()
+

+gboolean
+
+nm_setting_ppp_get_refuse_mschap ()
+

+gboolean
+
+nm_setting_ppp_get_refuse_mschapv2 ()
+

+gboolean
+
+nm_setting_ppp_get_nobsdcomp ()
+

+gboolean
+
+nm_setting_ppp_get_nodeflate ()
+

+gboolean
+
+nm_setting_ppp_get_no_vj_comp ()
+

+gboolean
+
+nm_setting_ppp_get_require_mppe ()
+

+gboolean
+
+nm_setting_ppp_get_require_mppe_128 ()
+

+gboolean
+
+nm_setting_ppp_get_mppe_stateful ()
+

+gboolean
+
+nm_setting_ppp_get_crtscts ()
+

+guint32
+
+nm_setting_ppp_get_baud ()
+

+guint32
+
+nm_setting_ppp_get_mru ()
 
 

 
NM_SETTING_PPP_ERROR_INVALID_PROPERTY
the property was invalid
+
+guint32
+
+nm_setting_ppp_get_mtu ()
 
 

 
NM_SETTING_PPP_ERROR_MISSING_PROPERTY
the property was missing and is
-required
+
+guint32
+
+nm_setting_ppp_get_lcp_echo_failure ()
 
 

 
NM_SETTING_PPP_ERROR_REQUIRE_MPPE_NOT_ALLOWED
requiring MPPE is not compatible
-with other setting configuration parameters
+
+guint32
+
+nm_setting_ppp_get_lcp_echo_interval ()
 
 

 
 

 

-

-

-
NM_SETTING_PPP_ERROR

-
#define NM_SETTING_PPP_ERROR nm_setting_ppp_error_quark ()
-

-

-

-

-

-

-
nm_setting_ppp_error_quark ()

-
GQuark              nm_setting_ppp_error_quark          (void);

-

-Registers an error quark for NMSettingPPP if necessary.
-

-

+

+
Properties

+
--+++
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

 





 
Returns :
the error quark used for NMSettingPPP errors.
guintbaudRead / Write / Construct
gbooleancrtsctsRead / Write / Construct
guintlcp-echo-failureRead / Write / Construct
guintlcp-echo-intervalRead / Write / Construct
gbooleanmppe-statefulRead / Write / Construct
guintmruRead / Write / Construct
guintmtuRead / Write / Construct
gbooleanno-vj-compRead / Write / Construct
gbooleannoauthRead / Write / Construct
gbooleannobsdcompRead / Write / Construct
gbooleannodeflateRead / Write / Construct
gbooleanrefuse-chapRead / Write / Construct
gbooleanrefuse-eapRead / Write / Construct
gbooleanrefuse-mschapRead / Write / Construct
gbooleanrefuse-mschapv2Read / Write / Construct
gbooleanrefuse-papRead / Write / Construct
gbooleanrequire-mppeRead / Write / Construct
gbooleanrequire-mppe-128Read / Write / Construct

 

 

-

-

-
NM_SETTING_PPP_NOAUTH

-
#define NM_SETTING_PPP_NOAUTH            "noauth"
-

-

-

-

-

-

-
NM_SETTING_PPP_REFUSE_EAP

-
#define NM_SETTING_PPP_REFUSE_EAP        "refuse-eap"
-

-

-

-

-

-

-
NM_SETTING_PPP_REFUSE_PAP

-
#define NM_SETTING_PPP_REFUSE_PAP        "refuse-pap"
-

-

-

-

-

-

-
NM_SETTING_PPP_REFUSE_CHAP

-
#define NM_SETTING_PPP_REFUSE_CHAP       "refuse-chap"
-

-

-

-

-

-

-
NM_SETTING_PPP_REFUSE_MSCHAP

-
#define NM_SETTING_PPP_REFUSE_MSCHAP     "refuse-mschap"
-

-

-

-

-

-

-
NM_SETTING_PPP_REFUSE_MSCHAPV2

-
#define NM_SETTING_PPP_REFUSE_MSCHAPV2   "refuse-mschapv2"
-

-

-

-

-

-

-
NM_SETTING_PPP_NOBSDCOMP

-
#define NM_SETTING_PPP_NOBSDCOMP         "nobsdcomp"
-

-

-

-

-

-

-
NM_SETTING_PPP_NODEFLATE

-
#define NM_SETTING_PPP_NODEFLATE         "nodeflate"
-

-

-

-

-

-

-
NM_SETTING_PPP_NO_VJ_COMP

-
#define NM_SETTING_PPP_NO_VJ_COMP        "no-vj-comp"
-

-

-

-

-

-

-
NM_SETTING_PPP_REQUIRE_MPPE

-
#define NM_SETTING_PPP_REQUIRE_MPPE      "require-mppe"
-

-

-

+

+
Types and Values

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+




#defineNM_SETTING_PPP_SETTING_NAME
enumNMSettingPPPError
#defineNM_SETTING_PPP_ERROR
#defineNM_SETTING_PPP_NOAUTH
#defineNM_SETTING_PPP_REFUSE_EAP
#defineNM_SETTING_PPP_REFUSE_PAP
#defineNM_SETTING_PPP_REFUSE_CHAP
#defineNM_SETTING_PPP_REFUSE_MSCHAP
#defineNM_SETTING_PPP_REFUSE_MSCHAPV2
#defineNM_SETTING_PPP_NOBSDCOMP
#defineNM_SETTING_PPP_NODEFLATE
#defineNM_SETTING_PPP_NO_VJ_COMP
#defineNM_SETTING_PPP_REQUIRE_MPPE
#defineNM_SETTING_PPP_REQUIRE_MPPE_128
#defineNM_SETTING_PPP_MPPE_STATEFUL
#defineNM_SETTING_PPP_CRTSCTS
#defineNM_SETTING_PPP_BAUD
#defineNM_SETTING_PPP_MRU
#defineNM_SETTING_PPP_MTU
#defineNM_SETTING_PPP_LCP_ECHO_FAILURE
#defineNM_SETTING_PPP_LCP_ECHO_INTERVAL

 

-

-

-
NM_SETTING_PPP_REQUIRE_MPPE_128

-
#define NM_SETTING_PPP_REQUIRE_MPPE_128  "require-mppe-128"
+

+
Object Hierarchy

+
    GEnum
+    ╰── NMSettingPPPError
+    GObject
+    ╰── NMSetting
+        ╰── NMSettingPPP
 

-

-

 

-

-

-
NM_SETTING_PPP_MPPE_STATEFUL

-
#define NM_SETTING_PPP_MPPE_STATEFUL     "mppe-stateful"
+

+
Includes

+
#include <nm-setting-ppp.h>
 

-

-

 

-

-

-
NM_SETTING_PPP_CRTSCTS

-
#define NM_SETTING_PPP_CRTSCTS           "crtscts"
-

-

-

+

+
Description

+
The NMSettingPPP object is a NMSetting subclass that describes properties
+necessary for connection to networks that require PPP transport, like PPPoE
+cable and DSL modems and some mobile broadband devices.

 

-

+

+
Functions

 

-
NM_SETTING_PPP_BAUD

-
#define NM_SETTING_PPP_BAUD              "baud"
-

-

-

+
nm_setting_ppp_error_quark ()

+
GQuark
+nm_setting_ppp_error_quark (void);

+
Registers an error quark for NMSettingPPP if necessary.

+

+
Returns

+
 the error quark used for NMSettingPPP errors.

+

 

-

-

-
NM_SETTING_PPP_MRU

-
#define NM_SETTING_PPP_MRU               "mru"
-

-

-

 

 

 

-
NM_SETTING_PPP_MTU

-
#define NM_SETTING_PPP_MTU               "mtu"
-

-

-

+
nm_setting_ppp_new ()

+
NMSetting *
+nm_setting_ppp_new (void);

+
Creates a new NMSettingPPP object with default values.

+

+
Returns

+
 the new empty NMSettingPPP object. 

+
[transfer full]

 

-

-

-
NM_SETTING_PPP_LCP_ECHO_FAILURE

-
#define NM_SETTING_PPP_LCP_ECHO_FAILURE  "lcp-echo-failure"
-

-

-

 

 

 

-
NM_SETTING_PPP_LCP_ECHO_INTERVAL

-
#define NM_SETTING_PPP_LCP_ECHO_INTERVAL "lcp-echo-interval"
-

-

-

+
nm_setting_ppp_get_noauth ()

+
gboolean
+nm_setting_ppp_get_noauth (NMSettingPPP *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingPPP
 

 

-

-

-
NMSettingPPP

-
typedef struct _NMSettingPPP NMSettingPPP;

-

-

+

+
Returns

+
 the “noauth” property of the setting

+

 

-

-

-
NMSettingPPPClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingPPPClass;
-

-

-

 

 

 

-
nm_setting_ppp_new ()

-
NMSetting *         nm_setting_ppp_new                  (void);

-

-Creates a new NMSettingPPP object with default values.
-

-

+
nm_setting_ppp_get_refuse_eap ()

+
gboolean
+nm_setting_ppp_get_refuse_eap (NMSettingPPP *setting);

+

+
Parameters

+
--+++
-
-
+
+
+

 





 
 
Returns :
the new empty NMSettingPPP object. [transfer full]
-
setting
the NMSettingPPP
 
 

 

 

+

+
Returns

+
 the “refuse-eap” property of the setting

+

+

+

 

 

-
nm_setting_ppp_get_noauth ()

-
gboolean            nm_setting_ppp_get_noauth           (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_refuse_pap ()

+
gboolean
+nm_setting_ppp_get_refuse_pap (NMSettingPPP *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingPPP
-
Returns :
the "noauth" property of the setting
setting
the NMSettingPPP
 

 

 

+

+
Returns

+
 the “refuse-pap” property of the setting

+

+

+

 

 

-
nm_setting_ppp_get_refuse_eap ()

-
gboolean            nm_setting_ppp_get_refuse_eap       (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_refuse_chap ()

+
gboolean
+nm_setting_ppp_get_refuse_chap (NMSettingPPP *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingPPP
-
Returns :
the "refuse-eap" property of the setting
setting
the NMSettingPPP
 

 

 

+

+
Returns

+
 the “refuse-chap” property of the setting

+

+

+

 

 

-
nm_setting_ppp_get_refuse_pap ()

-
gboolean            nm_setting_ppp_get_refuse_pap       (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_refuse_mschap ()

+
gboolean
+nm_setting_ppp_get_refuse_mschap (NMSettingPPP *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingPPP
-
Returns :
the "refuse-pap" property of the setting
setting
the NMSettingPPP
 

 

 

+

+
Returns

+
 the “refuse-mschap” property of the setting

+

+

+

 

 

-
nm_setting_ppp_get_refuse_chap ()

-
gboolean            nm_setting_ppp_get_refuse_chap      (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_refuse_mschapv2 ()

+
gboolean
+nm_setting_ppp_get_refuse_mschapv2 (NMSettingPPP *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingPPP
-
Returns :
the "refuse-chap" property of the setting
setting
the NMSettingPPP
 

 

 

+

+
Returns

+
 the “refuse-mschapv2” property of the setting

+

+

+

 

 

-
nm_setting_ppp_get_refuse_mschap ()

-
gboolean            nm_setting_ppp_get_refuse_mschap    (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_nobsdcomp ()

+
gboolean
+nm_setting_ppp_get_nobsdcomp (NMSettingPPP *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingPPP
-
Returns :
the "refuse-mschap" property of the setting
setting
the NMSettingPPP
 

 

 

+

+
Returns

+
 the “nobsdcomp” property of the setting

+

+

+

 

 

-
nm_setting_ppp_get_refuse_mschapv2 ()

-
gboolean            nm_setting_ppp_get_refuse_mschapv2  (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_nodeflate ()

+
gboolean
+nm_setting_ppp_get_nodeflate (NMSettingPPP *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingPPP
-
Returns :
the "refuse-mschapv2" property of the setting
setting
the NMSettingPPP
 

 

 

+

+
Returns

+
 the “nodeflate” property of the setting

+

+

+

 

 

-
nm_setting_ppp_get_nobsdcomp ()

-
gboolean            nm_setting_ppp_get_nobsdcomp        (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_no_vj_comp ()

+
gboolean
+nm_setting_ppp_get_no_vj_comp (NMSettingPPP *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingPPP
-
Returns :
the "nobsdcomp" property of the setting
setting
the NMSettingPPP
 

 

 

+

+
Returns

+
 the “no-vj-comp” property of the setting

+

+

+

 

 

-
nm_setting_ppp_get_nodeflate ()

-
gboolean            nm_setting_ppp_get_nodeflate        (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_require_mppe ()

+
gboolean
+nm_setting_ppp_get_require_mppe (NMSettingPPP *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingPPP
-
Returns :
the "nodeflate" property of the setting
setting
the NMSettingPPP
 

 

 

+

+
Returns

+
 the “require-mppe” property of the setting

+

+

+

 

 

-
nm_setting_ppp_get_no_vj_comp ()

-
gboolean            nm_setting_ppp_get_no_vj_comp       (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_require_mppe_128 ()

+
gboolean
+nm_setting_ppp_get_require_mppe_128 (NMSettingPPP *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingPPP
-
Returns :
the "no-vj-comp" property of the setting
setting
the NMSettingPPP
 

 

 

+

+
Returns

+
 the “require-mppe-128” property of the setting

+

+

+

 

 

-
nm_setting_ppp_get_require_mppe ()

-
gboolean            nm_setting_ppp_get_require_mppe     (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_mppe_stateful ()

+
gboolean
+nm_setting_ppp_get_mppe_stateful (NMSettingPPP *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingPPP
-
Returns :
the "require-mppe" property of the setting
setting
the NMSettingPPP
 

 

 

+

+
Returns

+
 the “mppe-stateful” property of the setting

+

+

+

 

 

-
nm_setting_ppp_get_require_mppe_128 ()

-
gboolean            nm_setting_ppp_get_require_mppe_128 (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_crtscts ()

+
gboolean
+nm_setting_ppp_get_crtscts (NMSettingPPP *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingPPP
-
Returns :
the "require-mppe-128" property of the setting
setting
the NMSettingPPP
 

 

 

+

+
Returns

+
 the “crtscts” property of the setting

+

+

+

 

 

-
nm_setting_ppp_get_mppe_stateful ()

-
gboolean            nm_setting_ppp_get_mppe_stateful    (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_baud ()

+
guint32
+nm_setting_ppp_get_baud (NMSettingPPP *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingPPP
-
Returns :
the "mppe-stateful" property of the setting
setting
the NMSettingPPP
 

 

 

+

+
Returns

+
 the “baud” property of the setting

+

+

+
 

 

-
nm_setting_ppp_get_crtscts ()

-
gboolean            nm_setting_ppp_get_crtscts          (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_mru ()

+
guint32
+nm_setting_ppp_get_mru (NMSettingPPP *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingPPP
-
Returns :
the "crtscts" property of the setting
setting
the NMSettingPPP
 

 

 

+

+
Returns

+
 the “mru” property of the setting

+

+

+
 

 

-
nm_setting_ppp_get_baud ()

-
guint32             nm_setting_ppp_get_baud             (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_mtu ()

+
guint32
+nm_setting_ppp_get_mtu (NMSettingPPP *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingPPP
-
Returns :
the "baud" property of the setting
setting
the NMSettingPPP
 

 

 

+

+
Returns

+
 the “mtu” property of the setting

+

+

+
 

 

-
nm_setting_ppp_get_mru ()

-
guint32             nm_setting_ppp_get_mru              (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_lcp_echo_failure ()

+
guint32
+nm_setting_ppp_get_lcp_echo_failure (NMSettingPPP *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingPPP
-
Returns :
the "mru" property of the setting
setting
the NMSettingPPP
 

 

 

+

+
Returns

+
 the “lcp-echo-failure” property of the setting

+

+

+
 

 

-
nm_setting_ppp_get_mtu ()

-
guint32             nm_setting_ppp_get_mtu              (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_lcp_echo_interval ()

+
guint32
+nm_setting_ppp_get_lcp_echo_interval (NMSettingPPP *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingPPP
-
Returns :
the "mtu" property of the setting
setting
the NMSettingPPP
 

 

 

+

+
Returns

+
 the “lcp-echo-interval” property of the setting

+

+

+
+
+

+
Types and Values

+

+
NM_SETTING_PPP_SETTING_NAME

+
#define NM_SETTING_PPP_SETTING_NAME "ppp"
+

+

+

+

 

 

-
nm_setting_ppp_get_lcp_echo_failure ()

-
guint32             nm_setting_ppp_get_lcp_echo_failure (NMSettingPPP *setting);

-

+
enum NMSettingPPPError

+

+
Members

+
--+++
-
-
+
+
-
-
+
+
+
-
-

 





 
 
 
setting :
the NMSettingPPP
+
NM_SETTING_PPP_ERROR_UNKNOWN

+
unknown or unclassified error

 		 
 

 
Returns :
the "lcp-echo-failure" property of the setting
NM_SETTING_PPP_ERROR_INVALID_PROPERTY

+
the property was invalid

+		 
 

-

-

-

-
nm_setting_ppp_get_lcp_echo_interval ()

-
guint32             nm_setting_ppp_get_lcp_echo_interval
-                                                        (NMSettingPPP *setting);

-

----
-
-
-
+
+
-
-
+
+
+




 
setting :
the NMSettingPPP
+
NM_SETTING_PPP_ERROR_MISSING_PROPERTY

+
the property was missing and is
+required

 		 
 

 
Returns :
the "lcp-echo-interval" property of the setting
NM_SETTING_PPP_ERROR_REQUIRE_MPPE_NOT_ALLOWED

+
requiring MPPE is not compatible
+with other setting configuration parameters

+		 
 

 
 

 

 

-

-
Property Details

+

 

-
The "baud" property

-
  "baud"                     guint                 : Read / Write / Construct

+
NM_SETTING_PPP_ERROR

+
#define NM_SETTING_PPP_ERROR nm_setting_ppp_error_quark ()
+

 

-If non-zero, instruct pppd to set the serial port to the specified
-baudrate.  This value should normally be left as 0 to automatically
-choose the speed.
 

-
Default value: 0

 

 

 

-
The "crtscts" property

-
  "crtscts"                  gboolean              : Read / Write / Construct

+
NM_SETTING_PPP_NOAUTH

+
#define NM_SETTING_PPP_NOAUTH            "noauth"
+

 

-If TRUE, specify that pppd should set the serial port to use hardware
-flow control with RTS and CTS signals.  This value should normally be
-set to FALSE.
 

-
Default value: FALSE

 

 

 

-
The "lcp-echo-failure" property

-
  "lcp-echo-failure"         guint                 : Read / Write / Construct

+
NM_SETTING_PPP_REFUSE_EAP

+
#define NM_SETTING_PPP_REFUSE_EAP        "refuse-eap"
+

 

-If non-zero, instruct pppd to presume the connection to the peer has
-failed if the specified number of LCP echo-requests go unanswered by the
-peer.  The 'lcp-echo-interval' property must also be set to a non-zero
-value if this property is used.
 

-
Default value: 0

 

 

 

-
The "lcp-echo-interval" property

-
  "lcp-echo-interval"        guint                 : Read / Write / Construct

+
NM_SETTING_PPP_REFUSE_PAP

+
#define NM_SETTING_PPP_REFUSE_PAP        "refuse-pap"
+

 

-If non-zero, instruct pppd to send an LCP echo-request frame to the peer
-every n seconds (where n is the specified value).  Note that some PPP
-peers will respond to echo requests and some will not, and it is not
-possible to autodetect this.
 

-
Default value: 0

 

 

 

-
The "mppe-stateful" property

-
  "mppe-stateful"            gboolean              : Read / Write / Construct

+
NM_SETTING_PPP_REFUSE_CHAP

+
#define NM_SETTING_PPP_REFUSE_CHAP       "refuse-chap"
+

 

-If TRUE, stateful MPPE is used.  See pppd documentation for more
-information on stateful MPPE.",
 

-
Default value: FALSE

 

 

 

-
The "mru" property

-
  "mru"                      guint                 : Read / Write / Construct

+
NM_SETTING_PPP_REFUSE_MSCHAP

+
#define NM_SETTING_PPP_REFUSE_MSCHAP     "refuse-mschap"
+

+

+

+

+

+

+
NM_SETTING_PPP_REFUSE_MSCHAPV2

+
#define NM_SETTING_PPP_REFUSE_MSCHAPV2   "refuse-mschapv2"
+

 

-If non-zero, instruct pppd to request that the peer send packets no
-larger than the specified size.  If non-zero, the MRU should be between
-128 and 16384.
 

-
Allowed values: <= 16384

-
Default value: 0

 

 

 

-
The "mtu" property

-
  "mtu"                      guint                 : Read / Write / Construct

+
NM_SETTING_PPP_NOBSDCOMP

+
#define NM_SETTING_PPP_NOBSDCOMP         "nobsdcomp"
+

 

-If non-zero, instruct pppd to send packets no larger than the specified
-size.
 

-
Default value: 0

 

 

 

-
The "no-vj-comp" property

-
  "no-vj-comp"               gboolean              : Read / Write / Construct

+
NM_SETTING_PPP_NODEFLATE

+
#define NM_SETTING_PPP_NODEFLATE         "nodeflate"
+

 

-If TRUE, Van Jacobsen TCP header compression will not be requested.
 

-
Default value: FALSE

 

 

 

-
The "noauth" property

-
  "noauth"                   gboolean              : Read / Write / Construct

+
NM_SETTING_PPP_NO_VJ_COMP

+
#define NM_SETTING_PPP_NO_VJ_COMP        "no-vj-comp"
+

 

-If TRUE, do not require the other side (usually the PPP server) to
-authenticate itself to the client.  If FALSE, require authentication from
-the remote side.  In almost all cases, this should be TRUE.
 

-
Default value: TRUE

 

 

 

-
The "nobsdcomp" property

-
  "nobsdcomp"                gboolean              : Read / Write / Construct

+
NM_SETTING_PPP_REQUIRE_MPPE

+
#define NM_SETTING_PPP_REQUIRE_MPPE      "require-mppe"
+

 

-If TRUE, BSD compression will not be requested.
 

-
Default value: FALSE

 

 

 

-
The "nodeflate" property

-
  "nodeflate"                gboolean              : Read / Write / Construct

+
NM_SETTING_PPP_REQUIRE_MPPE_128

+
#define NM_SETTING_PPP_REQUIRE_MPPE_128  "require-mppe-128"
+

 

-If TRUE, 'deflate' compression will not be requested.
 

-
Default value: FALSE

 

 

 

-
The "refuse-chap" property

-
  "refuse-chap"              gboolean              : Read / Write / Construct

+
NM_SETTING_PPP_MPPE_STATEFUL

+
#define NM_SETTING_PPP_MPPE_STATEFUL     "mppe-stateful"
+

 

-If TRUE, the CHAP authentication method will not be used.
 

-
Default value: FALSE

 

 

 

-
The "refuse-eap" property

-
  "refuse-eap"               gboolean              : Read / Write / Construct

+
NM_SETTING_PPP_CRTSCTS

+
#define NM_SETTING_PPP_CRTSCTS           "crtscts"
+

 

-If TRUE, the EAP authentication method will not be used.
 

-
Default value: FALSE

 

 

 

-
The "refuse-mschap" property

-
  "refuse-mschap"            gboolean              : Read / Write / Construct

+
NM_SETTING_PPP_BAUD

+
#define NM_SETTING_PPP_BAUD              "baud"
+

 

-If TRUE, the MSCHAP authentication method will not be used.
 

-
Default value: FALSE

 

 

 

-
The "refuse-mschapv2" property

-
  "refuse-mschapv2"          gboolean              : Read / Write / Construct

+
NM_SETTING_PPP_MRU

+
#define NM_SETTING_PPP_MRU               "mru"
+

 

-If TRUE, the MSCHAPv2 authentication method will not be used.
 

-
Default value: FALSE

 

 

 

-
The "refuse-pap" property

-
  "refuse-pap"               gboolean              : Read / Write / Construct

+
NM_SETTING_PPP_MTU

+
#define NM_SETTING_PPP_MTU               "mtu"
+

 

-If TRUE, the PAP authentication method will not be used.
 

-
Default value: FALSE

 

 

 

-
The "require-mppe" property

-
  "require-mppe"             gboolean              : Read / Write / Construct

+
NM_SETTING_PPP_LCP_ECHO_FAILURE

+
#define NM_SETTING_PPP_LCP_ECHO_FAILURE  "lcp-echo-failure"
+

 

-If TRUE, MPPE (Microsoft Point-to-Point Encrpytion) will be required for
-the PPP session.  If either 64-bit or 128-bit MPPE is not available the
-session will fail.  Note that MPPE is not used on mobile broadband
-connections.
 

-
Default value: FALSE

 

 

 

-
The "require-mppe-128" property

-
  "require-mppe-128"         gboolean              : Read / Write / Construct

+
NM_SETTING_PPP_LCP_ECHO_INTERVAL

+
#define NM_SETTING_PPP_LCP_ECHO_INTERVAL "lcp-echo-interval"
+

 

-If TRUE, 128-bit MPPE (Microsoft Point-to-Point Encrpytion) will be
-required for the PPP session, and the 'require-mppe' property must also
-be set to TRUE.  If 128-bit MPPE is not available the session will fail.
 

+

+

+

+
Property Details

+

+
The “baud” property

+
  “baud”                     guint

+
If non-zero, instruct pppd to set the serial port to the specified baudrate.  This value should normally be left as 0 to automatically choose the speed.

+
Flags: Read / Write / Construct

+
Default value: 0

+

+

+

+
The “crtscts” property

+
  “crtscts”                  gboolean

+
If TRUE, specify that pppd should set the serial port to use hardware flow control with RTS and CTS signals.  This value should normally be set to FALSE.

+
Flags: Read / Write / Construct

+
Default value: FALSE

+

+

+

+
The “lcp-echo-failure” property

+
  “lcp-echo-failure”         guint

+
If non-zero, instruct pppd to presume the connection to the peer has failed if the specified number of LCP echo-requests go unanswered by the peer.  The 'lcp-echo-interval' property must also be set to a non-zero value if this property is used.

+
Flags: Read / Write / Construct

+
Default value: 0

+

+

+

+
The “lcp-echo-interval” property

+
  “lcp-echo-interval”        guint

+
If non-zero, instruct pppd to send an LCP echo-request frame to the peer every n seconds (where n is the specified value).  Note that some PPP peers will respond to echo requests and some will not, and it is not possible to autodetect this.

+
Flags: Read / Write / Construct

+
Default value: 0

+

+

+

+
The “mppe-stateful” property

+
  “mppe-stateful”            gboolean

+
If TRUE, stateful MPPE is used.  See pppd documentation for more information on stateful MPPE.

+
Flags: Read / Write / Construct

+
Default value: FALSE

+

+

+

+
The “mru” property

+
  “mru”                      guint

+
If non-zero, instruct pppd to request that the peer send packets no larger than the specified size.  If non-zero, the MRU should be between 128 and 16384.

+
Flags: Read / Write / Construct

+
Allowed values: <= 16384

+
Default value: 0

+

+

+

+
The “mtu” property

+
  “mtu”                      guint

+
If non-zero, instruct pppd to send packets no larger than the specified size.

+
Flags: Read / Write / Construct

+
Default value: 0

+

+

+

+
The “no-vj-comp” property

+
  “no-vj-comp”               gboolean

+
If TRUE, Van Jacobsen TCP header compression will not be requested.

+
Flags: Read / Write / Construct

+
Default value: FALSE

+

+

+

+
The “noauth” property

+
  “noauth”                   gboolean

+
If TRUE, do not require the other side (usually the PPP server) to authenticate itself to the client.  If FALSE, require authentication from the remote side.  In almost all cases, this should be TRUE.

+
Flags: Read / Write / Construct

+
Default value: TRUE

+

+

+

+
The “nobsdcomp” property

+
  “nobsdcomp”                gboolean

+
If TRUE, BSD compression will not be requested.

+
Flags: Read / Write / Construct

+
Default value: FALSE

+

+

+

+
The “nodeflate” property

+
  “nodeflate”                gboolean

+
If TRUE, 'deflate' compression will not be requested.

+
Flags: Read / Write / Construct

+
Default value: FALSE

+

+

+

+
The “refuse-chap” property

+
  “refuse-chap”              gboolean

+
If TRUE, the CHAP authentication method will not be used.

+
Flags: Read / Write / Construct

+
Default value: FALSE

+

+

+

+
The “refuse-eap” property

+
  “refuse-eap”               gboolean

+
If TRUE, the EAP authentication method will not be used.

+
Flags: Read / Write / Construct

+
Default value: FALSE

+

+

+

+
The “refuse-mschap” property

+
  “refuse-mschap”            gboolean

+
If TRUE, the MSCHAP authentication method will not be used.

+
Flags: Read / Write / Construct

+
Default value: FALSE

+

+

+

+
The “refuse-mschapv2” property

+
  “refuse-mschapv2”          gboolean

+
If TRUE, the MSCHAPv2 authentication method will not be used.

+
Flags: Read / Write / Construct

+
Default value: FALSE

+

+

+

+
The “refuse-pap” property

+
  “refuse-pap”               gboolean

+
If TRUE, the PAP authentication method will not be used.

+
Flags: Read / Write / Construct

+
Default value: FALSE

+

+

+

+
The “require-mppe” property

+
  “require-mppe”             gboolean

+
If TRUE, MPPE (Microsoft Point-to-Point Encrpytion) will be required for the PPP session.  If either 64-bit or 128-bit MPPE is not available the session will fail.  Note that MPPE is not used on mobile broadband connections.

+
Flags: Read / Write / Construct

+
Default value: FALSE

+

+

+

+
The “require-mppe-128” property

+
  “require-mppe-128”         gboolean

+
If TRUE, 128-bit MPPE (Microsoft Point-to-Point Encrpytion) will be required for the PPP session, and the 'require-mppe' property must also be set to TRUE.  If 128-bit MPPE is not available the session will fail.

+
Flags: Read / Write / Construct

 
Default value: FALSE

 

 

 
 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.20
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingPPPOE.html b/docs/libnm-util/html/NMSettingPPPOE.html
index fd91a0ad..426fe9c5 100644
--- a/docs/libnm-util/html/NMSettingPPPOE.html
+++ b/docs/libnm-util/html/NMSettingPPPOE.html
@@ -2,34 +2,28 @@
 
 
 
-NMSettingPPPOE
+libnm-util Reference Manual: NMSettingPPPOE
 
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
 

 

 

@@ -37,62 +31,290 @@
 
NMSettingPPPOE
NMSettingPPPOE — Describes PPPoE connection properties

-
+

 
 
 

-

-
Synopsis

-
-#include <nm-setting-pppoe.h>
-
-#define             NM_SETTING_PPPOE_SETTING_NAME
-enum                NMSettingPPPOEError;
-#define             NM_SETTING_PPPOE_ERROR
-GQuark              nm_setting_pppoe_error_quark        (void);
-#define             NM_SETTING_PPPOE_SERVICE
-#define             NM_SETTING_PPPOE_USERNAME
-#define             NM_SETTING_PPPOE_PASSWORD
-#define             NM_SETTING_PPPOE_PASSWORD_FLAGS
-                    NMSettingPPPOE;
-                    NMSettingPPPOEClass;
-NMSetting *         nm_setting_pppoe_new                (void);
-const char *        nm_setting_pppoe_get_service        (NMSettingPPPOE *setting);
-const char *        nm_setting_pppoe_get_username       (NMSettingPPPOE *setting);
-const char *        nm_setting_pppoe_get_password       (NMSettingPPPOE *setting);
-NMSettingSecretFlags nm_setting_pppoe_get_password_flags
-                                                        (NMSettingPPPOE *setting);
-

+

+
Functions

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





+GQuark
+
+nm_setting_pppoe_error_quark ()
+

+NMSetting *
+
+nm_setting_pppoe_new ()
+
const char *
+
+nm_setting_pppoe_get_service ()
+
const char *
+
+nm_setting_pppoe_get_username ()
+
const char *
+
+nm_setting_pppoe_get_password ()
+

+NMSettingSecretFlags
+
+nm_setting_pppoe_get_password_flags ()
+

+

+

+
Properties

+

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+






+gchar *passwordRead / Write
guintpassword-flagsRead / Write

+gchar *serviceRead / Write

+gchar *usernameRead / Write

+

+

+
Types and Values

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+




#defineNM_SETTING_PPPOE_SETTING_NAME
enumNMSettingPPPOEError
#defineNM_SETTING_PPPOE_ERROR
#defineNM_SETTING_PPPOE_SERVICE
#defineNM_SETTING_PPPOE_USERNAME
#defineNM_SETTING_PPPOE_PASSWORD
#defineNM_SETTING_PPPOE_PASSWORD_FLAGS

 

 

 
Object Hierarchy

-
-  GEnum
-   +----NMSettingPPPOEError
-

-
-  GObject
-   +----NMSetting
-         +----NMSettingPPPOE
+
    GEnum
+    ╰── NMSettingPPPOEError
+    GObject
+    ╰── NMSetting
+        ╰── NMSettingPPPOE
 

 

 

-
Properties

-
-  "password"                 gchar*                : Read / Write
-  "password-flags"           guint                 : Read / Write
-  "service"                  gchar*                : Read / Write
-  "username"                 gchar*                : Read / Write
+
Includes

+
#include <nm-setting-pppoe.h>
 

 

 

 
Description

-

-The NMSettingPPPOE object is a NMSetting subclass that describes
+
The NMSettingPPPOE object is a NMSetting subclass that describes
 properties necessary for connection to networks that require PPPoE connections
-to provide IP transport, for example cable or DSL modems.
-

+to provide IP transport, for example cable or DSL modems.

+

+

+
Functions

+

+
nm_setting_pppoe_error_quark ()

+
GQuark
+nm_setting_pppoe_error_quark (void);

+
Registers an error quark for NMSettingPPPOE if necessary.

+

+
Returns

+
 the error quark used for NMSettingPPPOE errors.

+

+

+

+

+

+
nm_setting_pppoe_new ()

+
NMSetting *
+nm_setting_pppoe_new (void);

+
Creates a new NMSettingPPPOE object with default values.

+

+
Returns

+
 the new empty NMSettingPPPOE object. 

+
[transfer full]

+

+

+

+

+
nm_setting_pppoe_get_service ()

+
const char *
+nm_setting_pppoe_get_service (NMSettingPPPOE *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingPPPOE
 

+

+

+
Returns

+
 the “service” property of the setting

+

+

+

+

+

+
nm_setting_pppoe_get_username ()

+
const char *
+nm_setting_pppoe_get_username (NMSettingPPPOE *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingPPPOE
 

+

+

+
Returns

+
 the “username” property of the setting

+

+

+

+

+

+
nm_setting_pppoe_get_password ()

+
const char *
+nm_setting_pppoe_get_password (NMSettingPPPOE *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingPPPOE
 

+

+

+
Returns

+
 the “password” property of the setting

+

+

+

+

+

+
nm_setting_pppoe_get_password_flags ()

+
NMSettingSecretFlags
+nm_setting_pppoe_get_password_flags (NMSettingPPPOE *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingPPPOE
 

+

+

+
Returns

+
 the NMSettingSecretFlags pertaining to the “password”

+

+

+

 

 

-
Details

+
Types and Values

 

 
NM_SETTING_PPPOE_SETTING_NAME

 
#define NM_SETTING_PPPOE_SETTING_NAME "pppoe"
@@ -102,45 +324,50 @@ to provide IP transport, for example cable or DSL modems.
 

 

 

-
enum NMSettingPPPOEError

-
typedef enum {
-	NM_SETTING_PPPOE_ERROR_UNKNOWN = 0,        /*< nick=UnknownError >*/
-	NM_SETTING_PPPOE_ERROR_INVALID_PROPERTY,   /*< nick=InvalidProperty >*/
-	NM_SETTING_PPPOE_ERROR_MISSING_PROPERTY,   /*< nick=MissingProperty >*/
-	NM_SETTING_PPPOE_ERROR_MISSING_PPP_SETTING /*< nick=MissingPPPSetting >*/
-} NMSettingPPPOEError;
-

-

+
enum NMSettingPPPOEError

+

+
Members

+
--+++
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+

 





 
 
 
NM_SETTING_PPPOE_ERROR_UNKNOWN
unknown or unclassified error
+
NM_SETTING_PPPOE_ERROR_UNKNOWN

+
unknown or unclassified error

 		 
 

 
NM_SETTING_PPPOE_ERROR_INVALID_PROPERTY
the property was invalid
+
NM_SETTING_PPPOE_ERROR_INVALID_PROPERTY

+
the property was invalid

 		 
 

 
NM_SETTING_PPPOE_ERROR_MISSING_PROPERTY
the property was missing and is
-required
+
NM_SETTING_PPPOE_ERROR_MISSING_PROPERTY

+
the property was missing and is
+required

 		 
 

 
NM_SETTING_PPPOE_ERROR_MISSING_PPP_SETTING
the connection
-did not contain a required PPP setting for PPP related options
+
NM_SETTING_PPPOE_ERROR_MISSING_PPP_SETTING

+
the connection
+did not contain a required PPP setting for PPP related options

 		 
 

 
 

 

+

 

 

 
NM_SETTING_PPPOE_ERROR

@@ -151,24 +378,6 @@ did not contain a required PPP setting for PPP related options
 

 

 

-
nm_setting_pppoe_error_quark ()

-
GQuark              nm_setting_pppoe_error_quark        (void);

-

-Registers an error quark for NMSettingPPPOE if necessary.
-

-

----
-
-
-
-
-




Returns :
the error quark used for NMSettingPPPOE errors.

-

-

-

 
NM_SETTING_PPPOE_SERVICE

 
#define NM_SETTING_PPPOE_SERVICE        "service"
 

@@ -199,184 +408,45 @@ Registers an error quark for 
-
NMSettingPPPOE

-
typedef struct _NMSettingPPPOE NMSettingPPPOE;

-

-

-

-

-

-
NMSettingPPPOEClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingPPPOEClass;
-

-

-

-

-

-

-
nm_setting_pppoe_new ()

-
NMSetting *         nm_setting_pppoe_new                (void);

-

-Creates a new NMSettingPPPOE object with default values.
-

-

----
-
-
-
-
-




Returns :
the new empty NMSettingPPPOE object. [transfer full]
-

-

-

-

-
nm_setting_pppoe_get_service ()

-
const char *        nm_setting_pppoe_get_service        (NMSettingPPPOE *setting);

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingPPPOE
-
Returns :
the "service" property of the setting

-

-

-

-
nm_setting_pppoe_get_username ()

-
const char *        nm_setting_pppoe_get_username       (NMSettingPPPOE *setting);

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingPPPOE
-
Returns :
the "username" property of the setting

-

-

-

-
nm_setting_pppoe_get_password ()

-
const char *        nm_setting_pppoe_get_password       (NMSettingPPPOE *setting);

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingPPPOE
-
Returns :
the "password" property of the setting

-

-

-

-
nm_setting_pppoe_get_password_flags ()

-
NMSettingSecretFlags nm_setting_pppoe_get_password_flags
-                                                        (NMSettingPPPOE *setting);

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingPPPOE
-
Returns :
the NMSettingSecretFlags pertaining to the "password"
-

-

 

 

 
Property Details

 

-
The "password" property

-
  "password"                 gchar*                : Read / Write

-

-Password used to authenticate with the PPPoE service.
-

+
The “password” property

+
  “password”                 gchar *

+
Password used to authenticate with the PPPoE service.

+
Flags: Read / Write

 
Default value: NULL

 

 

 

-
The "password-flags" property

-
  "password-flags"           guint                 : Read / Write

-

-Flags indicating how to handle "password":.
-

+
The “password-flags” property

+
  “password-flags”           guint

+
Flags indicating how to handle the PPPoE password.

+
Flags: Read / Write

 
Allowed values: <= 7

 
Default value: 0

 

 

 

-
The "service" property

-
  "service"                  gchar*                : Read / Write

-

-If specified, instruct PPPoE to only initiate sessions with access
-concentrators that provide the specified serivce.  For most providers,
-this should be left blank.  It is only required if there are multiple
-access concentrators or a specific service is known to be required.
-

+
The “service” property

+
  “service”                  gchar *

+
If specified, instruct PPPoE to only initiate sessions with access concentrators that provide the specified serivce.  For most providers, this should be left blank.  It is only required if there are multiple access concentrators or a specific service is known to be required.

+
Flags: Read / Write

 
Default value: NULL

 

 

 

-
The "username" property

-
  "username"                 gchar*                : Read / Write

-

-Username used to authenticate with the PPPoE service.
-

+
The “username” property

+
  “username”                 gchar *

+
Username used to authenticate with the PPPoE service.

+
Flags: Read / Write

 
Default value: NULL

 

 

 

 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.20
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingSerial.html b/docs/libnm-util/html/NMSettingSerial.html
index 16f6d603..8f107269 100644
--- a/docs/libnm-util/html/NMSettingSerial.html
+++ b/docs/libnm-util/html/NMSettingSerial.html
@@ -2,34 +2,28 @@
 
 
 
-NMSettingSerial
+libnm-util Reference Manual: NMSettingSerial
 
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
 

 

 

@@ -38,64 +32,333 @@
 
NMSettingSerial — Describes connection properties for devices that use
 serial communications

-
+

 
 

-

-
Synopsis

-
-#include <nm-setting-serial.h>
-
-#define             NM_SETTING_SERIAL_SETTING_NAME
-enum                NMSettingSerialError;
-#define             NM_SETTING_SERIAL_ERROR
-GQuark              nm_setting_serial_error_quark       (void);
-#define             NM_SETTING_SERIAL_BAUD
-#define             NM_SETTING_SERIAL_BITS
-#define             NM_SETTING_SERIAL_PARITY
-#define             NM_SETTING_SERIAL_STOPBITS
-#define             NM_SETTING_SERIAL_SEND_DELAY
-                    NMSettingSerial;
-                    NMSettingSerialClass;
-NMSetting *         nm_setting_serial_new               (void);
-guint               nm_setting_serial_get_baud          (NMSettingSerial *setting);
-guint               nm_setting_serial_get_bits          (NMSettingSerial *setting);
-char                nm_setting_serial_get_parity        (NMSettingSerial *setting);
-guint               nm_setting_serial_get_stopbits      (NMSettingSerial *setting);
-guint64             nm_setting_serial_get_send_delay    (NMSettingSerial *setting);
-

+

+
Functions

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





+GQuark
+
+nm_setting_serial_error_quark ()
+

+NMSetting *
+
+nm_setting_serial_new ()
+

+guint
+
+nm_setting_serial_get_baud ()
+

+guint
+
+nm_setting_serial_get_bits ()
+

+char
+
+nm_setting_serial_get_parity ()
+

+guint
+
+nm_setting_serial_get_stopbits ()
+

+guint64
+
+nm_setting_serial_get_send_delay ()
+

+

+

+
Properties

+

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





guintbaudRead / Write / Construct
guintbitsRead / Write / Construct
gcharparityRead / Write / Construct
guint64send-delayRead / Write / Construct
guintstopbitsRead / Write / Construct

+

+

+
Types and Values

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+




#defineNM_SETTING_SERIAL_SETTING_NAME
enumNMSettingSerialError
#defineNM_SETTING_SERIAL_ERROR
#defineNM_SETTING_SERIAL_BAUD
#defineNM_SETTING_SERIAL_BITS
#defineNM_SETTING_SERIAL_PARITY
#defineNM_SETTING_SERIAL_STOPBITS
#defineNM_SETTING_SERIAL_SEND_DELAY

 

 

 
Object Hierarchy

-
-  GEnum
-   +----NMSettingSerialError
-

-
-  GObject
-   +----NMSetting
-         +----NMSettingSerial
+
    GEnum
+    ╰── NMSettingSerialError
+    GObject
+    ╰── NMSetting
+        ╰── NMSettingSerial
 

 

 

-
Properties

-
-  "baud"                     guint                 : Read / Write / Construct
-  "bits"                     guint                 : Read / Write / Construct
-  "parity"                   gchar                 : Read / Write / Construct
-  "send-delay"               guint64               : Read / Write / Construct
-  "stopbits"                 guint                 : Read / Write / Construct
+
Includes

+
#include <nm-setting-serial.h>
 

 

 

 
Description

-

-The NMSettingSerial object is a NMSetting subclass that describes
+
The NMSettingSerial object is a NMSetting subclass that describes
 properties necessary for connections that may use serial communications,
-such as mobile broadband or analog telephone connections.
-

+such as mobile broadband or analog telephone connections.

+

+

+
Functions

+

+
nm_setting_serial_error_quark ()

+
GQuark
+nm_setting_serial_error_quark (void);

+
Registers an error quark for NMSettingSerial if necessary.

+

+
Returns

+
 the error quark used for NMSettingSerial errors.

+

+

+

+

+

+
nm_setting_serial_new ()

+
NMSetting *
+nm_setting_serial_new (void);

+
Creates a new NMSettingSerial object with default values.

+

+
Returns

+
 the new empty NMSettingSerial object. 

+
[transfer full]

+

+

+

+

+
nm_setting_serial_get_baud ()

+
guint
+nm_setting_serial_get_baud (NMSettingSerial *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingSerial
 

+

+

+
Returns

+
 the “baud” property of the setting

+

+

+

+

+

+
nm_setting_serial_get_bits ()

+
guint
+nm_setting_serial_get_bits (NMSettingSerial *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingSerial
 

+

+

+
Returns

+
 the “bits” property of the setting

+

+

+

+

+

+
nm_setting_serial_get_parity ()

+
char
+nm_setting_serial_get_parity (NMSettingSerial *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingSerial
 

+

+

+
Returns

+
 the “parity” property of the setting

+

+

+

+

+

+
nm_setting_serial_get_stopbits ()

+
guint
+nm_setting_serial_get_stopbits (NMSettingSerial *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingSerial
 

+

+

+
Returns

+
 the “stopbits” property of the setting

+

+

+

+

+

+
nm_setting_serial_get_send_delay ()

+
guint64
+nm_setting_serial_get_send_delay (NMSettingSerial *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingSerial
 

+

+

+
Returns

+
 the “send-delay” property of the setting

+

+

+

 

 

-
Details

+
Types and Values

 

 
NM_SETTING_SERIAL_SETTING_NAME

 
#define NM_SETTING_SERIAL_SETTING_NAME "serial"
@@ -105,45 +368,50 @@ such as mobile broadband or analog telephone connections.
 

 

 

-
enum NMSettingSerialError

-
typedef enum {
-	NM_SETTING_SERIAL_ERROR_UNKNOWN = 0,        /*< nick=UnknownError >*/
-	NM_SETTING_SERIAL_ERROR_INVALID_PROPERTY,   /*< nick=InvalidProperty >*/
-	NM_SETTING_SERIAL_ERROR_MISSING_PROPERTY,   /*< nick=MissingProperty >*/
-	NM_SETTING_SERIAL_ERROR_MISSING_PPP_SETTING /*< nick=MissingPPPSetting >*/
-} NMSettingSerialError;
-

-

+
enum NMSettingSerialError

+

+
Members

+
--+++
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+

 





 
 
 
NM_SETTING_SERIAL_ERROR_UNKNOWN
unknown or unclassified error
+
NM_SETTING_SERIAL_ERROR_UNKNOWN

+
unknown or unclassified error

 		 
 

 
NM_SETTING_SERIAL_ERROR_INVALID_PROPERTY
the property was invalid
+
NM_SETTING_SERIAL_ERROR_INVALID_PROPERTY

+
the property was invalid

 		 
 

 
NM_SETTING_SERIAL_ERROR_MISSING_PROPERTY
the property was missing and is
-required
+
NM_SETTING_SERIAL_ERROR_MISSING_PROPERTY

+
the property was missing and is
+required

 		 
 

 
NM_SETTING_SERIAL_ERROR_MISSING_PPP_SETTING
one of the properties of the
-setting requires the connection to contain an NMSettingPPP setting
+
NM_SETTING_SERIAL_ERROR_MISSING_PPP_SETTING

+
one of the properties of the
+setting requires the connection to contain an NMSettingPPP setting

 		 
 

 
 

 

+

 

 

 
NM_SETTING_SERIAL_ERROR

@@ -154,24 +422,6 @@ setting requires the connection to contain an 
-
nm_setting_serial_error_quark ()

-
GQuark              nm_setting_serial_error_quark       (void);

-

-Registers an error quark for NMSettingSerial if necessary.
-

-

----
-
-
-
-
-




Returns :
the error quark used for NMSettingSerial errors.

-

-

-

 
NM_SETTING_SERIAL_BAUD

 
#define NM_SETTING_SERIAL_BAUD "baud"
 

@@ -210,209 +460,48 @@ Registers an error quark for 
-
NMSettingSerial

-
typedef struct _NMSettingSerial NMSettingSerial;

-

-

-

-

-

-
NMSettingSerialClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingSerialClass;
-

-

-

-

-

-

-
nm_setting_serial_new ()

-
NMSetting *         nm_setting_serial_new               (void);

-

-Creates a new NMSettingSerial object with default values.
-

-

----
-
-
-
-
-




Returns :
the new empty NMSettingSerial object. [transfer full]
-

-

-

-

-
nm_setting_serial_get_baud ()

-
guint               nm_setting_serial_get_baud          (NMSettingSerial *setting);

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingSerial
-
Returns :
the "baud" property of the setting

-

-

-

-
nm_setting_serial_get_bits ()

-
guint               nm_setting_serial_get_bits          (NMSettingSerial *setting);

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingSerial
-
Returns :
the "bits" property of the setting

-

-

-

-
nm_setting_serial_get_parity ()

-
char                nm_setting_serial_get_parity        (NMSettingSerial *setting);

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingSerial
-
Returns :
the "parity" property of the setting

-

-

-

-
nm_setting_serial_get_stopbits ()

-
guint               nm_setting_serial_get_stopbits      (NMSettingSerial *setting);

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingSerial
-
Returns :
the "stopbits" property of the setting

-

-

-

-
nm_setting_serial_get_send_delay ()

-
guint64             nm_setting_serial_get_send_delay    (NMSettingSerial *setting);

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingSerial
-
Returns :
the "send-delay" property of the setting

-

 

 

 
Property Details

 

-
The "baud" property

-
  "baud"                     guint                 : Read / Write / Construct

-

-Speed to use for communication over the serial port.  Note that this value
-usually has no effect for mobile broadband modems as they generally
-ignore speed settings and use the highest available speed.
-

+
The “baud” property

+
  “baud”                     guint

+
Speed to use for communication over the serial port.  Note that this value usually has no effect for mobile broadband modems as they generally ignore speed settings and use the highest available speed.

+
Flags: Read / Write / Construct

 
Default value: 57600

 

 

 

-
The "bits" property

-
  "bits"                     guint                 : Read / Write / Construct

-

-Byte-width of the serial communication.
-

+
The “bits” property

+
  “bits”                     guint

+
Byte-width of the serial communication.  The 8 in '8n1' for example.

+
Flags: Read / Write / Construct

 
Allowed values: [5,8]

 
Default value: 8

 

 

 

-
The "parity" property

-
  "parity"                   gchar                 : Read / Write / Construct

-

-Parity setting of the serial port.  Either 'E' for even parity, 'o' for
-odd parity, or 'n' for no parity.
-

+
The “parity” property

+
  “parity”                   gchar

+
Parity setting of the serial port.  Either 'E' for even parity, 'o' for odd parity, or 'n' for no parity.

+
Flags: Read / Write / Construct

 
Allowed values: [69,111]

 
Default value: 110

 

 

 

-
The "send-delay" property

-
  "send-delay"               guint64               : Read / Write / Construct

-

-Time to delay between each byte sent to the modem, in microseconds.
-

+
The “send-delay” property

+
  “send-delay”               guint64

+
Time to delay between each byte sent to the modem, in microseconds.

+
Flags: Read / Write / Construct

 
Default value: 0

 

 

 

-
The "stopbits" property

-
  "stopbits"                 guint                 : Read / Write / Construct

-

-Number of stop bits for communication on the serial port.  Either 1 or 2.
-The 1 in '8n1' for example.
-

+
The “stopbits” property

+
  “stopbits”                 guint

+
Number of stop bits for communication on the serial port.  Either 1 or 2.  The 1 in '8n1' for example.

+
Flags: Read / Write / Construct

 
Allowed values: [1,2]

 
Default value: 1

 

@@ -420,6 +509,6 @@ The 1 in '8n1' for example.
 

 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.20

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingVPN.html b/docs/libnm-util/html/NMSettingVPN.html
index afbe41bf..57039178 100644
--- a/docs/libnm-util/html/NMSettingVPN.html
+++ b/docs/libnm-util/html/NMSettingVPN.html
@@ -2,34 +2,28 @@
 
 
 
-NMSettingVPN
+libnm-util Reference Manual: NMSettingVPN
 
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
 

 

 

@@ -37,660 +31,822 @@
 
NMSettingVPN
NMSettingVPN — Describes connection properties for Virtual Private Networks

-
+

 
 
 

-

-
Synopsis

-
-#include <nm-setting-vpn.h>
-
-#define             NM_SETTING_VPN_SETTING_NAME
-enum                NMSettingVpnError;
-#define             NM_SETTING_VPN_ERROR
-GQuark              nm_setting_vpn_error_quark          (void);
-#define             NM_SETTING_VPN_SERVICE_TYPE
-#define             NM_SETTING_VPN_USER_NAME
-#define             NM_SETTING_VPN_DATA
-#define             NM_SETTING_VPN_SECRETS
-                    NMSettingVPN;
-                    NMSettingVPNClass;
-void                (*NMVPNIterFunc)                    (const char *key,
-                                                         const char *value,
-                                                         gpointer user_data);
-NMSetting *         nm_setting_vpn_new                  (void);
-const char *        nm_setting_vpn_get_service_type     (NMSettingVPN *setting);
-const char *        nm_setting_vpn_get_user_name        (NMSettingVPN *setting);
-guint32             nm_setting_vpn_get_num_data_items   (NMSettingVPN *setting);
-void                nm_setting_vpn_add_data_item        (NMSettingVPN *setting,
-                                                         const char *key,
-                                                         const char *item);
-const char *        nm_setting_vpn_get_data_item        (NMSettingVPN *setting,
-                                                         const char *key);
-void                nm_setting_vpn_remove_data_item     (NMSettingVPN *setting,
-                                                         const char *key);
-void                nm_setting_vpn_foreach_data_item    (NMSettingVPN *setting,
-                                                         NMVPNIterFunc func,
-                                                         gpointer user_data);
-guint32             nm_setting_vpn_get_num_secrets      (NMSettingVPN *setting);
-void                nm_setting_vpn_add_secret           (NMSettingVPN *setting,
-                                                         const char *key,
-                                                         const char *secret);
-const char *        nm_setting_vpn_get_secret           (NMSettingVPN *setting,
-                                                         const char *key);
-void                nm_setting_vpn_remove_secret        (NMSettingVPN *setting,
-                                                         const char *key);
-void                nm_setting_vpn_foreach_secret       (NMSettingVPN *setting,
-                                                         NMVPNIterFunc func,
-                                                         gpointer user_data);
-

+

+
Functions

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





+GQuark
+
+nm_setting_vpn_error_quark ()
+

+void
+
+(*NMVPNIterFunc) ()
+

+NMSetting *
+
+nm_setting_vpn_new ()
+
const char *
+
+nm_setting_vpn_get_service_type ()
+
const char *
+
+nm_setting_vpn_get_user_name ()
+

+guint32
+
+nm_setting_vpn_get_num_data_items ()
+

+void
+
+nm_setting_vpn_add_data_item ()
+
const char *
+
+nm_setting_vpn_get_data_item ()
+

+void
+
+nm_setting_vpn_remove_data_item ()
+

+void
+
+nm_setting_vpn_foreach_data_item ()
+

+guint32
+
+nm_setting_vpn_get_num_secrets ()
+

+void
+
+nm_setting_vpn_add_secret ()
+
const char *
+
+nm_setting_vpn_get_secret ()
+

+void
+
+nm_setting_vpn_remove_secret ()
+

+void
+
+nm_setting_vpn_foreach_secret ()
+

+

+

+
Properties

+

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





GHashTable_gchararray+gchararray_*dataRead / Write
GHashTable_gchararray+gchararray_*secretsRead / Write

+gchar *service-typeRead / Write

+gchar *user-nameRead / Write

+

+

+
Types and Values

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+




#defineNM_SETTING_VPN_SETTING_NAME
enumNMSettingVpnError
#defineNM_SETTING_VPN_ERROR
#defineNM_SETTING_VPN_SERVICE_TYPE
#defineNM_SETTING_VPN_USER_NAME
#defineNM_SETTING_VPN_DATA
#defineNM_SETTING_VPN_SECRETS

 

 

 
Object Hierarchy

-
-  GEnum
-   +----NMSettingVpnError
-

-
-  GObject
-   +----NMSetting
-         +----NMSettingVPN
+
    GEnum
+    ╰── NMSettingVpnError
+    GObject
+    ╰── NMSetting
+        ╰── NMSettingVPN
 

 

 

-
Properties

-
-  "data"                     GHashTable_gchararray+gchararray_*  : Read / Write
-  "secrets"                  GHashTable_gchararray+gchararray_*  : Read / Write
-  "service-type"             gchar*                : Read / Write
-  "user-name"                gchar*                : Read / Write
+
Includes

+
#include <nm-setting-vpn.h>
 

 

 

 
Description

-

-The NMSettingVPN object is a NMSetting subclass that describes properties
+
The NMSettingVPN object is a NMSetting subclass that describes properties
 necessary for connection to Virtual Private Networks.  NetworkManager uses
 a plugin architecture to allow easier use of new VPN types, and this
 setting abstracts the configuration for those plugins.  Since the configuration
 options are only known to the VPN plugins themselves, the VPN configuration
 options are stored as key/value pairs of strings rather than GObject
-properties.
-

+properties.

 

 

-
Details

+
Functions

 

-
NM_SETTING_VPN_SETTING_NAME

-
#define NM_SETTING_VPN_SETTING_NAME "vpn"
-

-

-

+
nm_setting_vpn_error_quark ()

+
GQuark
+nm_setting_vpn_error_quark (void);

+
Registers an error quark for NMSettingVPN if necessary.

+

+
Returns

+
 the error quark used for NMSettingVPN errors.

+

+

 

 

 

-
enum NMSettingVpnError

-
typedef enum {
-	NM_SETTING_VPN_ERROR_UNKNOWN = 0,      /*< nick=UnknownError >*/
-	NM_SETTING_VPN_ERROR_INVALID_PROPERTY, /*< nick=InvalidProperty >*/
-	NM_SETTING_VPN_ERROR_MISSING_PROPERTY, /*< nick=MissingProperty >*/
-} NMSettingVpnError;
-

-

+
NMVPNIterFunc ()

+
void
+(*NMVPNIterFunc) (const char *key,
+                  const char *value,
+                  gpointer user_data);

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+

 





 
 
 
NM_SETTING_VPN_ERROR_UNKNOWN
unknown or unclassified error
-
key
the name of the data or secret item
 
 

 
NM_SETTING_VPN_ERROR_INVALID_PROPERTY
the property was invalid
-
value
the value of the data or secret item
 
 

 
NM_SETTING_VPN_ERROR_MISSING_PROPERTY
the property was missing and is
-required
-
user_data
User data passed to nm_setting_vpn_foreach_data_item() or
+nm_setting_vpn_foreach_secret()
 
 

 
 

 

+

 

 

-
NM_SETTING_VPN_ERROR

-
#define NM_SETTING_VPN_ERROR nm_setting_vpn_error_quark ()
-

-

-

+
nm_setting_vpn_new ()

+
NMSetting *
+nm_setting_vpn_new (void);

+
Creates a new NMSettingVPN object with default values.

+

+
Returns

+
 the new empty NMSettingVPN object. 

+
[transfer full]

+

 

 

 

-
nm_setting_vpn_error_quark ()

-
GQuark              nm_setting_vpn_error_quark          (void);

-

-Registers an error quark for NMSettingVPN if necessary.
-

-

+
nm_setting_vpn_get_service_type ()

+
const char *
+nm_setting_vpn_get_service_type (NMSettingVPN *setting);

+
Returns the service name of the VPN, which identifies the specific VPN
+plugin that should be used to connect to this VPN.

+

+
Parameters

+
--+++
-
-
+
+
+

 





 
 
Returns :
the error quark used for NMSettingVPN errors.
setting
the NMSettingVPN
 
 

 

 

-

-

-
NM_SETTING_VPN_SERVICE_TYPE

-
#define NM_SETTING_VPN_SERVICE_TYPE "service-type"
-

-

-

-

-

-

-
NM_SETTING_VPN_USER_NAME

-
#define NM_SETTING_VPN_USER_NAME    "user-name"
-

-

-

-

-

-

-
NM_SETTING_VPN_DATA

-
#define NM_SETTING_VPN_DATA         "data"
-

-

-

-

-

-

-
NM_SETTING_VPN_SECRETS

-
#define NM_SETTING_VPN_SECRETS      "secrets"
-

-

-

-

-

-

-
NMSettingVPN

-
typedef struct _NMSettingVPN NMSettingVPN;

-

-

+

+
Returns

+
 the VPN plugin's service name

+

 

-

-

-
NMSettingVPNClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingVPNClass;
-

-

-

 

 

 

-
NMVPNIterFunc ()

-
void                (*NMVPNIterFunc)                    (const char *key,
-                                                         const char *value,
-                                                         gpointer user_data);

-

+
nm_setting_vpn_get_user_name ()

+
const char *
+nm_setting_vpn_get_user_name (NMSettingVPN *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
key :
the name of the data or secret item
value :
the value of the data or secret item
user_data :
User data passed to nm_setting_vpn_foreach_data_item() or
-nm_setting_vpn_foreach_secret()
-
setting
the NMSettingVPN
 

 

 

+

+
Returns

+
 the “user-name” property of the setting

+

+

+

 

 

-
nm_setting_vpn_new ()

-
NMSetting *         nm_setting_vpn_new                  (void);

-

-Creates a new NMSettingVPN object with default values.
-

-

+
nm_setting_vpn_get_num_data_items ()

+
guint32
+nm_setting_vpn_get_num_data_items (NMSettingVPN *setting);

+
Gets number of key/value pairs of VPN configuration data.

+

+
Parameters

+
--+++
-
-
+
+
+

 





 
 
Returns :
the new empty NMSettingVPN object. [transfer full]
-
setting
the NMSettingVPN
 
 

 

 

+

+
Returns

+
 the number of VPN plugin specific configuration data items

+

+

+

 

 

-
nm_setting_vpn_get_service_type ()

-
const char *        nm_setting_vpn_get_service_type     (NMSettingVPN *setting);

-

-Returns the service name of the VPN, which identifies the specific VPN
-plugin that should be used to connect to this VPN.
-

-

+
nm_setting_vpn_add_data_item ()

+
void
+nm_setting_vpn_add_data_item (NMSettingVPN *setting,
+                              const char *key,
+                              const char *item);

+
Establishes a relationship between key
+ and item
+ internally in the
+setting which may be retrieved later.  Should not be used to store passwords
+or other secrets, which is what nm_setting_vpn_add_secret() is for.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
-
-
-

 





 
 
 
setting :
the NMSettingVPN
-
setting
the NMSettingVPN
 
 

 
Returns :
the VPN plugin's service name

-

-

-

-
nm_setting_vpn_get_user_name ()

-
const char *        nm_setting_vpn_get_user_name        (NMSettingVPN *setting);

-

----
-
-
-
-
+
+
+
-
-
+
+
+




setting :
the NMSettingVPN
-
key
a name that uniquely identifies the given value item
+
 
 

 
Returns :
the "user-name" property of the setting
item
the value to be referenced by key
+
 
 

 
 

 

+

 

 

-
nm_setting_vpn_get_num_data_items ()

-
guint32             nm_setting_vpn_get_num_data_items   (NMSettingVPN *setting);

-

-Gets number of key/value pairs of VPN configuration data.
-

-

+
nm_setting_vpn_get_data_item ()

+
const char *
+nm_setting_vpn_get_data_item (NMSettingVPN *setting,
+                              const char *key);

+
Retrieves the data item of a key/value relationship previously established
+by nm_setting_vpn_add_data_item().

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingVPN
-
setting
the NMSettingVPN
 
 

 
Returns :
the number of VPN plugin specific configuration data items
key
the name of the data item to retrieve
 
 

 
 

 

+

+
Returns

+
 the data item, if any

+

+

+
 

 

-
nm_setting_vpn_add_data_item ()

-
void                nm_setting_vpn_add_data_item        (NMSettingVPN *setting,
-                                                         const char *key,
-                                                         const char *item);

-

-Establishes a relationship between key and item internally in the
-setting which may be retrieved later.  Should not be used to store passwords
-or other secrets, which is what nm_setting_vpn_add_secret() is for.
-

-

+
nm_setting_vpn_remove_data_item ()

+
void
+nm_setting_vpn_remove_data_item (NMSettingVPN *setting,
+                                 const char *key);

+
Deletes a key/value relationship previously established by
+nm_setting_vpn_add_data_item().

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingVPN
-
key :
a name that uniquely identifies the given value item
-
setting
the NMSettingVPN
 
 

 
item :
the value to be referenced by key
-
key
the name of the data item to remove
 
 

 
 

 

+
 

 

-
nm_setting_vpn_get_data_item ()

-
const char *        nm_setting_vpn_get_data_item        (NMSettingVPN *setting,
-                                                         const char *key);

-

-Retrieves the data item of a key/value relationship previously established
-by nm_setting_vpn_add_data_item().
-

-

+
nm_setting_vpn_foreach_data_item ()

+
void
+nm_setting_vpn_foreach_data_item (NMSettingVPN *setting,
+                                  NMVPNIterFunc func,
+                                  gpointer user_data);

+
Iterates all data items stored in this setting.  It is safe to add, remove,
+and modify data items inside func
+, though any additions or removals made
+during iteration will not be part of the iteration.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingVPN
-
setting
a NMSettingVPN
 
 

 
key :
the name of the data item to retrieve
func
 an user provided function. 
[scope call]
 

 
Returns :
the data item, if any
user_data
data to be passed to func
+
 
 

 
 

 

+
 

 

-
nm_setting_vpn_remove_data_item ()

-
void                nm_setting_vpn_remove_data_item     (NMSettingVPN *setting,
-                                                         const char *key);

-

-Deletes a key/value relationship previously established by
-nm_setting_vpn_add_data_item().
-

-

+
nm_setting_vpn_get_num_secrets ()

+
guint32
+nm_setting_vpn_get_num_secrets (NMSettingVPN *setting);

+
Gets number of VPN plugin specific secrets in the setting.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingVPN
-
key :
the name of the data item to remove
setting
the NMSettingVPN
 

 

 

+

+
Returns

+
 the number of VPN plugin specific secrets

+

+

+
 

 

-
nm_setting_vpn_foreach_data_item ()

-
void                nm_setting_vpn_foreach_data_item    (NMSettingVPN *setting,
-                                                         NMVPNIterFunc func,
-                                                         gpointer user_data);

-

-Iterates all data items stored in this setting.  It is safe to add, remove,
-and modify data items inside func, though any additions or removals made
-during iteration will not be part of the iteration.
-

-

+
nm_setting_vpn_add_secret ()

+
void
+nm_setting_vpn_add_secret (NMSettingVPN *setting,
+                           const char *key,
+                           const char *secret);

+
Establishes a relationship between key
+ and secret
+ internally in the
+setting which may be retrieved later.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
a NMSettingVPN
-
setting
the NMSettingVPN
 
 

 
func :
an user provided function. [scope call]
-
key
a name that uniquely identifies the given secret secret
+
 
 

 
user_data :
data to be passed to func
-
secret
the secret to be referenced by key
+
 
 

 
 

 

+
 

 

-
nm_setting_vpn_get_num_secrets ()

-
guint32             nm_setting_vpn_get_num_secrets      (NMSettingVPN *setting);

-

-Gets number of VPN plugin specific secrets in the setting.
-

-

+
nm_setting_vpn_get_secret ()

+
const char *
+nm_setting_vpn_get_secret (NMSettingVPN *setting,
+                           const char *key);

+
Retrieves the secret of a key/value relationship previously established
+by nm_setting_vpn_add_secret().

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingVPN
-
setting
the NMSettingVPN
 
 

 
Returns :
the number of VPN plugin specific secrets
key
the name of the secret to retrieve
 
 

 
 

 

+

+
Returns

+
 the secret, if any

+

+

+
 

 

-
nm_setting_vpn_add_secret ()

-
void                nm_setting_vpn_add_secret           (NMSettingVPN *setting,
-                                                         const char *key,
-                                                         const char *secret);

-

-Establishes a relationship between key and secret internally in the
-setting which may be retrieved later.
-

-

+
nm_setting_vpn_remove_secret ()

+
void
+nm_setting_vpn_remove_secret (NMSettingVPN *setting,
+                              const char *key);

+
Deletes a key/value relationship previously established by
+nm_setting_vpn_add_secret().

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingVPN
-
key :
a name that uniquely identifies the given secret secret
-
setting
the NMSettingVPN
 
 

 
secret :
the secret to be referenced by key
-
key
the name of the secret to remove
 
 

 
 

 

+
 

 

-
nm_setting_vpn_get_secret ()

-
const char *        nm_setting_vpn_get_secret           (NMSettingVPN *setting,
-                                                         const char *key);

-

-Retrieves the secret of a key/value relationship previously established
-by nm_setting_vpn_add_secret().
-

-

+
nm_setting_vpn_foreach_secret ()

+
void
+nm_setting_vpn_foreach_secret (NMSettingVPN *setting,
+                               NMVPNIterFunc func,
+                               gpointer user_data);

+
Iterates all secrets stored in this setting.  It is safe to add, remove,
+and modify secrets inside func
+, though any additions or removals made during
+iteration will not be part of the iteration.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingVPN
-
setting
a NMSettingVPN
 
 

 
key :
the name of the secret to retrieve
func
 an user provided function. 
[scope call]
 

 
Returns :
the secret, if any
user_data
data to be passed to func
+
 
 

 
 

 

-

+
+
+

+
Types and Values

 

-
nm_setting_vpn_remove_secret ()

-
void                nm_setting_vpn_remove_secret        (NMSettingVPN *setting,
-                                                         const char *key);

+
NM_SETTING_VPN_SETTING_NAME

+
#define NM_SETTING_VPN_SETTING_NAME "vpn"
+

 

-Deletes a key/value relationship previously established by
-nm_setting_vpn_add_secret().
 

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingVPN
-
key :
the name of the secret to remove

 

 

 

-
nm_setting_vpn_foreach_secret ()

-
void                nm_setting_vpn_foreach_secret       (NMSettingVPN *setting,
-                                                         NMVPNIterFunc func,
-                                                         gpointer user_data);

-

-Iterates all secrets stored in this setting.  It is safe to add, remove,
-and modify secrets inside func, though any additions or removals made during
-iteration will not be part of the iteration.
-

-

+
enum NMSettingVpnError

+

+
Members

+
--+++
-
-
+
+
-
-
+
+
-
-
+
+

 





 
 
 
setting :
a NMSettingVPN
+
NM_SETTING_VPN_ERROR_UNKNOWN

+
unknown or unclassified error

 		 
 

 
func :
an user provided function. [scope call]
+
NM_SETTING_VPN_ERROR_INVALID_PROPERTY

+
the property was invalid

 		 
 

 
user_data :
data to be passed to func
+
NM_SETTING_VPN_ERROR_MISSING_PROPERTY

+
the property was missing and is
+required

 		 
 

 
 

 

 

-

-
Property Details

+

 

-
The "data" property

-
  "data"                     GHashTable_gchararray+gchararray_*  : Read / Write

+
NM_SETTING_VPN_ERROR

+
#define NM_SETTING_VPN_ERROR nm_setting_vpn_error_quark ()
+

 

-Dictionary of key/value pairs of VPN plugin specific data.  Both keys
-and values must be strings.
 

 

 

 

-
The "secrets" property

-
  "secrets"                  GHashTable_gchararray+gchararray_*  : Read / Write

+
NM_SETTING_VPN_SERVICE_TYPE

+
#define NM_SETTING_VPN_SERVICE_TYPE "service-type"
+

 

-Dictionary of key/value pairs of VPN plugin specific secrets like
-passwords or private keys.  Both keys and values must be strings.
 

 

 

 

-
The "service-type" property

-
  "service-type"             gchar*                : Read / Write

+
NM_SETTING_VPN_USER_NAME

+
#define NM_SETTING_VPN_USER_NAME    "user-name"
+

 

-D-Bus service name of the VPN plugin that this setting uses to connect
-to its network.  i.e. org.freedesktop.NetworkManager.vpnc for the vpnc
-plugin.
 

-
Default value: NULL

 

 

 

-
The "user-name" property

-
  "user-name"                gchar*                : Read / Write

+
NM_SETTING_VPN_DATA

+
#define NM_SETTING_VPN_DATA         "data"
+

 

-If the VPN connection requires a user name for authentication, that name
-should be provided here.  If the connection is available to more than
-one user, and the VPN requires each user to supply a different name, then
-leave this property empty.  If this property is empty, NetworkManager
-will automatically supply the username of the user which requested the
-VPN connection.
 

+

+

+

+
NM_SETTING_VPN_SECRETS

+
#define NM_SETTING_VPN_SECRETS      "secrets"
+

+

+

+

+

+

+
Property Details

+

+
The “data” property

+
  “data”                     GHashTable_gchararray+gchararray_*

+
Dictionary of key/value pairs of VPN plugin specific data.  Both keys and values must be strings.

+
Flags: Read / Write

+

+

+

+
The “secrets” property

+
  “secrets”                  GHashTable_gchararray+gchararray_*

+
Dictionary of key/value pairs of VPN plugin specific secrets like passwords or private keys.  Both keys and values must be strings.

+
Flags: Read / Write

+

+

+

+
The “service-type” property

+
  “service-type”             gchar *

+
D-Bus service name of the VPN plugin that this setting uses to connect to its network.  i.e. org.freedesktop.NetworkManager.vpnc for the vpnc plugin.

+
Flags: Read / Write

+
Default value: NULL

+

+

+

+
The “user-name” property

+
  “user-name”                gchar *

+
If the VPN connection requires a user name for authentication, that name should be provided here.  If the connection is available to more than one user, and the VPN requires each user to supply a different name, then leave this property empty.  If this property is empty, NetworkManager will automatically supply the username of the user which requested the VPN connection.

+
Flags: Read / Write

 
Default value: NULL

 

 

 
 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.20
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingVlan.html b/docs/libnm-util/html/NMSettingVlan.html
index edc209ba..3a023713 100644
--- a/docs/libnm-util/html/NMSettingVlan.html
+++ b/docs/libnm-util/html/NMSettingVlan.html
@@ -2,34 +2,28 @@
 
 
 
-NMSettingVlan
+libnm-util Reference Manual: NMSettingVlan
 
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
 

 

 

@@ -37,722 +31,873 @@
 
NMSettingVlan
NMSettingVlan — Describes connection properties for VLAN interfaces

-
+

 
 
 

-

-
Synopsis

-
-#include <nm-setting-vlan.h>
-
-#define             NM_SETTING_VLAN_SETTING_NAME
-enum                NMSettingVlanError;
-#define             NM_SETTING_VLAN_ERROR
-GQuark              nm_setting_vlan_error_quark         (void);
-#define             NM_SETTING_VLAN_INTERFACE_NAME
-#define             NM_SETTING_VLAN_PARENT
-#define             NM_SETTING_VLAN_ID
-#define             NM_SETTING_VLAN_FLAGS
-#define             NM_SETTING_VLAN_INGRESS_PRIORITY_MAP
-#define             NM_SETTING_VLAN_EGRESS_PRIORITY_MAP
-                    NMSettingVlan;
-                    NMSettingVlanClass;
-enum                NMVlanPriorityMap;
-enum                NMVlanFlags;
-NMSetting *         nm_setting_vlan_new                 (void);
-const char *        nm_setting_vlan_get_interface_name  (NMSettingVlan *setting);
-const char *        nm_setting_vlan_get_parent          (NMSettingVlan *setting);
-guint32             nm_setting_vlan_get_id              (NMSettingVlan *setting);
-guint32             nm_setting_vlan_get_flags           (NMSettingVlan *setting);
-gint32              nm_setting_vlan_get_num_priorities  (NMSettingVlan *setting,
-                                                         NMVlanPriorityMap map);
-gboolean            nm_setting_vlan_get_priority        (NMSettingVlan *setting,
-                                                         NMVlanPriorityMap map,
-                                                         guint32 idx,
-                                                         guint32 *out_from,
-                                                         guint32 *out_to);
-gboolean            nm_setting_vlan_add_priority        (NMSettingVlan *setting,
-                                                         NMVlanPriorityMap map,
-                                                         guint32 from,
-                                                         guint32 to);
-void                nm_setting_vlan_remove_priority     (NMSettingVlan *setting,
-                                                         NMVlanPriorityMap map,
-                                                         guint32 idx);
-void                nm_setting_vlan_clear_priorities    (NMSettingVlan *setting,
-                                                         NMVlanPriorityMap map);
-gboolean            nm_setting_vlan_add_priority_str    (NMSettingVlan *setting,
-                                                         NMVlanPriorityMap map,
-                                                         const char *str);
-

-

-

-
Object Hierarchy

-
-  GEnum
-   +----NMSettingVlanError
-

-
-  GObject
-   +----NMSetting
-         +----NMSettingVlan
-

-
-  GEnum
-   +----NMVlanPriorityMap
-

-
-  GEnum
-   +----NMVlanFlags
-

-

 

-
Properties

-
-  "egress-priority-map"      GSList_gchararray_*   : Read / Write
-  "flags"                    guint                 : Read / Write / Construct
-  "id"                       guint                 : Read / Write / Construct
-  "ingress-priority-map"     GSList_gchararray_*   : Read / Write
-  "interface-name"           gchar*                : Read / Write / Construct
-  "parent"                   gchar*                : Read / Write / Construct
-

-

-

-
Description

-

-The NMSettingVlan object is a NMSetting subclass that describes properties
-necessary for connection to VLAN interfaces.
-

-

-

-
Details

-

-
NM_SETTING_VLAN_SETTING_NAME

-
#define NM_SETTING_VLAN_SETTING_NAME "vlan"
-

-

-

-

-

-

-
enum NMSettingVlanError

-
typedef enum {
-	NM_SETTING_VLAN_ERROR_UNKNOWN = 0,      /*< nick=Unknown >*/
-	NM_SETTING_VLAN_ERROR_INVALID_PROPERTY, /*< nick=InvalidProperty >*/
-	NM_SETTING_VLAN_ERROR_MISSING_PROPERTY, /*< nick=MissingProperty >*/
-	NM_SETTING_VLAN_ERROR_INVALID_PARENT    /*< nick=InvalidParent >*/
-} NMSettingVlanError;
-

-

+
Functions

+
--++
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
-
+
-
-
+
+
+
+
+
+
+
+
+

 




 
 
 
NM_SETTING_VLAN_ERROR_UNKNOWN
unknown or unclassified error
+
+GQuark
+
+nm_setting_vlan_error_quark ()
+

+NMSetting *
+
+nm_setting_vlan_new ()
+
const char *
+
+nm_setting_vlan_get_interface_name ()
+
const char *
+
+nm_setting_vlan_get_parent ()
+

+guint32
+
+nm_setting_vlan_get_id ()
+

+guint32
+
+nm_setting_vlan_get_flags ()
+

+gint32
+
+nm_setting_vlan_get_num_priorities ()
 
 

 
NM_SETTING_VLAN_ERROR_INVALID_PROPERTY
the property was invalid
+
+gboolean
+
+nm_setting_vlan_get_priority ()
 
 

 
NM_SETTING_VLAN_ERROR_MISSING_PROPERTY
the property was missing and is
-  required
+
+gboolean
+
+nm_setting_vlan_add_priority ()
 
 

 
NM_SETTING_VLAN_ERROR_INVALID_PARENT
the VLAN parent was specified
-  inconsistently
+
+void
+
+nm_setting_vlan_remove_priority ()
+

+void
+
+nm_setting_vlan_clear_priorities ()
+

+gboolean
+
+nm_setting_vlan_add_priority_str ()
 
 

 
 

 

-

-

-
NM_SETTING_VLAN_ERROR

-
#define NM_SETTING_VLAN_ERROR nm_setting_vlan_error_quark ()
-

-

-

+

+
Properties

+

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+






+GSList_gchararray_ *egress-priority-mapRead / Write
guintflagsRead / Write / Construct
guintidRead / Write / Construct

+GSList_gchararray_ *ingress-priority-mapRead / Write

+gchar *interface-nameRead / Write / Construct

+gchar *parentRead / Write / Construct

 

-

-

-
nm_setting_vlan_error_quark ()

-
GQuark              nm_setting_vlan_error_quark         (void);

-

-Registers an error quark for NMSettingVlan if necessary.
-

-

+

+
Types and Values

+
--++
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

 




 
Returns :
the error quark used for NMSettingVlan errors.
#defineNM_SETTING_VLAN_SETTING_NAME
enumNMSettingVlanError
#defineNM_SETTING_VLAN_ERROR
#defineNM_SETTING_VLAN_INTERFACE_NAME
#defineNM_SETTING_VLAN_PARENT
#defineNM_SETTING_VLAN_ID
#defineNM_SETTING_VLAN_FLAGS
#defineNM_SETTING_VLAN_INGRESS_PRIORITY_MAP
#defineNM_SETTING_VLAN_EGRESS_PRIORITY_MAP
enumNMVlanPriorityMap
enumNMVlanFlags

 

 

-

-

-
NM_SETTING_VLAN_INTERFACE_NAME

-
#define NM_SETTING_VLAN_INTERFACE_NAME       "interface-name"
+

+
Object Hierarchy

+
    GEnum
+    ├── NMSettingVlanError
+    ├── NMVlanFlags
+    ╰── NMVlanPriorityMap
+    GObject
+    ╰── NMSetting
+        ╰── NMSettingVlan
 

-

-

 

-

-

-
NM_SETTING_VLAN_PARENT

-
#define NM_SETTING_VLAN_PARENT               "parent"
+

+
Includes

+
#include <nm-setting-vlan.h>
 

-

-

 

-

+

+
Description

+
The NMSettingVlan object is a NMSetting subclass that describes properties
+necessary for connection to VLAN interfaces.

+

+

+
Functions

 

-
NM_SETTING_VLAN_ID

-
#define NM_SETTING_VLAN_ID                   "id"
-

-

-

+
nm_setting_vlan_error_quark ()

+
GQuark
+nm_setting_vlan_error_quark (void);

+
Registers an error quark for NMSettingVlan if necessary.

+

+
Returns

+
 the error quark used for NMSettingVlan errors.

+

+

 

 

 

-
NM_SETTING_VLAN_FLAGS

-
#define NM_SETTING_VLAN_FLAGS                "flags"
-

-

-

+
nm_setting_vlan_new ()

+
NMSetting *
+nm_setting_vlan_new (void);

+
Creates a new NMSettingVlan object with default values.

+

+
Returns

+
 the new empty NMSettingVlan object. 

+
[transfer full]

+

 

 

 

-
NM_SETTING_VLAN_INGRESS_PRIORITY_MAP

-
#define NM_SETTING_VLAN_INGRESS_PRIORITY_MAP "ingress-priority-map"
-

-

-

+
nm_setting_vlan_get_interface_name ()

+
const char *
+nm_setting_vlan_get_interface_name (NMSettingVlan *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingVlan
 

+

+

+
Returns

+
 the “interface_name” property of the setting

+

+

 

 

 

-
NM_SETTING_VLAN_EGRESS_PRIORITY_MAP

-
#define NM_SETTING_VLAN_EGRESS_PRIORITY_MAP  "egress-priority-map"
-

-

-

+
nm_setting_vlan_get_parent ()

+
const char *
+nm_setting_vlan_get_parent (NMSettingVlan *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingVlan
 

+

+

+
Returns

+
 the “parent” property of the setting

+

+

 

 

 

-
NMSettingVlan

-
typedef struct _NMSettingVlan NMSettingVlan;

-

-

+
nm_setting_vlan_get_id ()

+
guint32
+nm_setting_vlan_get_id (NMSettingVlan *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingVlan
 

+

+

+
Returns

+
 the “id” property of the setting

+

+

 

 

 

-
NMSettingVlanClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingVlanClass;
-

-

-

+
nm_setting_vlan_get_flags ()

+
guint32
+nm_setting_vlan_get_flags (NMSettingVlan *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingVlan
 

+

+

+
Returns

+
 the “flags” property of the setting

+

+

 

 

 

-
enum NMVlanPriorityMap

-
typedef enum {
-	NM_VLAN_INGRESS_MAP,
-	NM_VLAN_EGRESS_MAP
-} NMVlanPriorityMap;
-

-

-A selector for traffic priority maps; these map Linux SKB priorities
-to 802.1p priorities used in VLANs.
-

-

+
nm_setting_vlan_get_num_priorities ()

+
gint32
+nm_setting_vlan_get_num_priorities (NMSettingVlan *setting,
+                                    NMVlanPriorityMap map);

+
Returns the number of entires in the
+“ingress_priority_map” or “egress_priority_map”
+properties of this setting.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
NM_VLAN_INGRESS_MAP
map for incoming data
-
setting
the NMSettingVlan
 
 

 
NM_VLAN_EGRESS_MAP
map for outgoing data
-
map
the type of priority map
 
 

 
 

 

+

+
Returns

+
 return the number of ingress/egress priority entries, -1 if error

+

+

+

 

 

-
enum NMVlanFlags

-
typedef enum {
-	NM_VLAN_FLAG_REORDER_HEADERS = 0x1,
-	NM_VLAN_FLAG_GVRP            = 0x2,
-	NM_VLAN_FLAG_LOOSE_BINDING   = 0x4,
-
-	/* NOTE: if adding flags update nm-setting-vlan.c::verify() */
-} NMVlanFlags;
-

-

-NMVlanFlags values control the behavior of the VLAN interface.
-

-

+
nm_setting_vlan_get_priority ()

+
gboolean
+nm_setting_vlan_get_priority (NMSettingVlan *setting,
+                              NMVlanPriorityMap map,
+                              guint32 idx,
+                              guint32 *out_from,
+                              guint32 *out_to);

+
Retrieve one of the entries of the “ingress_priority_map”
+or “egress_priority_map” properties of this setting.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+

 





 
 
 
NM_VLAN_FLAG_REORDER_HEADERS
indicates that this interface should reorder
- outgoing packet headers to look more like a non-VLAN ethernet interface
-
setting
the NMSettingVlan
 
 

 
NM_VLAN_FLAG_GVRP
indicates that this interface should use GVRP to register
- itself with it's switch
-
map
the type of priority map
 
 

 
NM_VLAN_FLAG_LOOSE_BINDING
indicates that this interface's operating
- state is tied to the underlying network interface but other details
- (like routing) are not.
-
idx
the zero-based index of the ingress/egress priority map entry
 
out_from
 on return the value of the priority map's 'from' item. 
[out]
out_to
 on return the value of priority map's 'to' item. 
[out]
 

 
 

 

-

-

-
nm_setting_vlan_new ()

-
NMSetting *         nm_setting_vlan_new                 (void);

-

-Creates a new NMSettingVlan object with default values.
-

-

----
-
-
-
-
-




Returns :
the new empty NMSettingVlan object. [transfer full]
-

+

+
Returns

+
 TRUE if a priority map was returned, FALSE if error

+

+

 

 

 

-
nm_setting_vlan_get_interface_name ()

-
const char *        nm_setting_vlan_get_interface_name  (NMSettingVlan *setting);

-

+
nm_setting_vlan_add_priority ()

+
gboolean
+nm_setting_vlan_add_priority (NMSettingVlan *setting,
+                              NMVlanPriorityMap map,
+                              guint32 from,
+                              guint32 to);

+
Adds a priority mapping to the “ingress_priority_map” or
+“egress_priority_map” properties of the setting. If from
+ is
+already in the given priority map, this function will overwrite the
+existing entry with the new to
+.

+
If map
+ is NM_VLAN_INGRESS_MAP then from
+ is the incoming 802.1q VLAN
+Priority Code Point (PCP) value, and to
+ is the Linux SKB priority value.

+
If map
+ is NM_VLAN_EGRESS_MAP then from
+ is the Linux SKB priority value and
+to
+ is the outgoing 802.1q VLAN Priority Code Point (PCP) value.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+
-
-

 





 
 
 
setting :
the NMSettingVlan
-
setting
the NMSettingVlan
 
 

 
Returns :
the "interface_name" property of the setting
map
the type of priority map
 
 

-

-

-

-
nm_setting_vlan_get_parent ()

-
const char *        nm_setting_vlan_get_parent          (NMSettingVlan *setting);

-

----
-
-
-
+
+
+
-
-
+
+
+




 
setting :
the NMSettingVlan
-
from
the priority to map to to
+
 
 

 
Returns :
the "parent" property of the setting
to
the priority to map from
+to
 
 

 
 

 

+

+
Returns

+
 TRUE if the new priority mapping was successfully added to the
+list, FALSE if error

+

+

+

 

 

-
nm_setting_vlan_get_id ()

-
guint32             nm_setting_vlan_get_id              (NMSettingVlan *setting);

-

+
nm_setting_vlan_remove_priority ()

+
void
+nm_setting_vlan_remove_priority (NMSettingVlan *setting,
+                                 NMVlanPriorityMap map,
+                                 guint32 idx);

+
Removes the priority map at index idx
+ from the
+“ingress_priority_map” or “egress_priority_map”
+properties.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+
+
+
+
+
+

 





 
 
 
setting :
the NMSettingVlan
-
setting
the NMSettingVlan
 
 

 
Returns :
the "id" property of the setting
map
the type of priority map
 
idx
the zero-based index of the priority map to remove
 
 

 
 

 

+

 

 

-
nm_setting_vlan_get_flags ()

-
guint32             nm_setting_vlan_get_flags           (NMSettingVlan *setting);

-

+
nm_setting_vlan_clear_priorities ()

+
void
+nm_setting_vlan_clear_priorities (NMSettingVlan *setting,
+                                  NMVlanPriorityMap map);

+
Clear all the entires from “ingress_priority_map” or
+“egress_priority_map” properties.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingVlan
-
setting
the NMSettingVlan
 
 

 
Returns :
the "flags" property of the setting
map
the type of priority map
 
 

 
 

 

+

 

 

-
nm_setting_vlan_get_num_priorities ()

-
gint32              nm_setting_vlan_get_num_priorities  (NMSettingVlan *setting,
-                                                         NMVlanPriorityMap map);

-

-Returns the number of entires in the
-"ingress_priority_map" or "egress_priority_map"
-properties of this setting.
-

-

+
nm_setting_vlan_add_priority_str ()

+
gboolean
+nm_setting_vlan_add_priority_str (NMSettingVlan *setting,
+                                  NMVlanPriorityMap map,
+                                  const char *str);

+
Adds a priority map entry into either the “ingress_priority_map”
+or the “egress_priority_map” properties.  The priority map maps
+the Linux SKB priorities to 802.1p priorities.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingVlan
-
setting
the NMSettingVlan
 
 

 
map :
the type of priority map
map
the type of priority map
 
 

 
Returns :
return the number of ingress/egress priority entries, -1 if error
str
the string which contains a priority map, like "3:7"
 
 

 
 

 

-

+

+
Returns

+
 TRUE if the entry was successfully added to the list, or it
+overwrote the old value, FALSE if error

+

+

+

+

+

+
Types and Values

 

-
nm_setting_vlan_get_priority ()

-
gboolean            nm_setting_vlan_get_priority        (NMSettingVlan *setting,
-                                                         NMVlanPriorityMap map,
-                                                         guint32 idx,
-                                                         guint32 *out_from,
-                                                         guint32 *out_to);

+
NM_SETTING_VLAN_SETTING_NAME

+
#define NM_SETTING_VLAN_SETTING_NAME "vlan"
+

 

-Retrieve one of the entries of the "ingress_priority_map"
-or "egress_priority_map" properties of this setting.
 

-

+
+

+

+
enum NMSettingVlanError

+

+
Members

+
--+++
-
-
+
+
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingVlan
+
NM_SETTING_VLAN_ERROR_UNKNOWN

+
unknown or unclassified error

 		 
 

 
map :
the type of priority map
idx :
the zero-based index of the ingress/egress priority map entry
out_from :
on return the value of the priority map's 'from' item. [out]
+
NM_SETTING_VLAN_ERROR_INVALID_PROPERTY

+
the property was invalid

 		 
 

 
out_to :
on return the value of priority map's 'to' item. [out]
+
NM_SETTING_VLAN_ERROR_MISSING_PROPERTY

+
the property was missing and is
+  required

 		 
 

 
Returns :

-TRUE if a priority map was returned, FALSE if error
NM_SETTING_VLAN_ERROR_INVALID_PARENT

+
the VLAN parent was specified
+  inconsistently

+		 
 

 
 

 

+

+

+

+
NM_SETTING_VLAN_ERROR

+
#define NM_SETTING_VLAN_ERROR nm_setting_vlan_error_quark ()
+

+

+

+

 

 

-
nm_setting_vlan_add_priority ()

-
gboolean            nm_setting_vlan_add_priority        (NMSettingVlan *setting,
-                                                         NMVlanPriorityMap map,
-                                                         guint32 from,
-                                                         guint32 to);

+
NM_SETTING_VLAN_INTERFACE_NAME

+
#define NM_SETTING_VLAN_INTERFACE_NAME       "interface-name"
+

 

-Adds a priority mapping to the "ingress_priority_map" or
-"egress_priority_map" properties of the setting. If from is
-already in the given priority map, this function will overwrite the
-existing entry with the new to.
 

+

+

+

+
NM_SETTING_VLAN_PARENT

+
#define NM_SETTING_VLAN_PARENT               "parent"
+

 

-If map is NM_VLAN_INGRESS_MAP then from is the incoming 802.1q VLAN
-Priority Code Point (PCP) value, and to is the Linux SKB priority value.
 

+

+

+

+
NM_SETTING_VLAN_ID

+
#define NM_SETTING_VLAN_ID                   "id"
+

 

-If map is NM_VLAN_EGRESS_MAP then from is the Linux SKB priority value and
-to is the outgoing 802.1q VLAN Priority Code Point (PCP) value.
 

-

----
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingVlan
-
map :
the type of priority map
from :
the priority to map to to
-
to :
the priority to map from to
Returns :
TRUE if the new priority mapping was successfully added to the
-list, FALSE if error

 

 

 

-
nm_setting_vlan_remove_priority ()

-
void                nm_setting_vlan_remove_priority     (NMSettingVlan *setting,
-                                                         NMVlanPriorityMap map,
-                                                         guint32 idx);

+
NM_SETTING_VLAN_FLAGS

+
#define NM_SETTING_VLAN_FLAGS                "flags"
+

+

+

+

+

+

+
NM_SETTING_VLAN_INGRESS_PRIORITY_MAP

+
#define NM_SETTING_VLAN_INGRESS_PRIORITY_MAP "ingress-priority-map"
+

 

-Removes the priority map at index idx from the
-"ingress_priority_map" or "egress_priority_map"
-properties.
 

-

----
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingVlan
-
map :
the type of priority map
idx :
the zero-based index of the priority map to remove

 

 

 

-
nm_setting_vlan_clear_priorities ()

-
void                nm_setting_vlan_clear_priorities    (NMSettingVlan *setting,
-                                                         NMVlanPriorityMap map);

+
NM_SETTING_VLAN_EGRESS_PRIORITY_MAP

+
#define NM_SETTING_VLAN_EGRESS_PRIORITY_MAP  "egress-priority-map"
+

 

-Clear all the entires from "ingress_priority_map" or
-"egress_priority_map" properties.
 

-

+
+

+

+
enum NMVlanPriorityMap

+
A selector for traffic priority maps; these map Linux SKB priorities
+to 802.1p priorities used in VLANs.

+

+
Members

+
--+++
-
-
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingVlan
+
NM_VLAN_INGRESS_MAP

+
map for incoming data

 		 
 

 
map :
the type of priority map
NM_VLAN_EGRESS_MAP

+
map for outgoing data

+		 
 

 
 

 

+
 

 

-
nm_setting_vlan_add_priority_str ()

-
gboolean            nm_setting_vlan_add_priority_str    (NMSettingVlan *setting,
-                                                         NMVlanPriorityMap map,
-                                                         const char *str);

-

-Adds a priority map entry into either the "ingress_priority_map"
-or the "egress_priority_map" properties.  The priority map maps
-the Linux SKB priorities to 802.1p priorities.
-

-

+
enum NMVlanFlags

+
NMVlanFlags values control the behavior of the VLAN interface.

+

+
Members

+
--+++
-
-
+
+
-
-
-
-
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingVlan
+
NM_VLAN_FLAG_REORDER_HEADERS

+
indicates that this interface should reorder
+ outgoing packet headers to look more like a non-VLAN ethernet interface

 		 
 

 
map :
the type of priority map
str :
the string which contains a priority map, like "3:7"
NM_VLAN_FLAG_GVRP

+
indicates that this interface should use GVRP to register
+ itself with it's switch

+		 
 

 
Returns :
TRUE if the entry was successfully added to the list, or it
-overwrote the old value, FALSE if error
NM_VLAN_FLAG_LOOSE_BINDING

+
indicates that this interface's operating
+ state is tied to the underlying network interface but other details
+ (like routing) are not.

+		 
 

 
 

 

 
+
 

 
Property Details

 

-
The "egress-priority-map" property

-
  "egress-priority-map"      GSList_gchararray_*   : Read / Write

-

-For outgoing packets, a list of mappings from Linux SKB priorities to
-802.1p priorities.  The mapping is given in the format 'from:to'
-where both 'from' and 'to' are unsigned integers, ie '7:3'.
-

+
The “egress-priority-map” property

+
  “egress-priority-map”      GSList_gchararray_ *

+
For outgoing packets, a list of mappings from Linux SKB priorities to 802.1p priorities.  The mapping is given in the format 'from:to' where both 'from' and 'to' are unsigned integers, ie '7:3'.

+
Flags: Read / Write

 

 

 

-
The "flags" property

-
  "flags"                    guint                 : Read / Write / Construct

-

-One or more of NMVlanFlags which control the behavior and features of
-the VLAN interface.
-

+
The “flags” property

+
  “flags”                    guint

+
One or more flags which control the behavior and features of the VLAN interface.  Flags include reordering of output packet headers (0x01), use of the GVRP protocol (0x02), and loose binding of the interface to its master device's operating state (0x04).

+
Flags: Read / Write / Construct

 
Default value: 0

 

 

 

-
The "id" property

-
  "id"                       guint                 : Read / Write / Construct

-

-The VLAN identifier the interface created by this connection should be
-assigned.
-

+
The “id” property

+
  “id”                       guint

+
The VLAN indentifier the interface created by this connection should be assigned.

+
Flags: Read / Write / Construct

 
Allowed values: <= 4095

 
Default value: 0

 

 

 

-
The "ingress-priority-map" property

-
  "ingress-priority-map"     GSList_gchararray_*   : Read / Write

-

-For incoming packets, a list of mappings from 802.1p priorities to Linux
-SKB priorities.  The mapping is given in the format 'from:to' where both
-'from' and 'to' are unsigned integers, ie '7:3'.
-

+
The “ingress-priority-map” property

+
  “ingress-priority-map”     GSList_gchararray_ *

+
For incoming packets, a list of mappings from 802.1p priorities to Linux SKB priorities.  The mapping is given in the format 'from:to' where both 'from' and 'to' are unsigned integers, ie '7:3'.

+
Flags: Read / Write

 

 

 

-
The "interface-name" property

-
  "interface-name"           gchar*                : Read / Write / Construct

-

-If given, specifies the kernel name of the VLAN interface. If not given,
-a default name will be constructed from the interface described by the
-parent interface and the "id" , ex 'eth2.1'. The parent
-interface may be given by the "parent" property or by a
-hardware address property, eg "mac-address".
-

+
The “interface-name” property

+
  “interface-name”           gchar *

+
If given, specifies the kernel name of the VLAN interface. If not given, a default name will be constructed from the interface described by the parent interface and the 'id' property, ex 'eth2.1'. The parent interface may be given by the 'parent' property or by a hardware address property, eg the 'wired' settings' 'mac-address' property.

+
Flags: Read / Write / Construct

 
Default value: NULL

 

 

 

-
The "parent" property

-
  "parent"                   gchar*                : Read / Write / Construct

-

-If given, specifies the parent interface name or parent connection UUID
-from which this VLAN interface should be created.  If this property is
-not specified, the connection must contain a hardware address in a
-hardware-specific setting, like "mac-address".
-

+
The “parent” property

+
  “parent”                   gchar *

+
If given, specifies the parent interface name or parent connection UUID from which this VLAN interface should be created.  If this property is not specified, the connection must contain a hardware address in a hardware-specific setting, like the 'wired' settings' 'mac-address' property.

+
Flags: Read / Write / Construct

 
Default value: NULL

 

 

 
 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.20
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingWimax.html b/docs/libnm-util/html/NMSettingWimax.html
index 00676582..89053dca 100644
--- a/docs/libnm-util/html/NMSettingWimax.html
+++ b/docs/libnm-util/html/NMSettingWimax.html
@@ -2,34 +2,28 @@
 
 
 
-NMSettingWimax
+libnm-util Reference Manual: NMSettingWimax
 
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
 

 

 

@@ -37,250 +31,297 @@
 
NMSettingWimax
NMSettingWimax — Describes 802.16e Mobile WiMAX connection properties

-
+

 
 
 

-

-
Synopsis

-
-#include <nm-setting-wimax.h>
-
-#define             NM_SETTING_WIMAX_SETTING_NAME
-enum                NMSettingWimaxError;
-#define             NM_SETTING_WIMAX_ERROR
-GQuark              nm_setting_wimax_error_quark        (void);
-#define             NM_SETTING_WIMAX_NETWORK_NAME
-#define             NM_SETTING_WIMAX_MAC_ADDRESS
-                    NMSettingWimax;
-                    NMSettingWimaxClass;
-NMSetting *         nm_setting_wimax_new                (void);
-const char *        nm_setting_wimax_get_network_name   (NMSettingWimax *setting);
-const GByteArray *  nm_setting_wimax_get_mac_address    (NMSettingWimax *setting);
-

-

-

-
Object Hierarchy

-
-  GEnum
-   +----NMSettingWimaxError
-

-
-  GObject
-   +----NMSetting
-         +----NMSettingWimax
-

-

-

-
Properties

-
-  "mac-address"              GArray_guchar_*       : Read / Write
-  "network-name"             gchar*                : Read / Write
-

-

-

-
Description

-

-The NMSettingWimax object is a NMSetting subclass that describes properties
-necessary for connection to 802.16e Mobile WiMAX networks.
-

-

 

-
Details

-

-
NM_SETTING_WIMAX_SETTING_NAME

-
#define NM_SETTING_WIMAX_SETTING_NAME "wimax"
-

-

-

-

-

-

-
enum NMSettingWimaxError

-
typedef enum {
-	NM_SETTING_WIMAX_ERROR_UNKNOWN = 0,      /*< nick=UnknownError >*/
-	NM_SETTING_WIMAX_ERROR_INVALID_PROPERTY, /*< nick=InvalidProperty >*/
-	NM_SETTING_WIMAX_ERROR_MISSING_PROPERTY  /*< nick=MissingProperty >*/
-} NMSettingWimaxError;
-

-

+
Functions

+
--++
-
-
+
-
-
+
-
-
+
+
+
+
+

 




 
 
 
NM_SETTING_WIMAX_ERROR_UNKNOWN
unknown or unclassified error
+
+GQuark
+
+nm_setting_wimax_error_quark ()
 
 

 
NM_SETTING_WIMAX_ERROR_INVALID_PROPERTY
the property was invalid
+
+NMSetting *
+
+nm_setting_wimax_new ()
 
 

 
NM_SETTING_WIMAX_ERROR_MISSING_PROPERTY
the property was missing and is
-required
+const char *
+
+nm_setting_wimax_get_network_name ()
+
const GByteArray *
+
+nm_setting_wimax_get_mac_address ()
 
 

 
 

 

-

-

-
NM_SETTING_WIMAX_ERROR

-
#define NM_SETTING_WIMAX_ERROR nm_setting_wimax_error_quark ()
-

-

-

+

+
Properties

+

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+






+GArray_guchar_ *mac-addressRead / Write

+gchar *network-nameRead / Write

 

-

-

-
nm_setting_wimax_error_quark ()

-
GQuark              nm_setting_wimax_error_quark        (void);

-

-Registers an error quark for NMSettingWimax if necessary.
-

-

+

+
Types and Values

+
--++
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

 




 
Returns :
the error quark used for NMSettingWimax errors.
#defineNM_SETTING_WIMAX_SETTING_NAME
enumNMSettingWimaxError
#defineNM_SETTING_WIMAX_ERROR
#defineNM_SETTING_WIMAX_NETWORK_NAME
#defineNM_SETTING_WIMAX_MAC_ADDRESS

 

 

-

-

-
NM_SETTING_WIMAX_NETWORK_NAME

-
#define NM_SETTING_WIMAX_NETWORK_NAME "network-name"
+

+
Object Hierarchy

+
    GEnum
+    ╰── NMSettingWimaxError
+    GObject
+    ╰── NMSetting
+        ╰── NMSettingWimax
 

-

-

 

-

-

-
NM_SETTING_WIMAX_MAC_ADDRESS

-
#define NM_SETTING_WIMAX_MAC_ADDRESS  "mac-address"
+

+
Includes

+
#include <nm-setting-wimax.h>
 

-

-

 

-

+

+
Description

+
The NMSettingWimax object is a NMSetting subclass that describes properties
+necessary for connection to 802.16e Mobile WiMAX networks.

+

+

+
Functions

 

-
NMSettingWimax

-
typedef struct _NMSettingWimax NMSettingWimax;

-

-

+
nm_setting_wimax_error_quark ()

+
GQuark
+nm_setting_wimax_error_quark (void);

+
Registers an error quark for NMSettingWimax if necessary.

+

+
Returns

+
 the error quark used for NMSettingWimax errors.

+

+

 

 

 

-
NMSettingWimaxClass

-
typedef struct {
-	NMSettingClass parent;
-} NMSettingWimaxClass;
-

-

-

+
nm_setting_wimax_new ()

+
NMSetting *
+nm_setting_wimax_new (void);

+
Creates a new NMSettingWimax object with default values.

+

+
Returns

+
 the new empty NMSettingWimax object

+

+

 

 

 

-
nm_setting_wimax_new ()

-
NMSetting *         nm_setting_wimax_new                (void);

-

-Creates a new NMSettingWimax object with default values.
-

-

+
nm_setting_wimax_get_network_name ()

+
const char *
+nm_setting_wimax_get_network_name (NMSettingWimax *setting);

+
Returns the WiMAX NSP name (ex "Sprint" or "CLEAR") which identifies the
+specific WiMAX network this setting describes a connection to.

+

+
Parameters

+
--+++
-
-
+
+
+

 





 
 
Returns :
the new empty NMSettingWimax object
setting
the NMSettingWimax
 
 

 

 

+

+
Returns

+
 the WiMAX NSP name

+

+

+

 

 

-
nm_setting_wimax_get_network_name ()

-
const char *        nm_setting_wimax_get_network_name   (NMSettingWimax *setting);

-

-Returns the WiMAX NSP name (ex "Sprint" or "CLEAR") which identifies the
-specific WiMAX network this setting describes a connection to.
-

-

+
nm_setting_wimax_get_mac_address ()

+
const GByteArray *
+nm_setting_wimax_get_mac_address (NMSettingWimax *setting);

+
Returns the MAC address of a WiMAX device which this connection is locked
+to.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingWimax
-
Returns :
the WiMAX NSP name
setting
the NMSettingWimax
 

 

 

-

+

+
Returns

+
 the MAC address

+

+

+

+

+

+
Types and Values

 

-
nm_setting_wimax_get_mac_address ()

-
const GByteArray *  nm_setting_wimax_get_mac_address    (NMSettingWimax *setting);

+
NM_SETTING_WIMAX_SETTING_NAME

+
#define NM_SETTING_WIMAX_SETTING_NAME "wimax"
+

 

-Returns the MAC address of a WiMAX device which this connection is locked
-to.
 

-

+
+

+

+
enum NMSettingWimaxError

+

+
Members

+
--+++
-
-
+
+
-
-
+
+
+
+
+
+
+
+

 





 
 
 
setting :
the NMSettingWimax
+
NM_SETTING_WIMAX_ERROR_UNKNOWN

+
unknown or unclassified error

 		 
 

 
Returns :
the MAC address
NM_SETTING_WIMAX_ERROR_INVALID_PROPERTY

+
the property was invalid

+		 
NM_SETTING_WIMAX_ERROR_MISSING_PROPERTY

+
the property was missing and is
+required

+		 
 

 
 

 

 

-

-
Property Details

+

+

+
NM_SETTING_WIMAX_ERROR

+
#define NM_SETTING_WIMAX_ERROR nm_setting_wimax_error_quark ()
+

+

+

+

+

 

-
The "mac-address" property

-
  "mac-address"              GArray_guchar_*       : Read / Write

+
NM_SETTING_WIMAX_NETWORK_NAME

+
#define NM_SETTING_WIMAX_NETWORK_NAME "network-name"
+

 

-If specified, this connection will only apply to the WiMAX device
-whose MAC address matches. This property does not change the MAC address
-of the device (known as MAC spoofing).
 

 

 

 

-
The "network-name" property

-
  "network-name"             gchar*                : Read / Write

+
NM_SETTING_WIMAX_MAC_ADDRESS

+
#define NM_SETTING_WIMAX_MAC_ADDRESS  "mac-address"
+

 

-Network Service Provider (NSP) name of the WiMAX network this connection
-should use.
 

+

+

+

+
Property Details

+

+
The “mac-address” property

+
  “mac-address”              GArray_guchar_ *

+
If specified, this connection will only apply to the WiMAX device whose MAC address matches.  This property does not change the MAC address of the device (known as MAC spoofing).

+
Flags: Read / Write

+

+

+

+
The “network-name” property

+
  “network-name”             gchar *

+
Network Service Provider (NSP) name of the WiMAX network this connection should use.

+
Flags: Read / Write

 
Default value: NULL

 

 

 

 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.20

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingWired.html b/docs/libnm-util/html/NMSettingWired.html
index 75d9cf16..123af42f 100644
--- a/docs/libnm-util/html/NMSettingWired.html
+++ b/docs/libnm-util/html/NMSettingWired.html
@@ -2,34 +2,28 @@
 
 
 
-NMSettingWired
+libnm-util Reference Manual: NMSettingWired
 
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
 

 

 

@@ -37,781 +31,985 @@
 
NMSettingWired
NMSettingWired — Describes connection properties for Ethernet-based networks

-
+

 
 
 

-

-
Synopsis

-
-#include <nm-setting-wired.h>
-
-#define             NM_SETTING_WIRED_SETTING_NAME
-enum                NMSettingWiredError;
-#define             NM_SETTING_WIRED_ERROR
-GQuark              nm_setting_wired_error_quark        (void);
-#define             NM_SETTING_WIRED_PORT
-#define             NM_SETTING_WIRED_SPEED
-#define             NM_SETTING_WIRED_DUPLEX
-#define             NM_SETTING_WIRED_AUTO_NEGOTIATE
-#define             NM_SETTING_WIRED_MAC_ADDRESS
-#define             NM_SETTING_WIRED_CLONED_MAC_ADDRESS
-#define             NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST
-#define             NM_SETTING_WIRED_MTU
-#define             NM_SETTING_WIRED_S390_SUBCHANNELS
-#define             NM_SETTING_WIRED_S390_NETTYPE
-#define             NM_SETTING_WIRED_S390_OPTIONS
-                    NMSettingWired;
-                    NMSettingWiredClass;
-NMSetting *         nm_setting_wired_new                (void);
-const char *        nm_setting_wired_get_port           (NMSettingWired *setting);
-guint32             nm_setting_wired_get_speed          (NMSettingWired *setting);
-const char *        nm_setting_wired_get_duplex         (NMSettingWired *setting);
-gboolean            nm_setting_wired_get_auto_negotiate (NMSettingWired *setting);
-const GByteArray *  nm_setting_wired_get_mac_address    (NMSettingWired *setting);
-const GByteArray *  nm_setting_wired_get_cloned_mac_address
-                                                        (NMSettingWired *setting);
-const GSList *      nm_setting_wired_get_mac_address_blacklist
-                                                        (NMSettingWired *setting);
-guint32             nm_setting_wired_get_mtu            (NMSettingWired *setting);
-const GPtrArray *   nm_setting_wired_get_s390_subchannels
-                                                        (NMSettingWired *setting);
-const char *        nm_setting_wired_get_s390_nettype   (NMSettingWired *setting);
-guint32             nm_setting_wired_get_num_s390_options
-                                                        (NMSettingWired *setting);
-gboolean            nm_setting_wired_get_s390_option    (NMSettingWired *setting,
-                                                         guint32 idx,
-                                                         const char **out_key,
-                                                         const char **out_value);
-const char *        nm_setting_wired_get_s390_option_by_key
-                                                        (NMSettingWired *setting,
-                                                         const char *key);
-gboolean            nm_setting_wired_add_s390_option    (NMSettingWired *setting,
-                                                         const char *key,
-                                                         const char *item);
-gboolean            nm_setting_wired_remove_s390_option (NMSettingWired *setting,
-                                                         const char *key);
-

-

-

-
Object Hierarchy

-
-  GEnum
-   +----NMSettingWiredError
-

-
-  GObject
-   +----NMSetting
-         +----NMSettingWired
-

-

-

-
Properties

-
-  "auto-negotiate"           gboolean              : Read / Write / Construct
-  "cloned-mac-address"       GArray_guchar_*       : Read / Write
-  "duplex"                   gchar*                : Read / Write
-  "mac-address"              GArray_guchar_*       : Read / Write
-  "mac-address-blacklist"    GSList_gchararray_*   : Read / Write
-  "mtu"                      guint                 : Read / Write / Construct
-  "port"                     gchar*                : Read / Write
-  "s390-nettype"             gchar*                : Read / Write
-  "s390-options"             GHashTable_gchararray+gchararray_*  : Read / Write
-  "s390-subchannels"         GPtrArray_gchararray_*  : Read / Write
-  "speed"                    guint                 : Read / Write / Construct
-

-

-

-
Description

-

-The NMSettingWired object is a NMSetting subclass that describes properties
-necessary for connection to Ethernet networks.
-

-

 

-
Details

-

-
NM_SETTING_WIRED_SETTING_NAME

-
#define NM_SETTING_WIRED_SETTING_NAME "802-3-ethernet"
-

-

-

-

-

-

-
enum NMSettingWiredError

-
typedef enum {
-	NM_SETTING_WIRED_ERROR_UNKNOWN = 0,      /*< nick=UnknownError >*/
-	NM_SETTING_WIRED_ERROR_INVALID_PROPERTY, /*< nick=InvalidProperty >*/
-	NM_SETTING_WIRED_ERROR_MISSING_PROPERTY  /*< nick=MissingProperty >*/
-} NMSettingWiredError;
-

-

+
Functions

+
--++
-
-
+
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

 




 
 
 
NM_SETTING_WIRED_ERROR_UNKNOWN
unknown or unclassified error
+
+GQuark
+
+nm_setting_wired_error_quark ()
 
 

 
NM_SETTING_WIRED_ERROR_INVALID_PROPERTY
the property was invalid
+
+NMSetting *
+
+nm_setting_wired_new ()
 
 

 
NM_SETTING_WIRED_ERROR_MISSING_PROPERTY
the property was missing and is
-required
+const char *
+
+nm_setting_wired_get_port ()
+

+guint32
+
+nm_setting_wired_get_speed ()
+
const char *
+
+nm_setting_wired_get_duplex ()
+

+gboolean
+
+nm_setting_wired_get_auto_negotiate ()
+
const GByteArray *
+
+nm_setting_wired_get_mac_address ()
+
const GByteArray *
+
+nm_setting_wired_get_cloned_mac_address ()
+
const GSList *
+
+nm_setting_wired_get_mac_address_blacklist ()
+

+guint32
+
+nm_setting_wired_get_mtu ()
+
const GPtrArray *
+
+nm_setting_wired_get_s390_subchannels ()
+
const char *
+
+nm_setting_wired_get_s390_nettype ()
+

+guint32
+
+nm_setting_wired_get_num_s390_options ()
+

+gboolean
+
+nm_setting_wired_get_s390_option ()
+
const char *
+
+nm_setting_wired_get_s390_option_by_key ()
+

+gboolean
+
+nm_setting_wired_add_s390_option ()
+

+gboolean
+
+nm_setting_wired_remove_s390_option ()
 
 

 
 

 

-

-

-
NM_SETTING_WIRED_ERROR

-
#define NM_SETTING_WIRED_ERROR nm_setting_wired_error_quark ()
-

-

-

+

+
Properties

+

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





gbooleanauto-negotiateRead / Write / Construct

+GArray_guchar_ *cloned-mac-addressRead / Write

+gchar *duplexRead / Write

+GArray_guchar_ *mac-addressRead / Write

+GSList_gchararray_ *mac-address-blacklistRead / Write
guintmtuRead / Write / Construct

+gchar *portRead / Write

+gchar *s390-nettypeRead / Write
GHashTable_gchararray+gchararray_*s390-optionsRead / Write

+GPtrArray_gchararray_ *s390-subchannelsRead / Write
guintspeedRead / Write / Construct

 

-

-

-
nm_setting_wired_error_quark ()

-
GQuark              nm_setting_wired_error_quark        (void);

-

-Registers an error quark for NMSettingWired if necessary.
-

-

+

+
Types and Values

+
--++
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

 




 
Returns :
the error quark used for NMSettingWired errors.
#defineNM_SETTING_WIRED_SETTING_NAME
enumNMSettingWiredError
#defineNM_SETTING_WIRED_ERROR
#defineNM_SETTING_WIRED_PORT
#defineNM_SETTING_WIRED_SPEED
#defineNM_SETTING_WIRED_DUPLEX
#defineNM_SETTING_WIRED_AUTO_NEGOTIATE
#defineNM_SETTING_WIRED_MAC_ADDRESS
#defineNM_SETTING_WIRED_CLONED_MAC_ADDRESS
#defineNM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST
#defineNM_SETTING_WIRED_MTU
#defineNM_SETTING_WIRED_S390_SUBCHANNELS
#defineNM_SETTING_WIRED_S390_NETTYPE
#defineNM_SETTING_WIRED_S390_OPTIONS

 

 

-

-

-
NM_SETTING_WIRED_PORT

-
#define NM_SETTING_WIRED_PORT "port"
+

+
Object Hierarchy

+
    GEnum
+    ╰── NMSettingWiredError
+    GObject
+    ╰── NMSetting
+        ╰── NMSettingWired
 

-

-

 

-

-

-
NM_SETTING_WIRED_SPEED

-
#define NM_SETTING_WIRED_SPEED "speed"
+

+
Includes

+
#include <nm-setting-wired.h>
 

-

-

 

-

-

-
NM_SETTING_WIRED_DUPLEX

-
#define NM_SETTING_WIRED_DUPLEX "duplex"
-

-

-

+

+
Description

+
The NMSettingWired object is a NMSetting subclass that describes properties
+necessary for connection to Ethernet networks.

 

-

+

+
Functions

 

-
NM_SETTING_WIRED_AUTO_NEGOTIATE

-
#define NM_SETTING_WIRED_AUTO_NEGOTIATE "auto-negotiate"
-

-

-

+
nm_setting_wired_error_quark ()

+
GQuark
+nm_setting_wired_error_quark (void);

+
Registers an error quark for NMSettingWired if necessary.

+

+
Returns

+
 the error quark used for NMSettingWired errors.

+

 

-

-

-
NM_SETTING_WIRED_MAC_ADDRESS

-
#define NM_SETTING_WIRED_MAC_ADDRESS "mac-address"
-

-

-

 

 

 

-
NM_SETTING_WIRED_CLONED_MAC_ADDRESS

-
#define NM_SETTING_WIRED_CLONED_MAC_ADDRESS "cloned-mac-address"
-

-

-

+
nm_setting_wired_new ()

+
NMSetting *
+nm_setting_wired_new (void);

+
Creates a new NMSettingWired object with default values.

+

+
Returns

+
 the new empty NMSettingWired object. 

+
[transfer full]

 

-

-

-
NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST

-
#define NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST "mac-address-blacklist"
-

-

-

 

 

 

-
NM_SETTING_WIRED_MTU

-
#define NM_SETTING_WIRED_MTU "mtu"
-

-

-

+
nm_setting_wired_get_port ()

+
const char *
+nm_setting_wired_get_port (NMSettingWired *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingWired
 

 

-

-

-
NM_SETTING_WIRED_S390_SUBCHANNELS

-
#define NM_SETTING_WIRED_S390_SUBCHANNELS "s390-subchannels"
-

-

-

+

+
Returns

+
 the “port” property of the setting

+

 

-

-

-
NM_SETTING_WIRED_S390_NETTYPE

-
#define NM_SETTING_WIRED_S390_NETTYPE "s390-nettype"
-

-

-

 

 

 

-
NM_SETTING_WIRED_S390_OPTIONS

-
#define NM_SETTING_WIRED_S390_OPTIONS "s390-options"
-

-

-

+
nm_setting_wired_get_speed ()

+
guint32
+nm_setting_wired_get_speed (NMSettingWired *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingWired
 

 

-

-

-
NMSettingWired

-
typedef struct _NMSettingWired NMSettingWired;

-

-

+

+
Returns

+
 the “speed” property of the setting

+

 

-

-

-
NMSettingWiredClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingWiredClass;
-

-

-

 

 

 

-
nm_setting_wired_new ()

-
NMSetting *         nm_setting_wired_new                (void);

-

-Creates a new NMSettingWired object with default values.
-

-

+
nm_setting_wired_get_duplex ()

+
const char *
+nm_setting_wired_get_duplex (NMSettingWired *setting);

+

+
Parameters

+
--+++
-
-
+
+
+

 





 
 
Returns :
the new empty NMSettingWired object. [transfer full]
-
setting
the NMSettingWired
 
 

 

 

+

+
Returns

+
 the “duplex” property of the setting

+

+

+

 

 

-
nm_setting_wired_get_port ()

-
const char *        nm_setting_wired_get_port           (NMSettingWired *setting);

-

+
nm_setting_wired_get_auto_negotiate ()

+
gboolean
+nm_setting_wired_get_auto_negotiate (NMSettingWired *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingWired
-
Returns :
the "port" property of the setting
setting
the NMSettingWired
 

 

 

+

+
Returns

+
 the “auto-negotiate” property of the setting

+

+

+

 

 

-
nm_setting_wired_get_speed ()

-
guint32             nm_setting_wired_get_speed          (NMSettingWired *setting);

-

+
nm_setting_wired_get_mac_address ()

+
const GByteArray *
+nm_setting_wired_get_mac_address (NMSettingWired *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingWired
-
Returns :
the "speed" property of the setting
setting
the NMSettingWired
 

 

 

+

+
Returns

+
 the “mac-address” property of the setting

+

+

+

 

 

-
nm_setting_wired_get_duplex ()

-
const char *        nm_setting_wired_get_duplex         (NMSettingWired *setting);

-

+
nm_setting_wired_get_cloned_mac_address ()

+
const GByteArray *
+nm_setting_wired_get_cloned_mac_address
+                               (NMSettingWired *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingWired
-
Returns :
the "duplex" property of the setting
setting
the NMSettingWired
 

 

 

+

+
Returns

+
 the “cloned-mac-address” property of the setting

+

+

+

 

 

-
nm_setting_wired_get_auto_negotiate ()

-
gboolean            nm_setting_wired_get_auto_negotiate (NMSettingWired *setting);

-

+
nm_setting_wired_get_mac_address_blacklist ()

+
const GSList *
+nm_setting_wired_get_mac_address_blacklist
+                               (NMSettingWired *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingWired
-
Returns :
the "auto-negotiate" property of the setting
setting
the NMSettingWired
 

 

 

+

+
Returns

+
 the “mac-address-blacklist”
+property of the setting. 

+
[element-type GLib.ByteArray]

+

+

 

 

-
nm_setting_wired_get_mac_address ()

-
const GByteArray *  nm_setting_wired_get_mac_address    (NMSettingWired *setting);

-

+
nm_setting_wired_get_mtu ()

+
guint32
+nm_setting_wired_get_mtu (NMSettingWired *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingWired
-
Returns :
the "mac-address" property of the setting
setting
the NMSettingWired
 

 

 

+

+
Returns

+
 the “mtu” property of the setting

+

+

+

 

 

-
nm_setting_wired_get_cloned_mac_address ()

-
const GByteArray *  nm_setting_wired_get_cloned_mac_address
-                                                        (NMSettingWired *setting);

-

+
nm_setting_wired_get_s390_subchannels ()

+
const GPtrArray *
+nm_setting_wired_get_s390_subchannels (NMSettingWired *setting);

+
Return the list of s390 subchannels that identify the device that this
+connection is applicable to.  The connection should only be used in
+conjunction with that device.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingWired
-
Returns :
the "cloned-mac-address" property of the setting
setting
the NMSettingWired
 

 

 

+

+
Returns

+
 GPtrArray of strings, each specifying one
+subchannel the s390 device uses to communicate to the host. 

+
[element-type utf8]

+

+

 

 

-
nm_setting_wired_get_mac_address_blacklist ()

-
const GSList *      nm_setting_wired_get_mac_address_blacklist
-                                                        (NMSettingWired *setting);

-

+
nm_setting_wired_get_s390_nettype ()

+
const char *
+nm_setting_wired_get_s390_nettype (NMSettingWired *setting);

+
Returns the s390 device type this connection should apply to.  Will be one
+of 'qeth', 'lcs', or 'ctc'.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingWired
-
Returns :
the "mac-address-blacklist"
-property of the setting. [element-type GLib.ByteArray]
-
setting
the NMSettingWired
 

 

 

+

+
Returns

+
 the s390 device type

+

+

+

 

 

-
nm_setting_wired_get_mtu ()

-
guint32             nm_setting_wired_get_mtu            (NMSettingWired *setting);

-

+
nm_setting_wired_get_num_s390_options ()

+
guint32
+nm_setting_wired_get_num_s390_options (NMSettingWired *setting);

+
Returns the number of s390-specific options that should be set for this
+device when it is activated.  This can be used to retrieve each s390
+option individually using nm_setting_wired_get_s390_option().

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingWired
-
Returns :
the "mtu" property of the setting
setting
the NMSettingWired
 

 

 

+

+
Returns

+
 the number of s390-specific device options

+

+

+

 

 

-
nm_setting_wired_get_s390_subchannels ()

-
const GPtrArray *   nm_setting_wired_get_s390_subchannels
-                                                        (NMSettingWired *setting);

-

-Return the list of s390 subchannels that identify the device that this
-connection is applicable to.  The connection should only be used in
-conjunction with that device.
-

-

+
nm_setting_wired_get_s390_option ()

+
gboolean
+nm_setting_wired_get_s390_option (NMSettingWired *setting,
+                                  guint32 idx,
+                                  const char **out_key,
+                                  const char **out_value);

+
Given an index, return the value of the s390 option at that index.  indexes
+are *not* guaranteed to be static across modifications to options done by
+nm_setting_wired_add_s390_option() and nm_setting_wired_remove_s390_option(),
+and should not be used to refer to options except for short periods of time
+such as during option iteration.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+

 





 
 
 
setting :
the NMSettingWired
-
setting
the NMSettingWired
 
 

 
Returns :

-GPtrArray of strings, each specifying one
-subchannel the s390 device uses to communicate to the host. [element-type utf8]
-
idx
index of the desired option, from 0 to
+nm_setting_wired_get_num_s390_options() - 1
 
out_key
 on return, the key name of the s390 specific option; this
+value is owned by the setting and should not be modified. 
[out]
out_value
 on return, the value of the key of the s390 specific
+option; this value is owned by the setting and should not be modified. 
[out]
 

 
 

 

+

+
Returns

+
 TRUE on success if the index was valid and an option was found,
+FALSE if the index was invalid (ie, greater than the number of options
+currently held by the setting)

+

+

+

 

 

-
nm_setting_wired_get_s390_nettype ()

-
const char *        nm_setting_wired_get_s390_nettype   (NMSettingWired *setting);

-

-Returns the s390 device type this connection should apply to.  Will be one
-of 'qeth', 'lcs', or 'ctc'.
-

-

+
nm_setting_wired_get_s390_option_by_key ()

+
const char *
+nm_setting_wired_get_s390_option_by_key
+                               (NMSettingWired *setting,
+                                const char *key);

+
Returns the value associated with the s390-specific option specified by
+key
+, if it exists.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingWired
-
setting
the NMSettingWired
 
 

 
Returns :
the s390 device type
key
the key for which to retrieve the value
 
 

 
 

 

+

+
Returns

+
 the value, or NULL if the key/value pair was never added to the
+setting; the value is owned by the setting and must not be modified

+

+

+

 

 

-
nm_setting_wired_get_num_s390_options ()

-
guint32             nm_setting_wired_get_num_s390_options
-                                                        (NMSettingWired *setting);

+
nm_setting_wired_add_s390_option ()

+
gboolean
+nm_setting_wired_add_s390_option (NMSettingWired *setting,
+                                  const char *key,
+                                  const char *item);

 

-Returns the number of s390-specific options that should be set for this
-device when it is activated.  This can be used to retrieve each s390
-option individually using nm_setting_wired_get_s390_option().
 

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingWired
-
Returns :
the number of s390-specific device options

+

+
Returns

+

+

 

 

 

-
nm_setting_wired_get_s390_option ()

-
gboolean            nm_setting_wired_get_s390_option    (NMSettingWired *setting,
-                                                         guint32 idx,
-                                                         const char **out_key,
-                                                         const char **out_value);

+
nm_setting_wired_remove_s390_option ()

+
gboolean
+nm_setting_wired_remove_s390_option (NMSettingWired *setting,
+                                     const char *key);

+

+

+

+
Returns

+

+

+

+

+

+
Types and Values

+

+
NM_SETTING_WIRED_SETTING_NAME

+
#define NM_SETTING_WIRED_SETTING_NAME "802-3-ethernet"
+

 

-Given an index, return the value of the s390 option at that index.  indexes
-are *not* guaranteed to be static across modifications to options done by
-nm_setting_wired_add_s390_option() and nm_setting_wired_remove_s390_option(),
-and should not be used to refer to options except for short periods of time
-such as during option iteration.
 

-

+
+

+

+
enum NMSettingWiredError

+

+
Members

+
--+++
-
-
+
+
-
-
-
-
-
-
+
+
-
-
+
-
-
-
-
+

 





 
 
 
setting :
the NMSettingWired
+
NM_SETTING_WIRED_ERROR_UNKNOWN

+
unknown or unclassified error

 		 
 

 
idx :
index of the desired option, from 0 to
-nm_setting_wired_get_num_s390_options() - 1
out_key :
on return, the key name of the s390 specific option; this
-value is owned by the setting and should not be modified. [out]
+
NM_SETTING_WIRED_ERROR_INVALID_PROPERTY

+
the property was invalid

 		 
 

 
out_value :
on return, the value of the key of the s390 specific
-option; this value is owned by the setting and should not be modified. [out]
+
NM_SETTING_WIRED_ERROR_MISSING_PROPERTY

+
the property was missing and is
+required

 
Returns :

-TRUE on success if the index was valid and an option was found,
-FALSE if the index was invalid (ie, greater than the number of options
-currently held by the setting) 
 

 
 

 

+

 

 

-
nm_setting_wired_get_s390_option_by_key ()

-
const char *        nm_setting_wired_get_s390_option_by_key
-                                                        (NMSettingWired *setting,
-                                                         const char *key);

+
NM_SETTING_WIRED_ERROR

+
#define NM_SETTING_WIRED_ERROR nm_setting_wired_error_quark ()
+

 

-Returns the value associated with the s390-specific option specified by
-key, if it exists.
 

-

----
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingWired
-
key :
the key for which to retrieve the value
Returns :
the value, or NULL if the key/value pair was never added to the
-setting; the value is owned by the setting and must not be modified

 

 

 

-
nm_setting_wired_add_s390_option ()

-
gboolean            nm_setting_wired_add_s390_option    (NMSettingWired *setting,
-                                                         const char *key,
-                                                         const char *item);

+
NM_SETTING_WIRED_PORT

+
#define NM_SETTING_WIRED_PORT "port"
+

 

 

 

 

 

-
nm_setting_wired_remove_s390_option ()

-
gboolean            nm_setting_wired_remove_s390_option (NMSettingWired *setting,
-                                                         const char *key);

+
NM_SETTING_WIRED_SPEED

+
#define NM_SETTING_WIRED_SPEED "speed"
+

 

 

 

-

-

-
Property Details

-

-
The "auto-negotiate" property

-
  "auto-negotiate"           gboolean              : Read / Write / Construct

-
If TRUE, allow auto-negotiation of port speed and duplex mode.  If FALSE, do not allow auto-negotiation,in which case the 'speed' and 'duplex' properties should be set.

-
Default value: TRUE

-

 

 

-
The "cloned-mac-address" property

-
  "cloned-mac-address"       GArray_guchar_*       : Read / Write

+
NM_SETTING_WIRED_DUPLEX

+
#define NM_SETTING_WIRED_DUPLEX "duplex"
+

 

-If specified, request that the device use this MAC address instead of its
-permanent MAC address.  This is known as MAC cloning or spoofing.
 

 

 

 

-
The "duplex" property

-
  "duplex"                   gchar*                : Read / Write

+
NM_SETTING_WIRED_AUTO_NEGOTIATE

+
#define NM_SETTING_WIRED_AUTO_NEGOTIATE "auto-negotiate"
+

 

-If specified, request that the device only use the specified duplex mode.
-Either 'half' or 'full'.
 

-
Default value: NULL

 

 

 

-
The "mac-address" property

-
  "mac-address"              GArray_guchar_*       : Read / Write

+
NM_SETTING_WIRED_MAC_ADDRESS

+
#define NM_SETTING_WIRED_MAC_ADDRESS "mac-address"
+

 

-If specified, this connection will only apply to the ethernet device
-whose permanent MAC address matches. This property does not change the MAC address
-of the device (i.e. MAC spoofing).
 

 

 

 

-
The "mac-address-blacklist" property

-
  "mac-address-blacklist"    GSList_gchararray_*   : Read / Write

+
NM_SETTING_WIRED_CLONED_MAC_ADDRESS

+
#define NM_SETTING_WIRED_CLONED_MAC_ADDRESS "cloned-mac-address"
+

 

-If specified, this connection will never apply to the ethernet device
-whose permanent MAC address matches an address in the list.  Each
-MAC address is in the standard hex-digits-and-colons notation
-(00:11:22:33:44:55).
 

 

 

 

-
The "mtu" property

-
  "mtu"                      guint                 : Read / Write / Construct

+
NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST

+
#define NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST "mac-address-blacklist"
+

 

-If non-zero, only transmit packets of the specified size or smaller,
-breaking larger packets up into multiple Ethernet frames.
 

-
Default value: 0

 

 

 

-
The "port" property

-
  "port"                     gchar*                : Read / Write

+
NM_SETTING_WIRED_MTU

+
#define NM_SETTING_WIRED_MTU "mtu"
+

 

-Specific port type to use if multiple the device supports multiple
-attachment methods.  One of 'tp' (Twisted Pair), 'aui' (Attachment Unit
-Interface), 'bnc' (Thin Ethernet) or 'mii' (Media Independent Interface.
-If the device supports only one port type, this setting is ignored.
 

-
Default value: NULL

 

 

 

-
The "s390-nettype" property

-
  "s390-nettype"             gchar*                : Read / Write

+
NM_SETTING_WIRED_S390_SUBCHANNELS

+
#define NM_SETTING_WIRED_S390_SUBCHANNELS "s390-subchannels"
+

 

-s390 network device type; one of 'qeth', 'lcs', or 'ctc', representing
-the different types of virtual network devices available on s390 systems.
 

-
Default value: NULL

 

 

 

-
The "s390-options" property

-
  "s390-options"             GHashTable_gchararray+gchararray_*  : Read / Write

+
NM_SETTING_WIRED_S390_NETTYPE

+
#define NM_SETTING_WIRED_S390_NETTYPE "s390-nettype"
+

 

-Dictionary of key/value pairs of s390-specific device options.  Both keys
-and values must be strings.  Allowed keys include 'portno', 'layer2',
-'portname', 'protocol', among others.  Key names must contain only
-alphanumeric characters (ie, [a-zA-Z0-9]).
 

 

 

 

-
The "s390-subchannels" property

-
  "s390-subchannels"         GPtrArray_gchararray_*  : Read / Write

+
NM_SETTING_WIRED_S390_OPTIONS

+
#define NM_SETTING_WIRED_S390_OPTIONS "s390-options"
+

 

-Identifies specific subchannels that this network device uses for
-communcation with z/VM or s390 host.  Like "mac-address"
-for non-z/VM devices, this property can be used to ensure this connection
-only applies to the network device that uses these subchannels.  The
-list should contain exactly 3 strings, and each string may only be
-composed of hexadecimal characters and the period (.) character.
 

 

+

+

+
Property Details

+

+
The “auto-negotiate” property

+
  “auto-negotiate”           gboolean

+
If TRUE, allow auto-negotiation of port speed and duplex mode.  If FALSE, do not allow auto-negotiation,in which case the 'speed' and 'duplex' properties should be set.

+
Flags: Read / Write / Construct

+
Default value: TRUE

+

 

 

-
The "speed" property

-
  "speed"                    guint                 : Read / Write / Construct

-

-If non-zero, request that the device use only the specified speed.
-
-In Mbit/s, ie 100 == 100Mbit/s.
-

+
The “cloned-mac-address” property

+
  “cloned-mac-address”       GArray_guchar_ *

+
If specified, request that the device use this MAC address instead of its permanent MAC address.  This is known as MAC cloning or spoofing.

+
Flags: Read / Write

+

+

+

+
The “duplex” property

+
  “duplex”                   gchar *

+
If specified, request that the device only use the specified duplex mode.  Either 'half' or 'full'.

+
Flags: Read / Write

+
Default value: NULL

+

+

+

+
The “mac-address” property

+
  “mac-address”              GArray_guchar_ *

+
If specified, this connection will only apply to the ethernet device whose permanent MAC address matches.  This property does not change the MAC address of the device (i.e. MAC spoofing).

+
Flags: Read / Write

+

+

+

+
The “mac-address-blacklist” property

+
  “mac-address-blacklist”    GSList_gchararray_ *

+
If specified, this connection will never apply to the ethernet device whose permanent MAC address matches an address in the list.  Each MAC address is in the standard hex-digits-and-colons notation (00:11:22:33:44:55).

+
Flags: Read / Write

+

+

+

+
The “mtu” property

+
  “mtu”                      guint

+
If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple Ethernet frames.

+
Flags: Read / Write / Construct

+
Default value: 0

+

+

+

+
The “port” property

+
  “port”                     gchar *

+
Specific port type to use if multiple the device supports multiple attachment methods.  One of 'tp' (Twisted Pair), 'aui' (Attachment Unit Interface), 'bnc' (Thin Ethernet) or 'mii' (Media Independent Interface.  If the device supports only one port type, this setting is ignored.

+
Flags: Read / Write

+
Default value: NULL

+

+

+

+
The “s390-nettype” property

+
  “s390-nettype”             gchar *

+
s390 network device type; one of 'qeth', 'lcs', or 'ctc', representing the different types of virtual network devices available on s390 systems.

+
Flags: Read / Write

+
Default value: NULL

+

+

+

+
The “s390-options” property

+
  “s390-options”             GHashTable_gchararray+gchararray_*

+
Dictionary of key/value pairs of s390-specific device options.  Both keys and values must be strings.  Allowed keys include 'portno', 'layer2', 'portname', 'protocol', among others.

+
Flags: Read / Write

+

+

+

+
The “s390-subchannels” property

+
  “s390-subchannels”         GPtrArray_gchararray_ *

+
Identifies specific subchannels that this network device uses for communcation with z/VM or s390 host.  Like the 'mac-address' property for non-z/VM devices, this property can be used to ensure this connection only applies to the network device that uses these subchannels. The list should contain exactly 3 strings, and each string may only be composed of hexadecimal characters and the period (.) character.

+
Flags: Read / Write

+

+

+

+
The “speed” property

+
  “speed”                    guint

+
If non-zero, request that the device use only the specified speed.  In Mbit/s, ie 100 == 100Mbit/s.

+
Flags: Read / Write / Construct

 
Default value: 0

 

 

 

 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.20
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingWireless.html b/docs/libnm-util/html/NMSettingWireless.html
index a792acc9..7987e145 100644
--- a/docs/libnm-util/html/NMSettingWireless.html
+++ b/docs/libnm-util/html/NMSettingWireless.html
@@ -2,34 +2,28 @@
 
 
 
-NMSettingWireless
+libnm-util Reference Manual: NMSettingWireless
 
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
 

 

 

@@ -37,967 +31,1218 @@
 
NMSettingWireless
NMSettingWireless — Describes connection properties for 802.11 WiFi networks

-
+

 
 
 

-

-
Synopsis

-
-#include <nm-setting-wireless.h>
-
-#define             NM_SETTING_WIRELESS_SETTING_NAME
-enum                NMSettingWirelessError;
-#define             NM_SETTING_WIRELESS_ERROR
-GQuark              nm_setting_wireless_error_quark     (void);
-#define             NM_SETTING_WIRELESS_SSID
-#define             NM_SETTING_WIRELESS_MODE
-#define             NM_SETTING_WIRELESS_BAND
-#define             NM_SETTING_WIRELESS_CHANNEL
-#define             NM_SETTING_WIRELESS_BSSID
-#define             NM_SETTING_WIRELESS_RATE
-#define             NM_SETTING_WIRELESS_TX_POWER
-#define             NM_SETTING_WIRELESS_MAC_ADDRESS
-#define             NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS
-#define             NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST
-#define             NM_SETTING_WIRELESS_MTU
-#define             NM_SETTING_WIRELESS_SEEN_BSSIDS
-#define             NM_SETTING_WIRELESS_SEC
-#define             NM_SETTING_WIRELESS_HIDDEN
-#define             NM_SETTING_WIRELESS_MODE_ADHOC
-#define             NM_SETTING_WIRELESS_MODE_AP
-#define             NM_SETTING_WIRELESS_MODE_INFRA
-                    NMSettingWireless;
-                    NMSettingWirelessClass;
-NMSetting *         nm_setting_wireless_new             (void);
-const GByteArray *  nm_setting_wireless_get_ssid        (NMSettingWireless *setting);
-const char *        nm_setting_wireless_get_mode        (NMSettingWireless *setting);
-const char *        nm_setting_wireless_get_band        (NMSettingWireless *setting);
-guint32             nm_setting_wireless_get_channel     (NMSettingWireless *setting);
-const GByteArray *  nm_setting_wireless_get_bssid       (NMSettingWireless *setting);
-guint32             nm_setting_wireless_get_rate        (NMSettingWireless *setting);
-guint32             nm_setting_wireless_get_tx_power    (NMSettingWireless *setting);
-const GByteArray *  nm_setting_wireless_get_mac_address (NMSettingWireless *setting);
-const GByteArray *  nm_setting_wireless_get_cloned_mac_address
-                                                        (NMSettingWireless *setting);
-const GSList *      nm_setting_wireless_get_mac_address_blacklist
-                                                        (NMSettingWireless *setting);
-guint32             nm_setting_wireless_get_mtu         (NMSettingWireless *setting);
-const char *        nm_setting_wireless_get_security    (NMSettingWireless *setting);
-gboolean            nm_setting_wireless_get_hidden      (NMSettingWireless *setting);
-gboolean            nm_setting_wireless_add_seen_bssid  (NMSettingWireless *setting,
-                                                         const char *bssid);
-guint32             nm_setting_wireless_get_num_seen_bssids
-                                                        (NMSettingWireless *setting);
-const char *        nm_setting_wireless_get_seen_bssid  (NMSettingWireless *setting,
-                                                         guint32 i);
-gboolean            nm_setting_wireless_ap_security_compatible
-                                                        (NMSettingWireless *s_wireless,
-                                                         NMSettingWirelessSecurity *s_wireless_sec,
-                                                         NM80211ApFlags ap_flags,
-                                                         NM80211ApSecurityFlags ap_wpa,
-                                                         NM80211ApSecurityFlags ap_rsn,
-                                                         NM80211Mode ap_mode);
-

-

 

-
Object Hierarchy

-
-  GEnum
-   +----NMSettingWirelessError
-

-
-  GObject
-   +----NMSetting
-         +----NMSettingWireless
-

-

-

-
Properties

-
-  "band"                     gchar*                : Read / Write
-  "bssid"                    GArray_guchar_*       : Read / Write
-  "channel"                  guint                 : Read / Write / Construct
-  "cloned-mac-address"       GArray_guchar_*       : Read / Write
-  "hidden"                   gboolean              : Read / Write
-  "mac-address"              GArray_guchar_*       : Read / Write
-  "mac-address-blacklist"    GSList_gchararray_*   : Read / Write
-  "mode"                     gchar*                : Read / Write
-  "mtu"                      guint                 : Read / Write / Construct
-  "rate"                     guint                 : Read / Write / Construct
-  "security"                 gchar*                : Read / Write
-  "seen-bssids"              GSList_gchararray_*   : Read / Write
-  "ssid"                     GArray_guchar_*       : Read / Write
-  "tx-power"                 guint                 : Read / Write / Construct
-

-

-

-
Description

-

-The NMSettingWireless object is a NMSetting subclass that describes properties
-necessary for connection to 802.11 WiFi networks.
-

-

-

-
Details

-

-
NM_SETTING_WIRELESS_SETTING_NAME

-
#define NM_SETTING_WIRELESS_SETTING_NAME "802-11-wireless"
-

-

-

-

-

-

-
enum NMSettingWirelessError

-
typedef enum {
-	NM_SETTING_WIRELESS_ERROR_UNKNOWN = 0,              /*< nick=UnknownError >*/
-	NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY,         /*< nick=InvalidProperty >*/
-	NM_SETTING_WIRELESS_ERROR_MISSING_PROPERTY,         /*< nick=MissingProperty >*/
-	NM_SETTING_WIRELESS_ERROR_MISSING_SECURITY_SETTING, /*< nick=MissingSecuritySetting >*/
-	NM_SETTING_WIRELESS_ERROR_CHANNEL_REQUIRES_BAND     /*< nick=ChannelRequiresBand >*/
-} NMSettingWirelessError;
-

-

+
Functions

+
--++
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
-
+
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

 




 
 
 
NM_SETTING_WIRELESS_ERROR_UNKNOWN
unknown or unclassified error
+
+GQuark
+
+nm_setting_wireless_error_quark ()
+

+NMSetting *
+
+nm_setting_wireless_new ()
+
const GByteArray *
+
+nm_setting_wireless_get_ssid ()
+
const char *
+
+nm_setting_wireless_get_mode ()
+
const char *
+
+nm_setting_wireless_get_band ()
+

+guint32
+
+nm_setting_wireless_get_channel ()
+
const GByteArray *
+
+nm_setting_wireless_get_bssid ()
 
 

 
NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY
the property was invalid
+
+guint32
+
+nm_setting_wireless_get_rate ()
 
 

 
NM_SETTING_WIRELESS_ERROR_MISSING_PROPERTY
the property was missing and is
-required
+
+guint32
+
+nm_setting_wireless_get_tx_power ()
 
 

 
NM_SETTING_WIRELESS_ERROR_MISSING_SECURITY_SETTING
property values require
-the presence of an NMSettingWirelessSecurity object in the connection
+const GByteArray *
+
+nm_setting_wireless_get_mac_address ()
 
 

 
NM_SETTING_WIRELESS_ERROR_CHANNEL_REQUIRES_BAND
the property channel was
-set to a value that requires the "band" property to be set
+const GByteArray *
+
+nm_setting_wireless_get_cloned_mac_address ()
+
const GSList *
+
+nm_setting_wireless_get_mac_address_blacklist ()
+

+guint32
+
+nm_setting_wireless_get_mtu ()
+
const char *
+
+nm_setting_wireless_get_security ()
+

+gboolean
+
+nm_setting_wireless_get_hidden ()
+

+gboolean
+
+nm_setting_wireless_add_seen_bssid ()
+

+guint32
+
+nm_setting_wireless_get_num_seen_bssids ()
+
const char *
+
+nm_setting_wireless_get_seen_bssid ()
+

+gboolean
+
+nm_setting_wireless_ap_security_compatible ()
 
 

 
 

 

-

-

-
NM_SETTING_WIRELESS_ERROR

-
#define NM_SETTING_WIRELESS_ERROR nm_setting_wireless_error_quark ()
-

-

-

-

-

-

-
nm_setting_wireless_error_quark ()

-
GQuark              nm_setting_wireless_error_quark     (void);

-

-Registers an error quark for NMSettingWireless if necessary.
-

-

+

+
Properties

+
--+++
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

 





 
Returns :
the error quark used for NMSettingWireless errors.

+gchar *bandRead / Write

+GArray_guchar_ *bssidRead / Write
guintchannelRead / Write / Construct

+GArray_guchar_ *cloned-mac-addressRead / Write
gbooleanhiddenRead / Write

+GArray_guchar_ *mac-addressRead / Write

+GSList_gchararray_ *mac-address-blacklistRead / Write

+gchar *modeRead / Write
guintmtuRead / Write / Construct
guintrateRead / Write / Construct

+gchar *securityRead / Write

+GSList_gchararray_ *seen-bssidsRead / Write

+GArray_guchar_ *ssidRead / Write
guinttx-powerRead / Write / Construct

 

 

-

-

-
NM_SETTING_WIRELESS_SSID

-
#define NM_SETTING_WIRELESS_SSID        "ssid"
-

-

-

-

-

-

-
NM_SETTING_WIRELESS_MODE

-
#define NM_SETTING_WIRELESS_MODE        "mode"
-

-

-

-

-

-

-
NM_SETTING_WIRELESS_BAND

-
#define NM_SETTING_WIRELESS_BAND        "band"
-

-

-

-

-

-

-
NM_SETTING_WIRELESS_CHANNEL

-
#define NM_SETTING_WIRELESS_CHANNEL     "channel"
-

-

-

-

-

-

-
NM_SETTING_WIRELESS_BSSID

-
#define NM_SETTING_WIRELESS_BSSID       "bssid"
-

-

-

-

-

-

-
NM_SETTING_WIRELESS_RATE

-
#define NM_SETTING_WIRELESS_RATE        "rate"
-

-

-

-

-

-

-
NM_SETTING_WIRELESS_TX_POWER

-
#define NM_SETTING_WIRELESS_TX_POWER    "tx-power"
-

-

-

-

-

-

-
NM_SETTING_WIRELESS_MAC_ADDRESS

-
#define NM_SETTING_WIRELESS_MAC_ADDRESS "mac-address"
-

-

-

-

-

-

-
NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS

-
#define NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS "cloned-mac-address"
-

-

-

+

+
Types and Values

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+




#defineNM_SETTING_WIRELESS_SETTING_NAME
enumNMSettingWirelessError
#defineNM_SETTING_WIRELESS_ERROR
#defineNM_SETTING_WIRELESS_SSID
#defineNM_SETTING_WIRELESS_MODE
#defineNM_SETTING_WIRELESS_BAND
#defineNM_SETTING_WIRELESS_CHANNEL
#defineNM_SETTING_WIRELESS_BSSID
#defineNM_SETTING_WIRELESS_RATE
#defineNM_SETTING_WIRELESS_TX_POWER
#defineNM_SETTING_WIRELESS_MAC_ADDRESS
#defineNM_SETTING_WIRELESS_CLONED_MAC_ADDRESS
#defineNM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST
#defineNM_SETTING_WIRELESS_MTU
#defineNM_SETTING_WIRELESS_SEEN_BSSIDS
#defineNM_SETTING_WIRELESS_SEC
#defineNM_SETTING_WIRELESS_HIDDEN
#defineNM_SETTING_WIRELESS_MODE_ADHOC
#defineNM_SETTING_WIRELESS_MODE_AP
#defineNM_SETTING_WIRELESS_MODE_INFRA

 

-

-

-
NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST

-
#define NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST "mac-address-blacklist"
+

+
Object Hierarchy

+
    GEnum
+    ╰── NMSettingWirelessError
+    GObject
+    ╰── NMSetting
+        ╰── NMSettingWireless
 

-

-

 

-

-

-
NM_SETTING_WIRELESS_MTU

-
#define NM_SETTING_WIRELESS_MTU         "mtu"
+

+
Includes

+
#include <nm-setting-wireless.h>
 

-

-

 

-

-

-
NM_SETTING_WIRELESS_SEEN_BSSIDS

-
#define NM_SETTING_WIRELESS_SEEN_BSSIDS "seen-bssids"
-

-

-

+

+
Description

+
The NMSettingWireless object is a NMSetting subclass that describes properties
+necessary for connection to 802.11 WiFi networks.

 

-

+

+
Functions

 

-
NM_SETTING_WIRELESS_SEC

-
#define NM_SETTING_WIRELESS_SEC         "security"
-

-

-

+
nm_setting_wireless_error_quark ()

+
GQuark
+nm_setting_wireless_error_quark (void);

+
Registers an error quark for NMSettingWireless if necessary.

+

+
Returns

+
 the error quark used for NMSettingWireless errors.

+

 

-

-

-
NM_SETTING_WIRELESS_HIDDEN

-
#define NM_SETTING_WIRELESS_HIDDEN      "hidden"
-

-

-

 

 

 

-
NM_SETTING_WIRELESS_MODE_ADHOC

-
#define NM_SETTING_WIRELESS_MODE_ADHOC  "adhoc"
-

-

-Indicates Ad-Hoc mode where no access point is expected to be present.
-

+
nm_setting_wireless_new ()

+
NMSetting *
+nm_setting_wireless_new (void);

+
Creates a new NMSettingWireless object with default values.

+

+
Returns

+
 the new empty NMSettingWireless object. 

+
[transfer full]

 

-

-

-
NM_SETTING_WIRELESS_MODE_AP

-
#define NM_SETTING_WIRELESS_MODE_AP     "ap"
-

-

-Indicates AP/master mode where the wireless device is started as an access
-point/hotspot.
-

-
Since 0.9.8

 

 

 

-
NM_SETTING_WIRELESS_MODE_INFRA

-
#define NM_SETTING_WIRELESS_MODE_INFRA  "infrastructure"
-

-

-Indicates infrastructure mode where an access point is expected to be present
-for this connection.
-

+
nm_setting_wireless_get_ssid ()

+
const GByteArray *
+nm_setting_wireless_get_ssid (NMSettingWireless *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingWireless
 

 

-

-

-
NMSettingWireless

-
typedef struct _NMSettingWireless NMSettingWireless;

-

-

+

+
Returns

+
 the “ssid” property of the setting

+

 

-

-

-
NMSettingWirelessClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingWirelessClass;
-

-

-

 

 

 

-
nm_setting_wireless_new ()

-
NMSetting *         nm_setting_wireless_new             (void);

-

-Creates a new NMSettingWireless object with default values.
-

-

+
nm_setting_wireless_get_mode ()

+
const char *
+nm_setting_wireless_get_mode (NMSettingWireless *setting);

+

+
Parameters

+
--+++
-
-
+
+
+

 





 
 
Returns :
the new empty NMSettingWireless object. [transfer full]
-
setting
the NMSettingWireless
 
 

 

 

+

+
Returns

+
 the “mode” property of the setting

+

+

+

 

 

-
nm_setting_wireless_get_ssid ()

-
const GByteArray *  nm_setting_wireless_get_ssid        (NMSettingWireless *setting);

-

+
nm_setting_wireless_get_band ()

+
const char *
+nm_setting_wireless_get_band (NMSettingWireless *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingWireless
-
Returns :
the "ssid" property of the setting
setting
the NMSettingWireless
 

 

 

+

+
Returns

+
 the “band” property of the setting

+

+

+

 

 

-
nm_setting_wireless_get_mode ()

-
const char *        nm_setting_wireless_get_mode        (NMSettingWireless *setting);

-

+
nm_setting_wireless_get_channel ()

+
guint32
+nm_setting_wireless_get_channel (NMSettingWireless *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingWireless
-
Returns :
the "mode" property of the setting
setting
the NMSettingWireless
 

 

 

+

+
Returns

+
 the “channel” property of the setting

+

+

+

 

 

-
nm_setting_wireless_get_band ()

-
const char *        nm_setting_wireless_get_band        (NMSettingWireless *setting);

-

+
nm_setting_wireless_get_bssid ()

+
const GByteArray *
+nm_setting_wireless_get_bssid (NMSettingWireless *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingWireless
-
Returns :
the "band" property of the setting
setting
the NMSettingWireless
 

 

 

+

+
Returns

+
 the “bssid” property of the setting

+

+

+

 

 

-
nm_setting_wireless_get_channel ()

-
guint32             nm_setting_wireless_get_channel     (NMSettingWireless *setting);

-

+
nm_setting_wireless_get_rate ()

+
guint32
+nm_setting_wireless_get_rate (NMSettingWireless *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingWireless
-
Returns :
the "channel" property of the setting
setting
the NMSettingWireless
 

 

 

+

+
Returns

+
 the “rate” property of the setting

+

+

+

 

 

-
nm_setting_wireless_get_bssid ()

-
const GByteArray *  nm_setting_wireless_get_bssid       (NMSettingWireless *setting);

-

+
nm_setting_wireless_get_tx_power ()

+
guint32
+nm_setting_wireless_get_tx_power (NMSettingWireless *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingWireless
-
Returns :
the "bssid" property of the setting
setting
the NMSettingWireless
 

 

 

+

+
Returns

+
 the “tx-power” property of the setting

+

+

+

 

 

-
nm_setting_wireless_get_rate ()

-
guint32             nm_setting_wireless_get_rate        (NMSettingWireless *setting);

-

+
nm_setting_wireless_get_mac_address ()

+
const GByteArray *
+nm_setting_wireless_get_mac_address (NMSettingWireless *setting);

+

+
Parameters

+
---
-
-
-
-
-
-
-
-
-
-
++++
+
+
+
+
+

 



setting :
the NMSettingWireless
-
Returns :
the "rate" property of the setting




setting
the NMSettingWireless
 

 

 

+

+
Returns

+
 the “mac-address” property of the setting

+

+

+

 

 

-
nm_setting_wireless_get_tx_power ()

-
guint32             nm_setting_wireless_get_tx_power    (NMSettingWireless *setting);

-

+
nm_setting_wireless_get_cloned_mac_address ()

+
const GByteArray *
+nm_setting_wireless_get_cloned_mac_address
+                               (NMSettingWireless *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingWireless
-
Returns :
the "tx-power" property of the setting
setting
the NMSettingWireless
 

 

 

+

+
Returns

+
 the “cloned-mac-address” property of the setting

+

+

+

 

 

-
nm_setting_wireless_get_mac_address ()

-
const GByteArray *  nm_setting_wireless_get_mac_address (NMSettingWireless *setting);

-

+
nm_setting_wireless_get_mac_address_blacklist ()

+
const GSList *
+nm_setting_wireless_get_mac_address_blacklist
+                               (NMSettingWireless *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingWireless
-
Returns :
the "mac-address" property of the setting
setting
the NMSettingWireless
 

 

 

+

+
Returns

+
 the
+“mac-address-blacklist” property of the setting. 

+
[element-type GLib.ByteArray]

+

+

 

 

-
nm_setting_wireless_get_cloned_mac_address ()

-
const GByteArray *  nm_setting_wireless_get_cloned_mac_address
-                                                        (NMSettingWireless *setting);

-

+
nm_setting_wireless_get_mtu ()

+
guint32
+nm_setting_wireless_get_mtu (NMSettingWireless *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingWireless
-
Returns :
the "cloned-mac-address" property of the setting
setting
the NMSettingWireless
 

 

 

+

+
Returns

+
 the “mtu” property of the setting

+

+

+

 

 

-
nm_setting_wireless_get_mac_address_blacklist ()

-
const GSList *      nm_setting_wireless_get_mac_address_blacklist
-                                                        (NMSettingWireless *setting);

-

+
nm_setting_wireless_get_security ()

+
const char *
+nm_setting_wireless_get_security (NMSettingWireless *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingWireless
-
Returns :
the
-"mac-address-blacklist" property of the setting. [element-type GLib.ByteArray]
-
setting
the NMSettingWireless
 

 

 

+

+
Returns

+
 the “security” property of the setting

+

+

+

 

 

-
nm_setting_wireless_get_mtu ()

-
guint32             nm_setting_wireless_get_mtu         (NMSettingWireless *setting);

-

+
nm_setting_wireless_get_hidden ()

+
gboolean
+nm_setting_wireless_get_hidden (NMSettingWireless *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingWireless
-
Returns :
the "mtu" property of the setting
setting
the NMSettingWireless
 

 

 

+

+
Returns

+
 the “hidden” property of the setting

+

+

+
 

 

-
nm_setting_wireless_get_security ()

-
const char *        nm_setting_wireless_get_security    (NMSettingWireless *setting);

-

+
nm_setting_wireless_add_seen_bssid ()

+
gboolean
+nm_setting_wireless_add_seen_bssid (NMSettingWireless *setting,
+                                    const char *bssid);

+
Adds a new Wi-Fi AP's BSSID to the previously seen BSSID list of the setting.
+NetworkManager now tracks previously seen BSSIDs internally so this function
+no longer has much use. Actually, changes you make using this function will
+not be preserved.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingWireless
-
setting
the NMSettingWireless
 
 

 
Returns :
the "security" property of the setting
bssid
the new BSSID to add to the list
 
 

 
 

 

+

+
Returns

+
 TRUE if bssid
+was already known, FALSE if not

+

+

+
 

 

-
nm_setting_wireless_get_hidden ()

-
gboolean            nm_setting_wireless_get_hidden      (NMSettingWireless *setting);

-

+
nm_setting_wireless_get_num_seen_bssids ()

+
guint32
+nm_setting_wireless_get_num_seen_bssids
+                               (NMSettingWireless *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingWireless
-
Returns :
the "hidden" property of the setting
setting
the NMSettingWireless
 

 

 

+

+
Returns

+
 the number of BSSIDs in the previously seen BSSID list

+

+

+
 

 

-
nm_setting_wireless_add_seen_bssid ()

-
gboolean            nm_setting_wireless_add_seen_bssid  (NMSettingWireless *setting,
-                                                         const char *bssid);

-

-Adds a new Wi-Fi AP's BSSID to the previously seen BSSID list of the setting.
-NetworkManager now tracks previously seen BSSIDs internally so this function
-no longer has much use. Actually, changes you make using this function will
-not be preserved.
-

-

+
nm_setting_wireless_get_seen_bssid ()

+
const char *
+nm_setting_wireless_get_seen_bssid (NMSettingWireless *setting,
+                                    guint32 i);

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingWireless
-
bssid :
the new BSSID to add to the list
setting
the NMSettingWireless
 
 

 
Returns :

-TRUE if bssid was already known, FALSE if not
i
index of a BSSID in the previously seen BSSID list
 
 

 
 

 

+

+
Returns

+
 the BSSID at index i
+

+

+

+
 

 

-
nm_setting_wireless_get_num_seen_bssids ()

-
guint32             nm_setting_wireless_get_num_seen_bssids
-                                                        (NMSettingWireless *setting);

-

+
nm_setting_wireless_ap_security_compatible ()

+
gboolean
+nm_setting_wireless_ap_security_compatible
+                               (NMSettingWireless *s_wireless,
+                                NMSettingWirelessSecurity *s_wireless_sec,
+                                NM80211ApFlags ap_flags,
+                                NM80211ApSecurityFlags ap_wpa,
+                                NM80211ApSecurityFlags ap_rsn,
+                                NM80211Mode ap_mode);

+
Given a NMSettingWireless and an optional NMSettingWirelessSecurity,
+determine if the configuration given by the settings is compatible with
+the security of an access point using that access point's capability flags
+and mode.  Useful for clients that wish to filter a set of connections
+against a set of access points and determine which connections are
+compatible with which access points.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+
-
-

 





 
 
 
setting :
the NMSettingWireless
-
s_wireless
a NMSettingWireless
 
 

 
Returns :
the number of BSSIDs in the previously seen BSSID list
s_wireless_sec
a NMSettingWirelessSecurity or NULL
 
 

-

-

-

-
nm_setting_wireless_get_seen_bssid ()

-
const char *        nm_setting_wireless_get_seen_bssid  (NMSettingWireless *setting,
-                                                         guint32 i);

-

----
-
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
+
+
+
+
+




 
setting :
the NMSettingWireless
-
ap_flags
the NM80211ApFlags of the given access point
 
 

 
i :
index of a BSSID in the previously seen BSSID list
ap_wpa
the NM80211ApSecurityFlags of the given access point's WPA
+capabilities
 
 

 
Returns :
the BSSID at index i
-
ap_rsn
the NM80211ApSecurityFlags of the given access point's WPA2/RSN
+capabilities
 
ap_mode
the 802.11 mode of the AP, either Ad-Hoc or Infrastructure
 
 

 
 

 

-

+

+
Returns

+
 TRUE if the given settings are compatible with the access point's
+security flags and mode, FALSE if they are not.

+

+

+
+
+

+
Types and Values

 

-
nm_setting_wireless_ap_security_compatible ()

-
gboolean            nm_setting_wireless_ap_security_compatible
-                                                        (NMSettingWireless *s_wireless,
-                                                         NMSettingWirelessSecurity *s_wireless_sec,
-                                                         NM80211ApFlags ap_flags,
-                                                         NM80211ApSecurityFlags ap_wpa,
-                                                         NM80211ApSecurityFlags ap_rsn,
-                                                         NM80211Mode ap_mode);

+
NM_SETTING_WIRELESS_SETTING_NAME

+
#define NM_SETTING_WIRELESS_SETTING_NAME "802-11-wireless"
+

 

-Given a NMSettingWireless and an optional NMSettingWirelessSecurity,
-determine if the configuration given by the settings is compatible with
-the security of an access point using that access point's capability flags
-and mode.  Useful for clients that wish to filter a set of connections
-against a set of access points and determine which connections are
-compatible with which access points.
 

-

+
+

+

+
enum NMSettingWirelessError

+

+
Members

+
--+++
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+

 





 
 
 
s_wireless :
a NMSettingWireless
+
NM_SETTING_WIRELESS_ERROR_UNKNOWN

+
unknown or unclassified error

 		 
 

 
s_wireless_sec :
a NMSettingWirelessSecurity or NULL
+
NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY

+
the property was invalid

 		 
 

 
ap_flags :
the NM80211ApFlags of the given access point
ap_wpa :
the NM80211ApSecurityFlags of the given access point's WPA
-capabilities
ap_rsn :
the NM80211ApSecurityFlags of the given access point's WPA2/RSN
-capabilities
NM_SETTING_WIRELESS_ERROR_MISSING_PROPERTY

+
the property was missing and is
+required

+		 
 

 
ap_mode :
the 802.11 mode of the AP, either Ad-Hoc or Infrastructure
NM_SETTING_WIRELESS_ERROR_MISSING_SECURITY_SETTING

+
property values require
+the presence of an NMSettingWirelessSecurity object in the connection

+		 
 

 
Returns :

-TRUE if the given settings are compatible with the access point's
-security flags and mode, FALSE if they are not.
NM_SETTING_WIRELESS_ERROR_CHANNEL_REQUIRES_BAND

+
the property channel was
+set to a value that requires the “band” property to be set

+		 
 

 
 

 

 

-

-
Property Details

+

 

-
The "band" property

-
  "band"                     gchar*                : Read / Write

+
NM_SETTING_WIRELESS_ERROR

+
#define NM_SETTING_WIRELESS_ERROR nm_setting_wireless_error_quark ()
+

 

-802.11 frequency band of the network.  One of 'a' for 5GHz 802.11a or
-'bg' for 2.4GHz 802.11.  This will lock associations to the WiFi network
-to the specific band, i.e. if 'a' is specified, the device will not
-associate with the same network in the 2.4GHz band even if the network's
-settings are compatible.  This setting depends on specific driver
-capability and may not work with all drivers.
 

-
Default value: NULL

 

 

 

-
The "bssid" property

-
  "bssid"                    GArray_guchar_*       : Read / Write

+
NM_SETTING_WIRELESS_SSID

+
#define NM_SETTING_WIRELESS_SSID        "ssid"
+

 

-If specified, directs the device to only associate with the given access
-point.  This capability is highly driver dependent and not supported by
-all devices.  Note: this property does not control the BSSID used when
-creating an Ad-Hoc network and is unlikely to in the future.
 

 

 

 

-
The "channel" property

-
  "channel"                  guint                 : Read / Write / Construct

+
NM_SETTING_WIRELESS_MODE

+
#define NM_SETTING_WIRELESS_MODE        "mode"
+

 

-Wireless channel to use for the WiFi connection.  The device will only
-join (or create for Ad-Hoc networks) a WiFi network on the specified
-channel.  Because channel numbers overlap between bands, this property
-also requires the 'band' property to be set.
 

-
Default value: 0

 

 

 

-
The "cloned-mac-address" property

-
  "cloned-mac-address"       GArray_guchar_*       : Read / Write

+
NM_SETTING_WIRELESS_BAND

+
#define NM_SETTING_WIRELESS_BAND        "band"
+

 

-If specified, request that the Wifi device use this MAC address instead of its
-permanent MAC address.  This is known as MAC cloning or spoofing.
 

 

 

 

-
The "hidden" property

-
  "hidden"                   gboolean              : Read / Write

+
NM_SETTING_WIRELESS_CHANNEL

+
#define NM_SETTING_WIRELESS_CHANNEL     "channel"
+

 

-If TRUE, indicates this network is a non-broadcasting network that
-hides its SSID.  In this case various workarounds may take place, such
-as probe-scanning the SSID for more reliable network discovery.  However,
-these workarounds expose inherent insecurities with hidden SSID networks,
-and thus hidden SSID networks should be used with caution.
 

-
Default value: FALSE

 

 

 

-
The "mac-address" property

-
  "mac-address"              GArray_guchar_*       : Read / Write

+
NM_SETTING_WIRELESS_BSSID

+
#define NM_SETTING_WIRELESS_BSSID       "bssid"
+

 

-If specified, this connection will only apply to the WiFi device
-whose permanent MAC address matches. This property does not change the MAC address
-of the device (i.e. MAC spoofing).
 

 

 

 

-
The "mac-address-blacklist" property

-
  "mac-address-blacklist"    GSList_gchararray_*   : Read / Write

+
NM_SETTING_WIRELESS_RATE

+
#define NM_SETTING_WIRELESS_RATE        "rate"
+

 

-A list of permanent MAC addresses of Wi-Fi devices to which this
-connection should never apply.  Each MAC address should be given in the
-standard hex-digits-and-colons notation (eg '00:11:22:33:44:55').
 

 

 

 

-
The "mode" property

-
  "mode"                     gchar*                : Read / Write

+
NM_SETTING_WIRELESS_TX_POWER

+
#define NM_SETTING_WIRELESS_TX_POWER    "tx-power"
+

+

+

+

+

+

+
NM_SETTING_WIRELESS_MAC_ADDRESS

+
#define NM_SETTING_WIRELESS_MAC_ADDRESS "mac-address"
+

 

-WiFi network mode; one of 'infrastructure', 'adhoc' or 'ap'.  If blank,
-infrastructure is assumed.
 

-
Default value: NULL

 

 

 

-
The "mtu" property

-
  "mtu"                      guint                 : Read / Write / Construct

+
NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS

+
#define NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS "cloned-mac-address"
+

 

-If non-zero, only transmit packets of the specified size or smaller,
-breaking larger packets up into multiple Ethernet frames.
 

-
Default value: 0

 

 

 

-
The "rate" property

-
  "rate"                     guint                 : Read / Write / Construct

+
NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST

+
#define NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST "mac-address-blacklist"
+

 

-If non-zero, directs the device to only use the specified bitrate for
-communication with the access point.  Units are in Kb/s, ie 5500 = 5.5
-Mbit/s.  This property is highly driver dependent and not all devices
-support setting a static bitrate.
 

-
Default value: 0

 

 

 

-
The "security" property

-
  "security"                 gchar*                : Read / Write

+
NM_SETTING_WIRELESS_MTU

+
#define NM_SETTING_WIRELESS_MTU         "mtu"
+

 

-If the wireless connection has any security restrictions, like 802.1x,
-WEP, or WPA, set this property to '802-11-wireless-security' and ensure
-the connection contains a valid 802-11-wireless-security setting.
 

-
Default value: NULL

 

 

 

-
The "seen-bssids" property

-
  "seen-bssids"              GSList_gchararray_*   : Read / Write

+
NM_SETTING_WIRELESS_SEEN_BSSIDS

+
#define NM_SETTING_WIRELESS_SEEN_BSSIDS "seen-bssids"
+

 

-A list of BSSIDs (each BSSID formatted as a MAC address like
-'00:11:22:33:44:55') that have been detected as part of the Wi-FI network.
-NetworkManager internally tracks previously seen BSSIDs. The property is only
-meant for reading and reflects the BBSID list of NetworkManager. The changes you
-make to this property will not be preserved.
 

 

 

 

-
The "ssid" property

-
  "ssid"                     GArray_guchar_*       : Read / Write

+
NM_SETTING_WIRELESS_SEC

+
#define NM_SETTING_WIRELESS_SEC         "security"
+

 

-SSID of the WiFi network.
 

 

 

 

-
The "tx-power" property

-
  "tx-power"                 guint                 : Read / Write / Construct

+
NM_SETTING_WIRELESS_HIDDEN

+
#define NM_SETTING_WIRELESS_HIDDEN      "hidden"
+

 

-If non-zero, directs the device to use the specified transmit power.
-Units are dBm.  This property is highly driver dependent and not all
-devices support setting a static transmit power.
 

+

+

+

+
NM_SETTING_WIRELESS_MODE_ADHOC

+
#define NM_SETTING_WIRELESS_MODE_ADHOC  "adhoc"
+

+
Indicates Ad-Hoc mode where no access point is expected to be present.

+

+

+

+
NM_SETTING_WIRELESS_MODE_AP

+
#define NM_SETTING_WIRELESS_MODE_AP     "ap"
+

+
Indicates AP/master mode where the wireless device is started as an access
+point/hotspot.

+
Since 0.9.8

+

+

+

+
NM_SETTING_WIRELESS_MODE_INFRA

+
#define NM_SETTING_WIRELESS_MODE_INFRA  "infrastructure"
+

+
Indicates infrastructure mode where an access point is expected to be present
+for this connection.

+

+

+

+
Property Details

+

+
The “band” property

+
  “band”                     gchar *

+
802.11 frequency band of the network.  One of 'a' for 5GHz 802.11a or 'bg' for 2.4GHz 802.11.  This will lock associations to the WiFi network to the specific band, i.e. if 'a' is specified, the device will not associate with the same network in the 2.4GHz band even if the network's settings are compatible.  This setting depends on specific driver capability and may not work with all drivers.

+
Flags: Read / Write

+
Default value: NULL

+

+

+

+
The “bssid” property

+
  “bssid”                    GArray_guchar_ *

+
If specified, directs the device to only associate with the given access point.  This capability is highly driver dependent and not supported by all devices.  Note: this property does not control the BSSID used when creating an Ad-Hoc network and is unlikely to in the future.

+
Flags: Read / Write

+

+

+

+
The “channel” property

+
  “channel”                  guint

+
Wireless channel to use for the WiFi connection.  The device will only join (or create for Ad-Hoc networks) a WiFi network on the specified channel.  Because channel numbers overlap between bands, this property also requires the 'band' property to be set.

+
Flags: Read / Write / Construct

+
Default value: 0

+

+

+

+
The “cloned-mac-address” property

+
  “cloned-mac-address”       GArray_guchar_ *

+
If specified, request that the WiFi device use this MAC address instead of its permanent MAC address.  This is known as MAC cloning or spoofing.

+
Flags: Read / Write

+

+

+

+
The “hidden” property

+
  “hidden”                   gboolean

+
If TRUE, indicates this network is a non-broadcasting network that hides its SSID.  In this case various workarounds may take place, such as probe-scanning the SSID for more reliable network discovery.  However, these workarounds expose inherent insecurities with hidden SSID networks, and thus hidden SSID networks should be used with caution.

+
Flags: Read / Write

+
Default value: FALSE

+

+

+

+
The “mac-address” property

+
  “mac-address”              GArray_guchar_ *

+
If specified, this connection will only apply to the WiFi device whose permanent MAC address matches.  This property does not change the MAC address of the device (i.e. MAC spoofing).

+
Flags: Read / Write

+

+

+

+
The “mac-address-blacklist” property

+
  “mac-address-blacklist”    GSList_gchararray_ *

+
A list of permanent MAC addresses of Wi-Fi devices to which this connection should never apply.  Each MAC address should be given in the standard hex-digits-and-colons notation (eg '00:11:22:33:44:55').

+
Flags: Read / Write

+

+

+

+
The “mode” property

+
  “mode”                     gchar *

+
WiFi network mode; one of 'infrastructure', 'adhoc' or 'ap'.  If blank, infrastructure is assumed.

+
Flags: Read / Write

+
Default value: NULL

+

+

+

+
The “mtu” property

+
  “mtu”                      guint

+
If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple Ethernet frames.

+
Flags: Read / Write / Construct

+
Default value: 0

+

+

+

+
The “rate” property

+
  “rate”                     guint

+
If non-zero, directs the device to only use the specified bitrate for communication with the access point.  Units are in Kb/s, ie 5500 = 5.5 Mbit/s.  This property is highly driver dependent and not all devices support setting a static bitrate.

+
Flags: Read / Write / Construct

+
Default value: 0

+

+

+

+
The “security” property

+
  “security”                 gchar *

+
If the wireless connection has any security restrictions, like 802.1x, WEP, or WPA, set this property to '802-11-wireless-security' and ensure the connection contains a valid 802-11-wireless-security setting.

+
Flags: Read / Write

+
Default value: NULL

+

+

+

+
The “seen-bssids” property

+
  “seen-bssids”              GSList_gchararray_ *

+
A list of BSSIDs (each BSSID formatted as a MAC address like 00:11:22:33:44:55') that have been detected as part of the WiFI network. NetworkManager internally tracks previously seen BSSIDs. The property is only meant for reading and reflects the BBSID list of NetworkManager. The changes you make to this property will not be preserved.

+
Flags: Read / Write

+

+

+

+
The “ssid” property

+
  “ssid”                     GArray_guchar_ *

+
SSID of the WiFi network.  Must be specified.

+
Flags: Read / Write

+

+

+

+
The “tx-power” property

+
  “tx-power”                 guint

+
If non-zero, directs the device to use the specified transmit power.  Units are dBm.  This property is highly driver dependent and not all devices support setting a static transmit power.

+
Flags: Read / Write / Construct

 
Default value: 0

 

 

 
 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.20
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingWirelessSecurity.html b/docs/libnm-util/html/NMSettingWirelessSecurity.html
index bdde2c5b..b7deca45 100644
--- a/docs/libnm-util/html/NMSettingWirelessSecurity.html
+++ b/docs/libnm-util/html/NMSettingWirelessSecurity.html
@@ -2,34 +2,28 @@
 
 
 
-NMSettingWirelessSecurity
+libnm-util Reference Manual: NMSettingWirelessSecurity
 
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
 

 

 

@@ -38,1409 +32,1753 @@
 
NMSettingWirelessSecurity — Describes connection properties for WiFi networks that
 use WEP, LEAP, WPA or WPA2/RSN security

-
+

 
 

-

-
Synopsis

-
-#include <nm-setting-wireless-security.h>
-
-#define             NM_SETTING_WIRELESS_SECURITY_SETTING_NAME
-enum                NMSettingWirelessSecurityError;
-#define             NM_SETTING_WIRELESS_SECURITY_ERROR
-GQuark              nm_setting_wireless_security_error_quark
-                                                        (void);
-enum                NMWepKeyType;
-#define             NM_SETTING_WIRELESS_SECURITY_KEY_MGMT
-#define             NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX
-#define             NM_SETTING_WIRELESS_SECURITY_AUTH_ALG
-#define             NM_SETTING_WIRELESS_SECURITY_PROTO
-#define             NM_SETTING_WIRELESS_SECURITY_PAIRWISE
-#define             NM_SETTING_WIRELESS_SECURITY_GROUP
-#define             NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME
-#define             NM_SETTING_WIRELESS_SECURITY_WEP_KEY0
-#define             NM_SETTING_WIRELESS_SECURITY_WEP_KEY1
-#define             NM_SETTING_WIRELESS_SECURITY_WEP_KEY2
-#define             NM_SETTING_WIRELESS_SECURITY_WEP_KEY3
-#define             NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS
-#define             NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE
-#define             NM_SETTING_WIRELESS_SECURITY_PSK
-#define             NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS
-#define             NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD
-#define             NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS
-                    NMSettingWirelessSecurity;
-                    NMSettingWirelessSecurityClass;
-NMSetting *         nm_setting_wireless_security_new    (void);
-const char *        nm_setting_wireless_security_get_key_mgmt
-                                                        (NMSettingWirelessSecurity *setting);
-guint32             nm_setting_wireless_security_get_num_protos
-                                                        (NMSettingWirelessSecurity *setting);
-const char *        nm_setting_wireless_security_get_proto
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         guint32 i);
-gboolean            nm_setting_wireless_security_add_proto
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         const char *proto);
-void                nm_setting_wireless_security_remove_proto
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         guint32 i);
-void                nm_setting_wireless_security_clear_protos
-                                                        (NMSettingWirelessSecurity *setting);
-guint32             nm_setting_wireless_security_get_num_pairwise
-                                                        (NMSettingWirelessSecurity *setting);
-const char *        nm_setting_wireless_security_get_pairwise
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         guint32 i);
-gboolean            nm_setting_wireless_security_add_pairwise
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         const char *pairwise);
-void                nm_setting_wireless_security_remove_pairwise
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         guint32 i);
-void                nm_setting_wireless_security_clear_pairwise
-                                                        (NMSettingWirelessSecurity *setting);
-guint32             nm_setting_wireless_security_get_num_groups
-                                                        (NMSettingWirelessSecurity *setting);
-const char *        nm_setting_wireless_security_get_group
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         guint32 i);
-gboolean            nm_setting_wireless_security_add_group
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         const char *group);
-void                nm_setting_wireless_security_remove_group
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         guint32 i);
-void                nm_setting_wireless_security_clear_groups
-                                                        (NMSettingWirelessSecurity *setting);
-const char *        nm_setting_wireless_security_get_psk
-                                                        (NMSettingWirelessSecurity *setting);
-NMSettingSecretFlags nm_setting_wireless_security_get_psk_flags
-                                                        (NMSettingWirelessSecurity *setting);
-const char *        nm_setting_wireless_security_get_leap_username
-                                                        (NMSettingWirelessSecurity *setting);
-const char *        nm_setting_wireless_security_get_leap_password
-                                                        (NMSettingWirelessSecurity *setting);
-NMSettingSecretFlags nm_setting_wireless_security_get_leap_password_flags
-                                                        (NMSettingWirelessSecurity *setting);
-const char *        nm_setting_wireless_security_get_wep_key
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         guint32 idx);
-void                nm_setting_wireless_security_set_wep_key
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         guint32 idx,
-                                                         const char *key);
-guint32             nm_setting_wireless_security_get_wep_tx_keyidx
-                                                        (NMSettingWirelessSecurity *setting);
-const char *        nm_setting_wireless_security_get_auth_alg
-                                                        (NMSettingWirelessSecurity *setting);
-NMSettingSecretFlags nm_setting_wireless_security_get_wep_key_flags
-                                                        (NMSettingWirelessSecurity *setting);
-NMWepKeyType        nm_setting_wireless_security_get_wep_key_type
-                                                        (NMSettingWirelessSecurity *setting);
-

-

-

-
Object Hierarchy

-
-  GEnum
-   +----NMSettingWirelessSecurityError
-

-
-  GEnum
-   +----NMWepKeyType
-

-
-  GObject
-   +----NMSetting
-         +----NMSettingWirelessSecurity
-

-

-

-
Properties

-
-  "auth-alg"                 gchar*                : Read / Write
-  "group"                    GSList_gchararray_*   : Read / Write
-  "key-mgmt"                 gchar*                : Read / Write
-  "leap-password"            gchar*                : Read / Write
-  "leap-password-flags"      guint                 : Read / Write
-  "leap-username"            gchar*                : Read / Write
-  "pairwise"                 GSList_gchararray_*   : Read / Write
-  "proto"                    GSList_gchararray_*   : Read / Write
-  "psk"                      gchar*                : Read / Write
-  "psk-flags"                guint                 : Read / Write
-  "wep-key-flags"            guint                 : Read / Write
-  "wep-key-type"             guint                 : Read / Write / Construct
-  "wep-key0"                 gchar*                : Read / Write
-  "wep-key1"                 gchar*                : Read / Write
-  "wep-key2"                 gchar*                : Read / Write
-  "wep-key3"                 gchar*                : Read / Write
-  "wep-tx-keyidx"            guint                 : Read / Write / Construct
-

-

 

-
Description

-

-The NMSettingWirelessSecurity object is a NMSetting subclass that describes
-properties necessary for connection to encrypted WiFi networks.
-

-

-It's a good idea to read up on wpa_supplicant configuration before using this
-setting extensively, since most of the options here correspond closely with
-the relevant wpa_supplicant configuration options.  To get a better overview
-of how WiFi security works, you may want to get copies of the following books.
-

-

- 802.11 Wireless Networks: The Definitive Guide, Second Edition
-      Author: Matthew Gast
-      ISBN: 978-0596100520
-

-

- Cisco Wireless LAN Security
-      Authors: Krishna Sankar, Sri Sundaralingam, Darrin Miller, and Andrew Balinsky
-      ISBN: 978-1587051548
-

-

-

-
Details

-

-
NM_SETTING_WIRELESS_SECURITY_SETTING_NAME

-
#define NM_SETTING_WIRELESS_SECURITY_SETTING_NAME "802-11-wireless-security"
-

-

-

-

-

-

-
enum NMSettingWirelessSecurityError

-
typedef enum {
-	NM_SETTING_WIRELESS_SECURITY_ERROR_UNKNOWN = 0,            /*< nick=UnknownError >*/
-	NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY,       /*< nick=InvalidProperty >*/
-	NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_PROPERTY,       /*< nick=MissingProperty >*/
-	NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_802_1X_SETTING, /*< nick=Missing8021xSetting >*/
-	NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_802_1X,   /*< nick=LEAPRequires8021x >*/
-	NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_USERNAME, /*< nick=LEAPRequiresUsername >*/
-	NM_SETTING_WIRELESS_SECURITY_ERROR_SHARED_KEY_REQUIRES_WEP /*< nick=SharedKeyRequiresWEP >*/
-} NMSettingWirelessSecurityError;
-

-

+
Functions

+
--++
-
-
+
-
-
+
+
+
+
+
-
-
+
-
-
+
-
-
+
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

 




 
 
 
NM_SETTING_WIRELESS_SECURITY_ERROR_UNKNOWN
unknown or unclassified error
+
+GQuark
+
+nm_setting_wireless_security_error_quark ()
 
 

 
NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY
the property was invalid
+
+NMSetting *
+
+nm_setting_wireless_security_new ()
+
const char *
+
+nm_setting_wireless_security_get_key_mgmt ()
 
 

 
NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_PROPERTY
the property was
-missing and is required
+
+guint32
+
+nm_setting_wireless_security_get_num_protos ()
 
 

 
NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_802_1X_SETTING
a property contained
-a value that requires the connection to contain a NMSetting8021x setting
+const char *
+
+nm_setting_wireless_security_get_proto ()
 
 

 
NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_802_1X
LEAP authentication
-was specified but key management was not set to "8021x"
+
+gboolean
+
+nm_setting_wireless_security_add_proto ()
 
 

 
NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_USERNAME
LEAP authentication
-was specified but no LEAP username was given
+
+void
+
+nm_setting_wireless_security_remove_proto ()
 
 

 
NM_SETTING_WIRELESS_SECURITY_ERROR_SHARED_KEY_REQUIRES_WEP
Shared Key
-authentication was specified but the setting did not specify WEP as the
-encryption protocol
+
+void
+
+nm_setting_wireless_security_clear_protos ()
+

+guint32
+
+nm_setting_wireless_security_get_num_pairwise ()
+
const char *
+
+nm_setting_wireless_security_get_pairwise ()
+

+gboolean
+
+nm_setting_wireless_security_add_pairwise ()
+

+void
+
+nm_setting_wireless_security_remove_pairwise ()
+

+void
+
+nm_setting_wireless_security_clear_pairwise ()
+

+guint32
+
+nm_setting_wireless_security_get_num_groups ()
+
const char *
+
+nm_setting_wireless_security_get_group ()
+

+gboolean
+
+nm_setting_wireless_security_add_group ()
+

+void
+
+nm_setting_wireless_security_remove_group ()
+

+void
+
+nm_setting_wireless_security_clear_groups ()
+
const char *
+
+nm_setting_wireless_security_get_psk ()
+

+NMSettingSecretFlags
+
+nm_setting_wireless_security_get_psk_flags ()
+
const char *
+
+nm_setting_wireless_security_get_leap_username ()
+
const char *
+
+nm_setting_wireless_security_get_leap_password ()
+

+NMSettingSecretFlags
+
+nm_setting_wireless_security_get_leap_password_flags ()
+
const char *
+
+nm_setting_wireless_security_get_wep_key ()
+

+void
+
+nm_setting_wireless_security_set_wep_key ()
+

+guint32
+
+nm_setting_wireless_security_get_wep_tx_keyidx ()
+
const char *
+
+nm_setting_wireless_security_get_auth_alg ()
+

+NMSettingSecretFlags
+
+nm_setting_wireless_security_get_wep_key_flags ()
+

+NMWepKeyType
+
+nm_setting_wireless_security_get_wep_key_type ()
 
 

 
 

 

-

-

-
NM_SETTING_WIRELESS_SECURITY_ERROR

-
#define NM_SETTING_WIRELESS_SECURITY_ERROR nm_setting_wireless_security_error_quark ()
-

-

-

-

-

-

-
nm_setting_wireless_security_error_quark ()

-
GQuark              nm_setting_wireless_security_error_quark
-                                                        (void);

-

-Registers an error quark for NMSettingWired if necessary.
-

-

----
-
-
-
-
-




Returns :
the error quark used for NMSettingWired errors.

-

-

-

-
enum NMWepKeyType

-
typedef enum {
-	NM_WEP_KEY_TYPE_UNKNOWN = 0,
-	NM_WEP_KEY_TYPE_KEY = 1,          /* Hex or ASCII */
-	NM_WEP_KEY_TYPE_PASSPHRASE = 2,   /* 104/128-bit Passphrase */
-
-	NM_WEP_KEY_TYPE_LAST = NM_WEP_KEY_TYPE_PASSPHRASE
-} NMWepKeyType;
-

-

-The NMWepKeyType values specify how any WEP keys present in the setting
-are intepreted.  There are no standards governing how to hash the various WEP
-key/passphrase formats into the actual WEP key.  Unfortunately some WEP keys
-can be interpreted in multiple ways, requring the setting to specify how to
-interpret the any WEP keys.  For example, the key "732f2d712e4a394a375d366931"
-is both a valid Hexadecimal WEP key and a WEP passphrase.  Further, many
-ASCII keys are also valid WEP passphrases, but since passphrases and ASCII
-keys are hashed differently to determine the actual WEP key the type must be
-specified.
-

-

+

+
Properties

+
--+++
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

 





 
 
 
NM_WEP_KEY_TYPE_UNKNOWN
unknown WEP key type
-
+gchar *auth-algRead / Write
 

 
NM_WEP_KEY_TYPE_KEY
indicates a hexadecimal or ASCII formatted WEP key.
-Hex keys are either 10 or 26 hexadecimal characters (ie "5f782f2f5f" or
-"732f2d712e4a394a375d366931"), while ASCII keys are either 5 or 13 ASCII
-characters (ie "abcde" or "blahblah99$*1").
-
+GSList_gchararray_ *groupRead / Write
 

 
NM_WEP_KEY_TYPE_PASSPHRASE
indicates a WEP passphrase (ex "I bought a duck
-on my way back from the market 235Q&^%^*%") instead of a hexadecimal or ASCII
-key.  Passphrases are between 8 and 64 characters inclusive and are hashed
-the actual WEP key using the MD5 hash algorithm.
-
+gchar *key-mgmtRead / Write
 

 
NM_WEP_KEY_TYPE_LAST
placeholder value for bounds-checking
-
+gchar *leap-passwordRead / Write
guintleap-password-flagsRead / Write

+gchar *leap-usernameRead / Write

+GSList_gchararray_ *pairwiseRead / Write

+GSList_gchararray_ *protoRead / Write

+gchar *pskRead / Write
guintpsk-flagsRead / Write
guintwep-key-flagsRead / Write
guintwep-key-typeRead / Write / Construct

+gchar *wep-key0Read / Write

+gchar *wep-key1Read / Write

+gchar *wep-key2Read / Write

+gchar *wep-key3Read / Write
guintwep-tx-keyidxRead / Write / Construct
 

 
 

 

-

-

-
NM_SETTING_WIRELESS_SECURITY_KEY_MGMT

-
#define NM_SETTING_WIRELESS_SECURITY_KEY_MGMT "key-mgmt"
-

-

-

-

-

-

-
NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX

-
#define NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX "wep-tx-keyidx"
-

-

-

-

-

-

-
NM_SETTING_WIRELESS_SECURITY_AUTH_ALG

-
#define NM_SETTING_WIRELESS_SECURITY_AUTH_ALG "auth-alg"
-

-

-

-

-

-

-
NM_SETTING_WIRELESS_SECURITY_PROTO

-
#define NM_SETTING_WIRELESS_SECURITY_PROTO "proto"
-

-

-

-

-

-

-
NM_SETTING_WIRELESS_SECURITY_PAIRWISE

-
#define NM_SETTING_WIRELESS_SECURITY_PAIRWISE "pairwise"
-

-

-

-

-

-

-
NM_SETTING_WIRELESS_SECURITY_GROUP

-
#define NM_SETTING_WIRELESS_SECURITY_GROUP "group"
-

-

-

-

-

-

-
NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME

-
#define NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME "leap-username"
-

-

-

-

-

-

-
NM_SETTING_WIRELESS_SECURITY_WEP_KEY0

-
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY0 "wep-key0"
-

-

-

-

-

-

-
NM_SETTING_WIRELESS_SECURITY_WEP_KEY1

-
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY1 "wep-key1"
-

-

-

-

-

-

-
NM_SETTING_WIRELESS_SECURITY_WEP_KEY2

-
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY2 "wep-key2"
-

-

-

-

-

-

-
NM_SETTING_WIRELESS_SECURITY_WEP_KEY3

-
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY3 "wep-key3"
-

-

-

-

-

-

-
NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS

-
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS "wep-key-flags"
-

-

-

+

+
Types and Values

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+




#defineNM_SETTING_WIRELESS_SECURITY_SETTING_NAME
enumNMSettingWirelessSecurityError
#defineNM_SETTING_WIRELESS_SECURITY_ERROR
enumNMWepKeyType
#defineNM_SETTING_WIRELESS_SECURITY_KEY_MGMT
#defineNM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX
#defineNM_SETTING_WIRELESS_SECURITY_AUTH_ALG
#defineNM_SETTING_WIRELESS_SECURITY_PROTO
#defineNM_SETTING_WIRELESS_SECURITY_PAIRWISE
#defineNM_SETTING_WIRELESS_SECURITY_GROUP
#defineNM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME
#defineNM_SETTING_WIRELESS_SECURITY_WEP_KEY0
#defineNM_SETTING_WIRELESS_SECURITY_WEP_KEY1
#defineNM_SETTING_WIRELESS_SECURITY_WEP_KEY2
#defineNM_SETTING_WIRELESS_SECURITY_WEP_KEY3
#defineNM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS
#defineNM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE
#defineNM_SETTING_WIRELESS_SECURITY_PSK
#defineNM_SETTING_WIRELESS_SECURITY_PSK_FLAGS
#defineNM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD
#defineNM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS

 

-

-

-
NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE

-
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE "wep-key-type"
+

+
Object Hierarchy

+
    GEnum
+    ├── NMSettingWirelessSecurityError
+    ╰── NMWepKeyType
+    GObject
+    ╰── NMSetting
+        ╰── NMSettingWirelessSecurity
 

-

-

 

-

-

-
NM_SETTING_WIRELESS_SECURITY_PSK

-
#define NM_SETTING_WIRELESS_SECURITY_PSK "psk"
+

+
Includes

+
#include <nm-setting-wireless-security.h>
 

-

-

 

-

-

-
NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS

-
#define NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS "psk-flags"
-

-

-

+

+
Description

+
The NMSettingWirelessSecurity object is a NMSetting subclass that describes
+properties necessary for connection to encrypted WiFi networks.

+
It's a good idea to read up on wpa_supplicant configuration before using this
+setting extensively, since most of the options here correspond closely with
+the relevant wpa_supplicant configuration options.  To get a better overview
+of how WiFi security works, you may want to get copies of the following books.

+
 802.11 Wireless Networks: The Definitive Guide, Second Edition
+      Author: Matthew Gast
+      ISBN: 978-0596100520

+
 Cisco Wireless LAN Security
+      Authors: Krishna Sankar, Sri Sundaralingam, Darrin Miller, and Andrew Balinsky
+      ISBN: 978-1587051548

 

-

+

+
Functions

 

-
NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD

-
#define NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD "leap-password"
-

-

-

+
nm_setting_wireless_security_error_quark ()

+
GQuark
+nm_setting_wireless_security_error_quark
+                               (void);

+
Registers an error quark for NMSettingWired if necessary.

+

+
Returns

+
 the error quark used for NMSettingWired errors.

+

 

-

-

-
NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS

-
#define NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS "leap-password-flags"
-

-

-

 

 

 

-
NMSettingWirelessSecurity

-
typedef struct _NMSettingWirelessSecurity NMSettingWirelessSecurity;

-

-

+
nm_setting_wireless_security_new ()

+
NMSetting *
+nm_setting_wireless_security_new (void);

+
Creates a new NMSettingWirelessSecurity object with default values.

+

+
Returns

+
 the new empty NMSettingWirelessSecurity object. 

+
[transfer full]

 

-

-

-
NMSettingWirelessSecurityClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingWirelessSecurityClass;
-

-

-

 

 

 

-
nm_setting_wireless_security_new ()

-
NMSetting *         nm_setting_wireless_security_new    (void);

-

-Creates a new NMSettingWirelessSecurity object with default values.
-

-

+
nm_setting_wireless_security_get_key_mgmt ()

+
const char *
+nm_setting_wireless_security_get_key_mgmt
+                               (NMSettingWirelessSecurity *setting);

+

+
Parameters

+
--+++
-
-
+
+
+

 





 
 
Returns :
the new empty NMSettingWirelessSecurity object. [transfer full]
-
setting
the NMSettingWirelessSecurity
 
 

 

 

-

-

-
nm_setting_wireless_security_get_key_mgmt ()

-
const char *        nm_setting_wireless_security_get_key_mgmt
-                                                        (NMSettingWirelessSecurity *setting);

-

----
-
-
-
-
-
-
-
-
-
-
-




setting :
the NMSettingWirelessSecurity
-
Returns :
the "key-mgmt" property of the setting

+

+
Returns

+
 the “key-mgmt” property of the setting

+

+

 

 

 

-
nm_setting_wireless_security_get_num_protos ()

-
guint32             nm_setting_wireless_security_get_num_protos
-                                                        (NMSettingWirelessSecurity *setting);

-

+
nm_setting_wireless_security_get_num_protos ()

+
guint32
+nm_setting_wireless_security_get_num_protos
+                               (NMSettingWirelessSecurity *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingWirelessSecurity
-
Returns :
the number of security protocols this connection allows when
-connecting to secure WiFi networks
setting
the NMSettingWirelessSecurity
 

 

 

+

+
Returns

+
 the number of security protocols this connection allows when
+connecting to secure WiFi networks

+

+

+

 

 

-
nm_setting_wireless_security_get_proto ()

-
const char *        nm_setting_wireless_security_get_proto
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         guint32 i);

-

+
nm_setting_wireless_security_get_proto ()

+
const char *
+nm_setting_wireless_security_get_proto
+                               (NMSettingWirelessSecurity *setting,
+                                guint32 i);

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingWirelessSecurity
-
i :
an index into the protocol list
setting
the NMSettingWirelessSecurity
 
 

 
Returns :
the protocol at index i
-
i
an index into the protocol list
 
 

 
 

 

+

+
Returns

+
 the protocol at index i
+

+

+

+

 

 

-
nm_setting_wireless_security_add_proto ()

-
gboolean            nm_setting_wireless_security_add_proto
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         const char *proto);

-

-Adds a WiFi security protocol (one of "wpa" or "rsn") to the allowed list;
+
nm_setting_wireless_security_add_proto ()

+
gboolean
+nm_setting_wireless_security_add_proto
+                               (NMSettingWirelessSecurity *setting,
+                                const char *proto);

+
Adds a WiFi security protocol (one of "wpa" or "rsn") to the allowed list;
 only protocols in this list will be used when finding and connecting to
 the WiFi network specified by this connection.  For example, if the
 protocol list contains only "wpa" but the access point for the SSID specified
 by this connection only supports WPA2/RSN, the connection cannot be used
-with the access point.
-

-

+with the access point.

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingWirelessSecurity
-
proto :
the protocol to add, one of "wpa" or "rsn"
setting
the NMSettingWirelessSecurity
 
 

 
Returns :

-TRUE if the protocol was new and and was added to the allowed
-protocol list, or FALSE if it was already in the list
proto
the protocol to add, one of "wpa" or "rsn"
 
 

 
 

 

+

+
Returns

+
 TRUE if the protocol was new and and was added to the allowed
+protocol list, or FALSE if it was already in the list

+

+

+

 

 

-
nm_setting_wireless_security_remove_proto ()

-
void                nm_setting_wireless_security_remove_proto
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         guint32 i);

-

-Removes a protocol from the allowed protocol list.
-

-

+
nm_setting_wireless_security_remove_proto ()

+
void
+nm_setting_wireless_security_remove_proto
+                               (NMSettingWirelessSecurity *setting,
+                                guint32 i);

+
Removes a protocol from the allowed protocol list.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingWirelessSecurity
-
setting
the NMSettingWirelessSecurity
 
 

 
i :
index of the protocol to remove
i
index of the protocol to remove
 
 

 
 

 

+

 

 

-
nm_setting_wireless_security_clear_protos ()

-
void                nm_setting_wireless_security_clear_protos
-                                                        (NMSettingWirelessSecurity *setting);

-

-Removes all protocols from the allowed list.  If there are no protocols
-specified then all protocols are allowed.
-

-

+
nm_setting_wireless_security_clear_protos ()

+
void
+nm_setting_wireless_security_clear_protos
+                               (NMSettingWirelessSecurity *setting);

+
Removes all protocols from the allowed list.  If there are no protocols
+specified then all protocols are allowed.

+

+
Parameters

+
--+++
-
-
+
+
+

 





 
 
setting :
the NMSettingWirelessSecurity
-
setting
the NMSettingWirelessSecurity
 
 

 

 

+

 

 

-
nm_setting_wireless_security_get_num_pairwise ()

-
guint32             nm_setting_wireless_security_get_num_pairwise
-                                                        (NMSettingWirelessSecurity *setting);

-

+
nm_setting_wireless_security_get_num_pairwise ()

+
guint32
+nm_setting_wireless_security_get_num_pairwise
+                               (NMSettingWirelessSecurity *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingWirelessSecurity
-
Returns :
the number of pairwise encryption algorithms in the allowed list
setting
the NMSettingWirelessSecurity
 

 

 

+

+
Returns

+
 the number of pairwise encryption algorithms in the allowed list

+

+

+

 

 

-
nm_setting_wireless_security_get_pairwise ()

-
const char *        nm_setting_wireless_security_get_pairwise
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         guint32 i);

-

-Returns the allowed pairwise encryption algorithm from allowed algorithm
-list.
-

-

+
nm_setting_wireless_security_get_pairwise ()

+
const char *
+nm_setting_wireless_security_get_pairwise
+                               (NMSettingWirelessSecurity *setting,
+                                guint32 i);

+
Returns the allowed pairwise encryption algorithm from allowed algorithm
+list.

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingWirelessSecurity
-
i :
index of an item in the allowed pairwise encryption algorithm list
setting
the NMSettingWirelessSecurity
 
 

 
Returns :
the pairwise encryption algorithm at index i
-
i
index of an item in the allowed pairwise encryption algorithm list
 
 

 
 

 

+

+
Returns

+
 the pairwise encryption algorithm at index i
+

+

+

+

 

 

-
nm_setting_wireless_security_add_pairwise ()

-
gboolean            nm_setting_wireless_security_add_pairwise
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         const char *pairwise);

-

-Adds an encryption algorithm to the list of allowed pairwise encryption
+
nm_setting_wireless_security_add_pairwise ()

+
gboolean
+nm_setting_wireless_security_add_pairwise
+                               (NMSettingWirelessSecurity *setting,
+                                const char *pairwise);

+
Adds an encryption algorithm to the list of allowed pairwise encryption
 algorithms.  If the list is not empty, then only access points that support
 one or more of the encryption algorithms in the list will be considered
-compatible with this connection.
-

-

+compatible with this connection.

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingWirelessSecurity
-
pairwise :
the encryption algorithm to add, one of "wep40", "wep104",
-"tkip", or "ccmp"
setting
the NMSettingWirelessSecurity
 
 

 
Returns :

-TRUE if the algorithm was added to the list, FALSE if it was
-already in the list
pairwise
the encryption algorithm to add, one of "wep40", "wep104",
+"tkip", or "ccmp"
 
 

 
 

 

+

+
Returns

+
 TRUE if the algorithm was added to the list, FALSE if it was
+already in the list

+

+

+

 

 

-
nm_setting_wireless_security_remove_pairwise ()

-
void                nm_setting_wireless_security_remove_pairwise
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         guint32 i);

-

-Removes an encryption algorithm from the allowed pairwise encryption
-algorithm list.
-

-

+
nm_setting_wireless_security_remove_pairwise ()

+
void
+nm_setting_wireless_security_remove_pairwise
+                               (NMSettingWirelessSecurity *setting,
+                                guint32 i);

+
Removes an encryption algorithm from the allowed pairwise encryption
+algorithm list.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingWirelessSecurity
-
setting
the NMSettingWirelessSecurity
 
 

 
i :
the index of an item in the allowed pairwise encryption algorithm list
i
the index of an item in the allowed pairwise encryption algorithm list
 
 

 
 

 

+

 

 

-
nm_setting_wireless_security_clear_pairwise ()

-
void                nm_setting_wireless_security_clear_pairwise
-                                                        (NMSettingWirelessSecurity *setting);

-

-Removes all algorithms from the allowed list.  If there are no algorithms
-specified then all pairwise encryption algorithms are allowed.
-

-

+
nm_setting_wireless_security_clear_pairwise ()

+
void
+nm_setting_wireless_security_clear_pairwise
+                               (NMSettingWirelessSecurity *setting);

+
Removes all algorithms from the allowed list.  If there are no algorithms
+specified then all pairwise encryption algorithms are allowed.

+

+
Parameters

+
--+++
-
-
+
+
+

 





 
 
setting :
the NMSettingWirelessSecurity
-
setting
the NMSettingWirelessSecurity
 
 

 

 

+
 

 

-
nm_setting_wireless_security_get_num_groups ()

-
guint32             nm_setting_wireless_security_get_num_groups
-                                                        (NMSettingWirelessSecurity *setting);

-

+
nm_setting_wireless_security_get_num_groups ()

+
guint32
+nm_setting_wireless_security_get_num_groups
+                               (NMSettingWirelessSecurity *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingWirelessSecurity
-
Returns :
the number of groupwise encryption algorithms in the allowed list
setting
the NMSettingWirelessSecurity
 

 

 

+

+
Returns

+
 the number of groupwise encryption algorithms in the allowed list

+

+

+
 

 

-
nm_setting_wireless_security_get_group ()

-
const char *        nm_setting_wireless_security_get_group
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         guint32 i);

-

-Returns the allowed groupwise encryption algorithm from allowed algorithm
-list.
-

-

+
nm_setting_wireless_security_get_group ()

+
const char *
+nm_setting_wireless_security_get_group
+                               (NMSettingWirelessSecurity *setting,
+                                guint32 i);

+
Returns the allowed groupwise encryption algorithm from allowed algorithm
+list.

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingWirelessSecurity
-
i :
index of an item in the allowed groupwise encryption algorithm list
setting
the NMSettingWirelessSecurity
 
 

 
Returns :
the groupwise encryption algorithm at index i
-
i
index of an item in the allowed groupwise encryption algorithm list
 
 

 
 

 

+

+
Returns

+
 the groupwise encryption algorithm at index i
+

+

+

+
 

 

-
nm_setting_wireless_security_add_group ()

-
gboolean            nm_setting_wireless_security_add_group
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         const char *group);

-

-Adds an encryption algorithm to the list of allowed groupwise encryption
+
nm_setting_wireless_security_add_group ()

+
gboolean
+nm_setting_wireless_security_add_group
+                               (NMSettingWirelessSecurity *setting,
+                                const char *group);

+
Adds an encryption algorithm to the list of allowed groupwise encryption
 algorithms.  If the list is not empty, then only access points that support
 one or more of the encryption algorithms in the list will be considered
-compatible with this connection.
-

-

+compatible with this connection.

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingWirelessSecurity
-
group :
the encryption algorithm to add, one of "wep40", "wep104",
-"tkip", or "ccmp"
setting
the NMSettingWirelessSecurity
 
 

 
Returns :

-TRUE if the algorithm was added to the list, FALSE if it was
-already in the list
group
the encryption algorithm to add, one of "wep40", "wep104",
+"tkip", or "ccmp"
 
 

 
 

 

+

+
Returns

+
 TRUE if the algorithm was added to the list, FALSE if it was
+already in the list

+

+

+
 

 

-
nm_setting_wireless_security_remove_group ()

-
void                nm_setting_wireless_security_remove_group
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         guint32 i);

-

-Removes an encryption algorithm from the allowed groupwise encryption
-algorithm list.
-

-

+
nm_setting_wireless_security_remove_group ()

+
void
+nm_setting_wireless_security_remove_group
+                               (NMSettingWirelessSecurity *setting,
+                                guint32 i);

+
Removes an encryption algorithm from the allowed groupwise encryption
+algorithm list.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingWirelessSecurity
-
setting
the NMSettingWirelessSecurity
 
 

 
i :
the index of an item in the allowed groupwise encryption algorithm list
i
the index of an item in the allowed groupwise encryption algorithm list
 
 

 
 

 

+
 

 

-
nm_setting_wireless_security_clear_groups ()

-
void                nm_setting_wireless_security_clear_groups
-                                                        (NMSettingWirelessSecurity *setting);

-

-Removes all algorithms from the allowed list.  If there are no algorithms
-specified then all groupwise encryption algorithms are allowed.
-

-

+
nm_setting_wireless_security_clear_groups ()

+
void
+nm_setting_wireless_security_clear_groups
+                               (NMSettingWirelessSecurity *setting);

+
Removes all algorithms from the allowed list.  If there are no algorithms
+specified then all groupwise encryption algorithms are allowed.

+

+
Parameters

+
--+++
-
-
+
+
+
+
+

 





 
 
setting :
the NMSettingWirelessSecurity
-
setting
the NMSettingWirelessSecurity
 

+

+
+

+

+
nm_setting_wireless_security_get_psk ()

+
const char *
+nm_setting_wireless_security_get_psk (NMSettingWirelessSecurity *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingWirelessSecurity
 

+

+

+
Returns

+
 the “psk” property of the setting

+

+

+

+

+

+
nm_setting_wireless_security_get_psk_flags ()

+
NMSettingSecretFlags
+nm_setting_wireless_security_get_psk_flags
+                               (NMSettingWirelessSecurity *setting);

+

+
Parameters

+

+++++
+
+
+
+





setting
the NMSettingWirelessSecurity
 
 

 

 

+

+
Returns

+
 the NMSettingSecretFlags pertaining to the
+“psk”

+

+

+

+

+

+
nm_setting_wireless_security_get_leap_username ()

+
const char *
+nm_setting_wireless_security_get_leap_username
+                               (NMSettingWirelessSecurity *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingWirelessSecurity
 

+

+

+
Returns

+
 the “leap-username” property of the setting

+

+

+

+

+

+
nm_setting_wireless_security_get_leap_password ()

+
const char *
+nm_setting_wireless_security_get_leap_password
+                               (NMSettingWirelessSecurity *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingWirelessSecurity
 

+

+

+
Returns

+
 the “leap-password” property of the setting

+

+

+

+

+

+
nm_setting_wireless_security_get_leap_password_flags ()

+
NMSettingSecretFlags
+nm_setting_wireless_security_get_leap_password_flags
+                               (NMSettingWirelessSecurity *setting);

+

+
Parameters

+

+++++
+
+
+
+
+
+





setting
the NMSettingWirelessSecurity
 

+

+

+
Returns

+
 the NMSettingSecretFlags pertaining to the
+“leap-password”

+

+

+

 

 

-
nm_setting_wireless_security_get_psk ()

-
const char *        nm_setting_wireless_security_get_psk
-                                                        (NMSettingWirelessSecurity *setting);

-

+
nm_setting_wireless_security_get_wep_key ()

+
const char *
+nm_setting_wireless_security_get_wep_key
+                               (NMSettingWirelessSecurity *setting,
+                                guint32 idx);

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
setting :
the NMSettingWirelessSecurity
-
setting
the NMSettingWirelessSecurity
 
 

 
Returns :
the "psk" property of the setting
idx
the WEP key index (0..3 inclusive)
 
 

 
 

 

+

+
Returns

+
 the WEP key at the given index

+

+

+
 

 

-
nm_setting_wireless_security_get_psk_flags ()

-
NMSettingSecretFlags nm_setting_wireless_security_get_psk_flags
-                                                        (NMSettingWirelessSecurity *setting);

-

+
nm_setting_wireless_security_set_wep_key ()

+
void
+nm_setting_wireless_security_set_wep_key
+                               (NMSettingWirelessSecurity *setting,
+                                guint32 idx,
+                                const char *key);

+
Sets a WEP key in the given index.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+
+
+
+
+
+

 





 
 
 
setting :
the NMSettingWirelessSecurity
-
setting
the NMSettingWirelessSecurity
 
 

 
Returns :
the NMSettingSecretFlags pertaining to the
-"psk"
-
idx
the index of the key (0..3 inclusive)
 
key
the WEP key as a string, in either hexadecimal, ASCII, or passphrase
+form as determiend by the value of the “wep-key-type”
+property.
 
 

 
 

 

+
 

 

-
nm_setting_wireless_security_get_leap_username ()

-
const char *        nm_setting_wireless_security_get_leap_username
-                                                        (NMSettingWirelessSecurity *setting);

-

+
nm_setting_wireless_security_get_wep_tx_keyidx ()

+
guint32
+nm_setting_wireless_security_get_wep_tx_keyidx
+                               (NMSettingWirelessSecurity *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingWirelessSecurity
-
Returns :
the "leap-username" property of the setting
setting
the NMSettingWirelessSecurity
 

 

 

+

+
Returns

+
 the “wep-tx-keyidx” property of the setting

+

+

+
 

 

-
nm_setting_wireless_security_get_leap_password ()

-
const char *        nm_setting_wireless_security_get_leap_password
-                                                        (NMSettingWirelessSecurity *setting);

-

+
nm_setting_wireless_security_get_auth_alg ()

+
const char *
+nm_setting_wireless_security_get_auth_alg
+                               (NMSettingWirelessSecurity *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingWirelessSecurity
-
Returns :
the "leap-password" property of the setting
setting
the NMSettingWirelessSecurity
 

 

 

+

+
Returns

+
 the “auth-alg” property of the setting

+

+

+
 

 

-
nm_setting_wireless_security_get_leap_password_flags ()

-
NMSettingSecretFlags nm_setting_wireless_security_get_leap_password_flags
-                                                        (NMSettingWirelessSecurity *setting);

-

+
nm_setting_wireless_security_get_wep_key_flags ()

+
NMSettingSecretFlags
+nm_setting_wireless_security_get_wep_key_flags
+                               (NMSettingWirelessSecurity *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingWirelessSecurity
-
Returns :
the NMSettingSecretFlags pertaining to the
-"leap-password"
-
setting
the NMSettingWirelessSecurity
 

 

 

+

+
Returns

+
 the NMSettingSecretFlags pertaining to the all WEP keys

+

+

+
 

 

-
nm_setting_wireless_security_get_wep_key ()

-
const char *        nm_setting_wireless_security_get_wep_key
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         guint32 idx);

-

+
nm_setting_wireless_security_get_wep_key_type ()

+
NMWepKeyType
+nm_setting_wireless_security_get_wep_key_type
+                               (NMSettingWirelessSecurity *setting);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
setting :
the NMSettingWirelessSecurity
-
idx :
the WEP key index (0..3 inclusive)
Returns :
the WEP key at the given index
setting
the NMSettingWirelessSecurity
 

 

 

-

+

+
Returns

+
 the “wep-key-type” property of the setting

+

+

+
+
+

+
Types and Values

 

-
nm_setting_wireless_security_set_wep_key ()

-
void                nm_setting_wireless_security_set_wep_key
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         guint32 idx,
-                                                         const char *key);

+
NM_SETTING_WIRELESS_SECURITY_SETTING_NAME

+
#define NM_SETTING_WIRELESS_SECURITY_SETTING_NAME "802-11-wireless-security"
+

 

-Sets a WEP key in the given index.
 

-

+
+

+

+
enum NMSettingWirelessSecurityError

+

+
Members

+
--+++
-
-
+
+
-
-
+
+
+
-
-
+
+
+
-
-

 





 
 
 
setting :
the NMSettingWirelessSecurity
+
NM_SETTING_WIRELESS_SECURITY_ERROR_UNKNOWN

+
unknown or unclassified error

 		 
 

 
idx :
the index of the key (0..3 inclusive)
NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY

+
the property was invalid

+		 
 

 
key :
the WEP key as a string, in either hexadecimal, ASCII, or passphrase
-form as determiend by the value of the "wep-key-type"
-property.
NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_PROPERTY

+
the property was
+missing and is required

+		 
 

-

-

-

-
nm_setting_wireless_security_get_wep_tx_keyidx ()

-
guint32             nm_setting_wireless_security_get_wep_tx_keyidx
-                                                        (NMSettingWirelessSecurity *setting);

-

----
-
-
-
+
+
-
-
+
+
+
-
-




 
setting :
the NMSettingWirelessSecurity
+
NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_802_1X_SETTING

+
a property contained
+a value that requires the connection to contain a NMSetting8021x setting

 		 
 

 
Returns :
the "wep-tx-keyidx" property of the setting
NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_802_1X

+
LEAP authentication
+was specified but key management was not set to "8021x"

+		 
 

-

-

-

-
nm_setting_wireless_security_get_auth_alg ()

-
const char *        nm_setting_wireless_security_get_auth_alg
-                                                        (NMSettingWirelessSecurity *setting);

-

----
-
-
-
+
+
-
-
+
+
+




 
setting :
the NMSettingWirelessSecurity
+
NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_USERNAME

+
LEAP authentication
+was specified but no LEAP username was given

 		 
 

 
Returns :
the "auth-alg" property of the setting
NM_SETTING_WIRELESS_SECURITY_ERROR_SHARED_KEY_REQUIRES_WEP

+
Shared Key
+authentication was specified but the setting did not specify WEP as the
+encryption protocol

+		 
 

 
 

 

+

+

+

+
NM_SETTING_WIRELESS_SECURITY_ERROR

+
#define NM_SETTING_WIRELESS_SECURITY_ERROR nm_setting_wireless_security_error_quark ()
+

+

+

+

 

 

-
nm_setting_wireless_security_get_wep_key_flags ()

-
NMSettingSecretFlags nm_setting_wireless_security_get_wep_key_flags
-                                                        (NMSettingWirelessSecurity *setting);

-

+
enum NMWepKeyType

+
The NMWepKeyType values specify how any WEP keys present in the setting
+are intepreted.  There are no standards governing how to hash the various WEP
+key/passphrase formats into the actual WEP key.  Unfortunately some WEP keys
+can be interpreted in multiple ways, requring the setting to specify how to
+interpret the any WEP keys.  For example, the key "732f2d712e4a394a375d366931"
+is both a valid Hexadecimal WEP key and a WEP passphrase.  Further, many
+ASCII keys are also valid WEP passphrases, but since passphrases and ASCII
+keys are hashed differently to determine the actual WEP key the type must be
+specified.

+

+
Members

+
--+++
-
-
+
+
-
-
+
+
+
-
-

 





 
 
 
setting :
the NMSettingWirelessSecurity
+
NM_WEP_KEY_TYPE_UNKNOWN

+
unknown WEP key type

 		 
 

 
Returns :
the NMSettingSecretFlags pertaining to the all WEP keys
NM_WEP_KEY_TYPE_KEY

+
indicates a hexadecimal or ASCII formatted WEP key.
+Hex keys are either 10 or 26 hexadecimal characters (ie "5f782f2f5f" or
+"732f2d712e4a394a375d366931"), while ASCII keys are either 5 or 13 ASCII
+characters (ie "abcde" or "blahblah99$*1").

+		 
 

-

-

-

-
nm_setting_wireless_security_get_wep_key_type ()

-
NMWepKeyType        nm_setting_wireless_security_get_wep_key_type
-                                                        (NMSettingWirelessSecurity *setting);

-

----
-
-
-
+
+
-
-
+
+
+




 
setting :
the NMSettingWirelessSecurity
+
NM_WEP_KEY_TYPE_PASSPHRASE

+
indicates a WEP passphrase (ex "I bought a duck
+on my way back from the market 235Q&^%^*%") instead of a hexadecimal or ASCII
+key.  Passphrases are between 8 and 64 characters inclusive and are hashed
+the actual WEP key using the MD5 hash algorithm.

 		 
 

 
Returns :
the "wep-key-type" property of the setting
NM_WEP_KEY_TYPE_LAST

+
placeholder value for bounds-checking

+		 
 

 
 

 

 
-

-
Property Details

+

 

-
The "auth-alg" property

-
  "auth-alg"                 gchar*                : Read / Write

+
NM_SETTING_WIRELESS_SECURITY_KEY_MGMT

+
#define NM_SETTING_WIRELESS_SECURITY_KEY_MGMT "key-mgmt"
+

 

-When WEP is used (ie, key-mgmt = 'none' or 'ieee8021x') indicate the
-802.11 authentication algorithm required by the AP here.  One of 'open'
-for Open System, 'shared' for Shared Key, or 'leap' for Cisco LEAP.
-When using Cisco LEAP (ie, key-mgmt = 'ieee8021x' and auth-alg = 'leap')
-the 'leap-username' and 'leap-password' properties must be specified.
 

-
Default value: NULL

 

 

 

-
The "group" property

-
  "group"                    GSList_gchararray_*   : Read / Write

+
NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX

+
#define NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX "wep-tx-keyidx"
+

 

-A list of group/broadcast encryption algorithms which prevents
-connections to Wi-Fi networks that do not utilize one of the algorithms
-in the list.  For maximum compatibility leave this property empty.  Each
-list element may be one of 'wep40', 'wep104', 'tkip', or 'ccmp'.
 

 

 

 

-
The "key-mgmt" property

-
  "key-mgmt"                 gchar*                : Read / Write

+
NM_SETTING_WIRELESS_SECURITY_AUTH_ALG

+
#define NM_SETTING_WIRELESS_SECURITY_AUTH_ALG "auth-alg"
+

 

-Key management used for the connection.  One of 'none' (WEP), 'ieee8021x'
-(Dynamic WEP), 'wpa-none' (Ad-Hoc WPA-PSK), 'wpa-psk' (infrastructure
-WPA-PSK), or 'wpa-eap' (WPA-Enterprise).  This property must be set for
-any WiFi connection that uses security.
 

-
Default value: NULL

 

 

 

-
The "leap-password" property

-
  "leap-password"            gchar*                : Read / Write

+
NM_SETTING_WIRELESS_SECURITY_PROTO

+
#define NM_SETTING_WIRELESS_SECURITY_PROTO "proto"
+

 

-The login password for legacy LEAP connections (ie, key-mgmt =
-'ieee8021x' and auth-alg = 'leap').
 

-
Default value: NULL

 

 

 

-
The "leap-password-flags" property

-
  "leap-password-flags"      guint                 : Read / Write

+
NM_SETTING_WIRELESS_SECURITY_PAIRWISE

+
#define NM_SETTING_WIRELESS_SECURITY_PAIRWISE "pairwise"
+

 

-Flags indicating how to handle "leap-password".
 

-
Allowed values: <= 7

-
Default value: 0

 

 

 

-
The "leap-username" property

-
  "leap-username"            gchar*                : Read / Write

+
NM_SETTING_WIRELESS_SECURITY_GROUP

+
#define NM_SETTING_WIRELESS_SECURITY_GROUP "group"
+

 

-The login username for legacy LEAP connections (ie, key-mgmt =
-'ieee8021x' and auth-alg = 'leap').
 

-
Default value: NULL

 

 

 

-
The "pairwise" property

-
  "pairwise"                 GSList_gchararray_*   : Read / Write

+
NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME

+
#define NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME "leap-username"
+

 

-A list of pairwise encryption algorithms which prevents connections to
-Wi-Fi networks that do not utilize one of the algorithms in the list.  For
-maximum compatibility leave this property empty.  Each list element may
-be one of 'wep40', 'wep104', 'tkip', or 'ccmp'.
 

 

 

 

-
The "proto" property

-
  "proto"                    GSList_gchararray_*   : Read / Write

+
NM_SETTING_WIRELESS_SECURITY_WEP_KEY0

+
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY0 "wep-key0"
+

 

-List of strings specifying the allowed WPA protocol versions to use.
-Each element may be one 'wpa' (allow WPA) or 'rsn' (allow WPA2/RSN).  If
-not specified, both WPA and RSN connections are allowed.
 

 

 

 

-
The "psk" property

-
  "psk"                      gchar*                : Read / Write

+
NM_SETTING_WIRELESS_SECURITY_WEP_KEY1

+
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY1 "wep-key1"
+

 

-Pre-Shared-Key for WPA networks.  If the key is 64-characters long, it
-must contain only hexadecimal characters and is interpreted as a
-hexadecimal WPA key.  Otherwise, the key must be between 8 and 63 ASCII
-characters (as specified in the 802.11i standard) and is interpreted as
-a WPA passphrase, and is hashed to derive the actual WPA-PSK used when
-connecting to the WiFi network.
 

-
Default value: NULL

 

 

 

-
The "psk-flags" property

-
  "psk-flags"                guint                 : Read / Write

+
NM_SETTING_WIRELESS_SECURITY_WEP_KEY2

+
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY2 "wep-key2"
+

 

-Flags indicating how to handle "psk"
 

-
Allowed values: <= 7

-
Default value: 0

 

 

 

-
The "wep-key-flags" property

-
  "wep-key-flags"            guint                 : Read / Write

+
NM_SETTING_WIRELESS_SECURITY_WEP_KEY3

+
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY3 "wep-key3"
+

 

-Flags indicating how to handle NMSettingWirelessSecurity WEP keys.
 

-
Allowed values: <= 7

-
Default value: 0

 

 

 

-
The "wep-key-type" property

-
  "wep-key-type"             guint                 : Read / Write / Construct

+
NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS

+
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS "wep-key-flags"
+

 

-Controls the interpretation of WEP keys.  Allowed values are those given
-by NMWepKeyType.  If set to 1 and the keys are hexadecimal, they must be
-either 10 or 26 characters in length.  If set to 1 and the keys are
-ASCII keys, they must be either 5 or 13 characters in length.  If set to
-2, the passphrase is hashed using the de-facto MD5 method to derive the
-actual WEP key.
 

-
Allowed values: <= 2

-
Default value: 0

 

 

 

-
The "wep-key0" property

-
  "wep-key0"                 gchar*                : Read / Write

+
NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE

+
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE "wep-key-type"
+

 

-Index 0 WEP key.  This is the WEP key used in most networks.  See the
-'wep-key-type' property for a description of how this key is interpreted.
 

-
Default value: NULL

 

 

 

-
The "wep-key1" property

-
  "wep-key1"                 gchar*                : Read / Write

+
NM_SETTING_WIRELESS_SECURITY_PSK

+
#define NM_SETTING_WIRELESS_SECURITY_PSK "psk"
+

 

-Index 1 WEP key.  This WEP index is not used by most networks.  See the
-'wep-key-type' property for a description of how this key is interpreted.
 

-
Default value: NULL

 

 

 

-
The "wep-key2" property

-
  "wep-key2"                 gchar*                : Read / Write

+
NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS

+
#define NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS "psk-flags"
+

 

-Index 2 WEP key.  This WEP index is not used by most networks.  See the
-'wep-key-type' property for a description of how this key is interpreted.
 

-
Default value: NULL

 

 

 

-
The "wep-key3" property

-
  "wep-key3"                 gchar*                : Read / Write

+
NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD

+
#define NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD "leap-password"
+

 

-Index 3 WEP key.  This WEP index is not used by most networks.  See the
-'wep-key-type' property for a description of how this key is interpreted.
 

-
Default value: NULL

 

 

 

-
The "wep-tx-keyidx" property

-
  "wep-tx-keyidx"            guint                 : Read / Write / Construct

+
NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS

+
#define NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS "leap-password-flags"
+

 

-When static WEP is used (ie, key-mgmt = 'none') and a non-default WEP key
-index is used by the AP, put that WEP key index here.  Valid values are 0
-(default key) through 3.  Note that some consumer access points (like the
-Linksys WRT54G) number the keys 1 - 4.
 

+

+

+

+
Property Details

+

+
The “auth-alg” property

+
  “auth-alg”                 gchar *

+
When WEP is used (ie, key-mgmt = 'none' or 'ieee8021x') indicate the 802.11 authentication algorithm required by the AP here.  One of 'open' for Open System, 'shared' for Shared Key, or 'leap' for Cisco LEAP.  When using Cisco LEAP (ie, key-mgmt = 'ieee8021x' and auth-alg = 'leap') the 'leap-username' and 'leap-password' properties must be specified.

+
Flags: Read / Write

+
Default value: NULL

+

+

+

+
The “group” property

+
  “group”                    GSList_gchararray_ *

+
A list of group/broadcast encryption algorithms which prevents connections to Wi-Fi networks that do not utilize one of the algorithms in the list.  For maximum compatibility leave this property empty.  Each list element may be one  of 'wep40', 'wep104', 'tkip', or 'ccmp'.

+
Flags: Read / Write

+

+

+

+
The “key-mgmt” property

+
  “key-mgmt”                 gchar *

+
Key management used for the connection.  One of 'none' (WEP), 'ieee8021x' (Dynamic WEP), 'wpa-none' (WPA-PSK Ad-Hoc), 'wpa-psk' (infrastructure WPA-PSK), or 'wpa-eap' (WPA-Enterprise).  This property must be set for any WiFi connection that uses security.

+
Flags: Read / Write

+
Default value: NULL

+

+

+

+
The “leap-password” property

+
  “leap-password”            gchar *

+
The login password for legacy LEAP connections (ie, key-mgmt = 'ieee8021x' and auth-alg = 'leap').

+
Flags: Read / Write

+
Default value: NULL

+

+

+

+
The “leap-password-flags” property

+
  “leap-password-flags”      guint

+
Flags indicating how to handle the LEAP password.

+
Flags: Read / Write

+
Allowed values: <= 7

+
Default value: 0

+

+

+

+
The “leap-username” property

+
  “leap-username”            gchar *

+
The login username for legacy LEAP connections (ie, key-mgmt = 'ieee8021x' and auth-alg = 'leap').

+
Flags: Read / Write

+
Default value: NULL

+

+

+

+
The “pairwise” property

+
  “pairwise”                 GSList_gchararray_ *

+
A list of pairwise encryption algorithms which prevents connections to Wi-Fi networks that do not utilize one of the algorithms in the list. For maximum compatibility leave this property empty.  Each list element may be one of 'wep40', 'wep104', 'tkip' or 'ccmp'.

+
Flags: Read / Write

+

+

+

+
The “proto” property

+
  “proto”                    GSList_gchararray_ *

+
List of strings specifying the allowed WPA protocol versions to use.  Each element may be one 'wpa' (allow WPA) or 'rsn' (allow WPA2/RSN).  If not specified, both WPA and RSN connections are allowed.

+
Flags: Read / Write

+

+

+

+
The “psk” property

+
  “psk”                      gchar *

+
Pre-Shared-Key for WPA networks.  If the key is 64-characters long, it must contain only hexadecimal characters and is interpreted as a hexadecimal WPA key.  Otherwise, the key must be between 8 and 63 ASCII characters (as specified in the 802.11i standard) and is interpreted as a WPA passphrase, and is hashed to derive the actual WPA-PSK used when connecting to the WiFi network.

+
Flags: Read / Write

+
Default value: NULL

+

+

+

+
The “psk-flags” property

+
  “psk-flags”                guint

+
Flags indicating how to handle the WPA PSK key.

+
Flags: Read / Write

+
Allowed values: <= 7

+
Default value: 0

+

+

+

+
The “wep-key-flags” property

+
  “wep-key-flags”            guint

+
Flags indicating how to handle the WEP keys.

+
Flags: Read / Write

+
Allowed values: <= 7

+
Default value: 0

+

+

+

+
The “wep-key-type” property

+
  “wep-key-type”             guint

+
Controls the interpretation of WEP keys.  Allowed values are 1 (interpret WEP keys as hexadecimal or ASCII keys) or 2 (interpret WEP keys as WEP Passphrases).  If set to 1 and the keys are hexadecimal, they must be either 10 or 26 characters in length.  If set to 1 and the keys are ASCII keys, they must be either 5 or 13 characters in length.  If set to 2, the passphrase is hashed using  the de-facto MD5 method to derive the actual WEP key.

+
Flags: Read / Write / Construct

+
Allowed values: <= 2

+
Default value: 0

+

+

+

+
The “wep-key0” property

+
  “wep-key0”                 gchar *

+
Index 0 WEP key.  This is the WEP key used in most networks.  See the 'wep-key-type' property for a description of how this key is interpreted.

+
Flags: Read / Write

+
Default value: NULL

+

+

+

+
The “wep-key1” property

+
  “wep-key1”                 gchar *

+
Index 1 WEP key.  This WEP index is not used by most networks.  See the 'wep-key-type' property for a description of how this key is interpreted.

+
Flags: Read / Write

+
Default value: NULL

+

+

+

+
The “wep-key2” property

+
  “wep-key2”                 gchar *

+
Index 2 WEP key.  This WEP index is not used by most networks.  See the 'wep-key-type' property for a description of how this key is interpreted.

+
Flags: Read / Write

+
Default value: NULL

+

+

+

+
The “wep-key3” property

+
  “wep-key3”                 gchar *

+
Index 3 WEP key.  This WEP index is not used by most networks.  See the 'wep-key-type' property for a description of how this key is interpreted.

+
Flags: Read / Write

+
Default value: NULL

+

+

+

+
The “wep-tx-keyidx” property

+
  “wep-tx-keyidx”            guint

+
When static WEP is used (ie, key-mgmt = 'none') and a non-default WEP key index is used by the AP, put that WEP key index here.  Valid values are 0 (default key) through 3.  Note that some consumer access points (like the Linksys WRT54G) number the keys 1 - 4.

+
Flags: Read / Write / Construct

 
Allowed values: <= 3

 
Default value: 0

 

@@ -1448,6 +1786,6 @@ Linksys WRT54G) number the keys 1 - 4.
 

 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.20
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/annotation-glossary.html b/docs/libnm-util/html/annotation-glossary.html
index ae9452da..f121b07a 100644
--- a/docs/libnm-util/html/annotation-glossary.html
+++ b/docs/libnm-util/html/annotation-glossary.html
@@ -2,53 +2,46 @@
 
 
 
-Annotation Glossary
+libnm-util Reference Manual: Annotation Glossary
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
 

 

 Annotation Glossary

-
I

-
inout

-
Parameter for input and for returning results. Default is transfer full.

 
A

 
allow-none

 
NULL is ok, both for passing and for returning.

-
T

-
transfer container

-
Free data container after the code is done.

+
array

+
Parameter points to an array of items.

+
E

+
element-type

+
Generics and defining elements of containers and arrays.

+
I

+
inout

+
Parameter for input and for returning results. Default is transfer full.

 
O

 
out

 
Parameter for returning results. Default is transfer full.

@@ -56,17 +49,15 @@
 
scope call

 
The callback is valid only during the call to the method.

 
T

-
transfer none

-
Don't free data after the code is done.

-
E

-
element-type

-
Generics and defining elements of containers and arrays.

-
T

+
transfer container

+
Free data container after the code is done.

 
transfer full

 
Free data after the code is done.

+
transfer none

+
Don't free data after the code is done.

 

 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.20
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/api-index-full.html b/docs/libnm-util/html/api-index-full.html
index 9d53c16b..6eaf3b9d 100644
--- a/docs/libnm-util/html/api-index-full.html
+++ b/docs/libnm-util/html/api-index-full.html
@@ -2,38 +2,33 @@
 
 
 
-API Index
+libnm-util Reference Manual: API Index
 
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
 

 

 API Index

@@ -43,55 +38,51 @@
 
 

 

-NMConnection::secrets-cleared, object signal in NMConnection
+NMConnection::secrets-cleared, object signal in NMConnection
 

 

 

-NMConnection::secrets-updated, object signal in NMConnection
+NMConnection::secrets-updated, object signal in NMConnection
 

 

 

-NMConnection:path, object property in NMConnection
+NMConnection:path, object property in NMConnection
 

 

 

-NMConnectionClass, struct in NMConnection
+NMConnectionError, enum in NMConnection
 

 

 

-NMConnectionError, enum in NMConnection
+nm_connection_add_setting, function in NMConnection
 

 

 

-nm_connection_add_setting, function in NMConnection
+nm_connection_clear_secrets, function in NMConnection
 

 

 

-nm_connection_clear_secrets, function in NMConnection
+nm_connection_clear_secrets_with_flags, function in NMConnection
 

 

 

-nm_connection_clear_secrets_with_flags, function in NMConnection
+nm_connection_compare, function in NMConnection
 

 

 

-nm_connection_compare, function in NMConnection
+nm_connection_create_setting, function in NMConnection
 

 

 

-nm_connection_create_setting, function in NMConnection
+nm_connection_diff, function in NMConnection
 

 

 

-nm_connection_diff, function in NMConnection
+nm_connection_dump, function in NMConnection
 

 

 

-nm_connection_dump, function in NMConnection
-

-

-

-nm_connection_duplicate, function in NMConnection
+nm_connection_duplicate, function in NMConnection
 

 

 

@@ -99,147 +90,147 @@
 

 

 

-nm_connection_error_quark, function in NMConnection
+nm_connection_error_quark, function in NMConnection
 

 

 

-nm_connection_for_each_setting_value, function in NMConnection
+nm_connection_for_each_setting_value, function in NMConnection
 

 

 

-nm_connection_get_id, function in NMConnection
+nm_connection_get_id, function in NMConnection
 

 

 

-nm_connection_get_path, function in NMConnection
+nm_connection_get_path, function in NMConnection
 

 

 

-nm_connection_get_setting, function in NMConnection
+nm_connection_get_setting, function in NMConnection
 

 

 

-nm_connection_get_setting_802_1x, function in NMConnection
+nm_connection_get_setting_802_1x, function in NMConnection
 

 

 

-nm_connection_get_setting_adsl, function in NMConnection
+nm_connection_get_setting_adsl, function in NMConnection
 

 

 

-nm_connection_get_setting_bluetooth, function in NMConnection
+nm_connection_get_setting_bluetooth, function in NMConnection
 

 

 

-nm_connection_get_setting_bond, function in NMConnection
+nm_connection_get_setting_bond, function in NMConnection
 

 

 

-nm_connection_get_setting_bridge, function in NMConnection
+nm_connection_get_setting_bridge, function in NMConnection
 

 

 

-nm_connection_get_setting_bridge_port, function in NMConnection
+nm_connection_get_setting_bridge_port, function in NMConnection
 

 

 

-nm_connection_get_setting_by_name, function in NMConnection
+nm_connection_get_setting_by_name, function in NMConnection
 

 

 

-nm_connection_get_setting_cdma, function in NMConnection
+nm_connection_get_setting_cdma, function in NMConnection
 

 

 

-nm_connection_get_setting_connection, function in NMConnection
+nm_connection_get_setting_connection, function in NMConnection
 

 

 

-nm_connection_get_setting_gsm, function in NMConnection
+nm_connection_get_setting_gsm, function in NMConnection
 

 

 

-nm_connection_get_setting_infiniband, function in NMConnection
+nm_connection_get_setting_infiniband, function in NMConnection
 

 

 

-nm_connection_get_setting_ip4_config, function in NMConnection
+nm_connection_get_setting_ip4_config, function in NMConnection
 

 

 

-nm_connection_get_setting_ip6_config, function in NMConnection
+nm_connection_get_setting_ip6_config, function in NMConnection
 

 

 

-nm_connection_get_setting_olpc_mesh, function in NMConnection
+nm_connection_get_setting_olpc_mesh, function in NMConnection
 

 

 

-nm_connection_get_setting_ppp, function in NMConnection
+nm_connection_get_setting_ppp, function in NMConnection
 

 

 

-nm_connection_get_setting_pppoe, function in NMConnection
+nm_connection_get_setting_pppoe, function in NMConnection
 

 

 

-nm_connection_get_setting_serial, function in NMConnection
+nm_connection_get_setting_serial, function in NMConnection
 

 

 

-nm_connection_get_setting_vlan, function in NMConnection
+nm_connection_get_setting_vlan, function in NMConnection
 

 

 

-nm_connection_get_setting_vpn, function in NMConnection
+nm_connection_get_setting_vpn, function in NMConnection
 

 

 

-nm_connection_get_setting_wimax, function in NMConnection
+nm_connection_get_setting_wimax, function in NMConnection
 

 

 

-nm_connection_get_setting_wired, function in NMConnection
+nm_connection_get_setting_wired, function in NMConnection
 

 

 

-nm_connection_get_setting_wireless, function in NMConnection
+nm_connection_get_setting_wireless, function in NMConnection
 

 

 

-nm_connection_get_setting_wireless_security, function in NMConnection
+nm_connection_get_setting_wireless_security, function in NMConnection
 

 

 

-nm_connection_get_uuid, function in NMConnection
+nm_connection_get_uuid, function in NMConnection
 

 

 

-nm_connection_get_virtual_iface_name, function in NMConnection
+nm_connection_get_virtual_iface_name, function in NMConnection
 

 

 

-nm_connection_is_type, function in NMConnection
+nm_connection_is_type, function in NMConnection
 

 

 

-nm_connection_lookup_setting_type, function in NMConnection
+nm_connection_lookup_setting_type, function in NMConnection
 

 

 

-nm_connection_lookup_setting_type_by_quark, function in NMConnection
+nm_connection_lookup_setting_type_by_quark, function in NMConnection
 

 

 

-nm_connection_need_secrets, function in NMConnection
+nm_connection_need_secrets, function in NMConnection
 

 

 

-nm_connection_new, function in NMConnection
+nm_connection_new, function in NMConnection
 

 

 

-nm_connection_new_from_hash, function in NMConnection
+nm_connection_new_from_hash, function in NMConnection
 

 

 

@@ -247,236 +238,220 @@
 

 

 

-nm_connection_remove_setting, function in NMConnection
+nm_connection_remove_setting, function in NMConnection
 

 

 

-nm_connection_replace_settings, function in NMConnection
+nm_connection_replace_settings, function in NMConnection
 

 

 

-nm_connection_set_path, function in NMConnection
+nm_connection_set_path, function in NMConnection
 

 

 

-nm_connection_to_hash, function in NMConnection
+nm_connection_to_hash, function in NMConnection
 

 

 

-nm_connection_update_secrets, function in NMConnection
+nm_connection_update_secrets, function in NMConnection
 

 

 

-nm_connection_verify, function in NMConnection
+nm_connection_verify, function in NMConnection
 

 

 
I

 

-NMIP4Address, typedef in NMSettingIP4Config
-

-

-

-NMIP4Route, typedef in NMSettingIP4Config
+nm_ip4_address_compare, function in NMSettingIP4Config
 

 

 

-nm_ip4_address_compare, function in NMSettingIP4Config
+nm_ip4_address_dup, function in NMSettingIP4Config
 

 

 

-nm_ip4_address_dup, function in NMSettingIP4Config
+nm_ip4_address_get_address, function in NMSettingIP4Config
 

 

 

-nm_ip4_address_get_address, function in NMSettingIP4Config
+nm_ip4_address_get_gateway, function in NMSettingIP4Config
 

 

 

-nm_ip4_address_get_gateway, function in NMSettingIP4Config
+nm_ip4_address_get_prefix, function in NMSettingIP4Config
 

 

 

-nm_ip4_address_get_prefix, function in NMSettingIP4Config
+nm_ip4_address_new, function in NMSettingIP4Config
 

 

 

-nm_ip4_address_new, function in NMSettingIP4Config
+nm_ip4_address_ref, function in NMSettingIP4Config
 

 

 

-nm_ip4_address_ref, function in NMSettingIP4Config
+nm_ip4_address_set_address, function in NMSettingIP4Config
 

 

 

-nm_ip4_address_set_address, function in NMSettingIP4Config
+nm_ip4_address_set_gateway, function in NMSettingIP4Config
 

 

 

-nm_ip4_address_set_gateway, function in NMSettingIP4Config
+nm_ip4_address_set_prefix, function in NMSettingIP4Config
 

 

 

-nm_ip4_address_set_prefix, function in NMSettingIP4Config
+nm_ip4_address_unref, function in NMSettingIP4Config
 

 

 

-nm_ip4_address_unref, function in NMSettingIP4Config
+nm_ip4_route_compare, function in NMSettingIP4Config
 

 

 

-nm_ip4_route_compare, function in NMSettingIP4Config
+nm_ip4_route_dup, function in NMSettingIP4Config
 

 

 

-nm_ip4_route_dup, function in NMSettingIP4Config
+nm_ip4_route_get_dest, function in NMSettingIP4Config
 

 

 

-nm_ip4_route_get_dest, function in NMSettingIP4Config
+nm_ip4_route_get_metric, function in NMSettingIP4Config
 

 

 

-nm_ip4_route_get_metric, function in NMSettingIP4Config
+nm_ip4_route_get_next_hop, function in NMSettingIP4Config
 

 

 

-nm_ip4_route_get_next_hop, function in NMSettingIP4Config
+nm_ip4_route_get_prefix, function in NMSettingIP4Config
 

 

 

-nm_ip4_route_get_prefix, function in NMSettingIP4Config
+nm_ip4_route_new, function in NMSettingIP4Config
 

 

 

-nm_ip4_route_new, function in NMSettingIP4Config
+nm_ip4_route_ref, function in NMSettingIP4Config
 

 

 

-nm_ip4_route_ref, function in NMSettingIP4Config
+nm_ip4_route_set_dest, function in NMSettingIP4Config
 

 

 

-nm_ip4_route_set_dest, function in NMSettingIP4Config
+nm_ip4_route_set_metric, function in NMSettingIP4Config
 

 

 

-nm_ip4_route_set_metric, function in NMSettingIP4Config
+nm_ip4_route_set_next_hop, function in NMSettingIP4Config
 

 

 

-nm_ip4_route_set_next_hop, function in NMSettingIP4Config
+nm_ip4_route_set_prefix, function in NMSettingIP4Config
 

 

 

-nm_ip4_route_set_prefix, function in NMSettingIP4Config
+nm_ip4_route_unref, function in NMSettingIP4Config
 

 

 

-nm_ip4_route_unref, function in NMSettingIP4Config
+nm_ip6_address_compare, function in NMSettingIP6Config
 

 

 

-NMIP6Address, typedef in NMSettingIP6Config
+nm_ip6_address_dup, function in NMSettingIP6Config
 

 

 

-NMIP6Route, typedef in NMSettingIP6Config
+nm_ip6_address_get_address, function in NMSettingIP6Config
 

 

 

-nm_ip6_address_compare, function in NMSettingIP6Config
+nm_ip6_address_get_gateway, function in NMSettingIP6Config
 

 

 

-nm_ip6_address_dup, function in NMSettingIP6Config
+nm_ip6_address_get_prefix, function in NMSettingIP6Config
 

 

 

-nm_ip6_address_get_address, function in NMSettingIP6Config
+nm_ip6_address_new, function in NMSettingIP6Config
 

 

 

-nm_ip6_address_get_gateway, function in NMSettingIP6Config
+nm_ip6_address_ref, function in NMSettingIP6Config
 

 

 

-nm_ip6_address_get_prefix, function in NMSettingIP6Config
+nm_ip6_address_set_address, function in NMSettingIP6Config
 

 

 

-nm_ip6_address_new, function in NMSettingIP6Config
+nm_ip6_address_set_gateway, function in NMSettingIP6Config
 

 

 

-nm_ip6_address_ref, function in NMSettingIP6Config
+nm_ip6_address_set_prefix, function in NMSettingIP6Config
 

 

 

-nm_ip6_address_set_address, function in NMSettingIP6Config
+nm_ip6_address_unref, function in NMSettingIP6Config
 

 

 

-nm_ip6_address_set_gateway, function in NMSettingIP6Config
+nm_ip6_route_compare, function in NMSettingIP6Config
 

 

 

-nm_ip6_address_set_prefix, function in NMSettingIP6Config
+nm_ip6_route_dup, function in NMSettingIP6Config
 

 

 

-nm_ip6_address_unref, function in NMSettingIP6Config
+nm_ip6_route_get_dest, function in NMSettingIP6Config
 

 

 

-nm_ip6_route_compare, function in NMSettingIP6Config
+nm_ip6_route_get_metric, function in NMSettingIP6Config
 

 

 

-nm_ip6_route_dup, function in NMSettingIP6Config
+nm_ip6_route_get_next_hop, function in NMSettingIP6Config
 

 

 

-nm_ip6_route_get_dest, function in NMSettingIP6Config
+nm_ip6_route_get_prefix, function in NMSettingIP6Config
 

 

 

-nm_ip6_route_get_metric, function in NMSettingIP6Config
+nm_ip6_route_new, function in NMSettingIP6Config
 

 

 

-nm_ip6_route_get_next_hop, function in NMSettingIP6Config
+nm_ip6_route_ref, function in NMSettingIP6Config
 

 

 

-nm_ip6_route_get_prefix, function in NMSettingIP6Config
+nm_ip6_route_set_dest, function in NMSettingIP6Config
 

 

 

-nm_ip6_route_new, function in NMSettingIP6Config
+nm_ip6_route_set_metric, function in NMSettingIP6Config
 

 

 

-nm_ip6_route_ref, function in NMSettingIP6Config
+nm_ip6_route_set_next_hop, function in NMSettingIP6Config
 

 

 

-nm_ip6_route_set_dest, function in NMSettingIP6Config
+nm_ip6_route_set_prefix, function in NMSettingIP6Config
 

 

 

-nm_ip6_route_set_metric, function in NMSettingIP6Config
-

-

-

-nm_ip6_route_set_next_hop, function in NMSettingIP6Config
-

-

-

-nm_ip6_route_set_prefix, function in NMSettingIP6Config
-

-

-

-nm_ip6_route_unref, function in NMSettingIP6Config
+nm_ip6_route_unref, function in NMSettingIP6Config
 

 

 
S

@@ -485,339 +460,279 @@
 
 

 

-NMSetting8021x, struct in NMSetting8021x
-

-

-

-NMSetting8021x:altsubject-matches, object property in NMSetting8021x
-

-

-

-NMSetting8021x:anonymous-identity, object property in NMSetting8021x
-

-

-

-NMSetting8021x:ca-cert, object property in NMSetting8021x
-

-

-

-NMSetting8021x:ca-path, object property in NMSetting8021x
-

-

-

-NMSetting8021x:client-cert, object property in NMSetting8021x
-

-

-

-NMSetting8021x:eap, object property in NMSetting8021x
-

-

-

-NMSetting8021x:identity, object property in NMSetting8021x
-

-

-

-NMSetting8021x:pac-file, object property in NMSetting8021x
-

-

-

-NMSetting8021x:password, object property in NMSetting8021x
+NMSetting8021x:altsubject-matches, object property in NMSetting8021x
 

 

 

-NMSetting8021x:password-flags, object property in NMSetting8021x
+NMSetting8021x:anonymous-identity, object property in NMSetting8021x
 

 

 

-NMSetting8021x:password-raw, object property in NMSetting8021x
+NMSetting8021x:ca-cert, object property in NMSetting8021x
 

 

 

-NMSetting8021x:password-raw-flags, object property in NMSetting8021x
+NMSetting8021x:ca-path, object property in NMSetting8021x
 

 

 

-NMSetting8021x:phase1-fast-provisioning, object property in NMSetting8021x
+NMSetting8021x:client-cert, object property in NMSetting8021x
 

 

 

-NMSetting8021x:phase1-peaplabel, object property in NMSetting8021x
+NMSetting8021x:eap, object property in NMSetting8021x
 

 

 

-NMSetting8021x:phase1-peapver, object property in NMSetting8021x
+NMSetting8021x:identity, object property in NMSetting8021x
 

 

 

-NMSetting8021x:phase2-altsubject-matches, object property in NMSetting8021x
+NMSetting8021x:pac-file, object property in NMSetting8021x
 

 

 

-NMSetting8021x:phase2-auth, object property in NMSetting8021x
+NMSetting8021x:password, object property in NMSetting8021x
 

 

 

-NMSetting8021x:phase2-autheap, object property in NMSetting8021x
+NMSetting8021x:password-flags, object property in NMSetting8021x
 

 

 

-NMSetting8021x:phase2-ca-cert, object property in NMSetting8021x
+NMSetting8021x:password-raw, object property in NMSetting8021x
 

 

 

-NMSetting8021x:phase2-ca-path, object property in NMSetting8021x
+NMSetting8021x:password-raw-flags, object property in NMSetting8021x
 

 

 

-NMSetting8021x:phase2-client-cert, object property in NMSetting8021x
+NMSetting8021x:phase1-fast-provisioning, object property in NMSetting8021x
 

 

 

-NMSetting8021x:phase2-private-key, object property in NMSetting8021x
+NMSetting8021x:phase1-peaplabel, object property in NMSetting8021x
 

 

 

-NMSetting8021x:phase2-private-key-password, object property in NMSetting8021x
+NMSetting8021x:phase1-peapver, object property in NMSetting8021x
 

 

 

-NMSetting8021x:phase2-private-key-password-flags, object property in NMSetting8021x
+NMSetting8021x:phase2-altsubject-matches, object property in NMSetting8021x
 

 

 

-NMSetting8021x:phase2-subject-match, object property in NMSetting8021x
+NMSetting8021x:phase2-auth, object property in NMSetting8021x
 

 

 

-NMSetting8021x:pin, object property in NMSetting8021x
+NMSetting8021x:phase2-autheap, object property in NMSetting8021x
 

 

 

-NMSetting8021x:pin-flags, object property in NMSetting8021x
+NMSetting8021x:phase2-ca-cert, object property in NMSetting8021x
 

 

 

-NMSetting8021x:private-key, object property in NMSetting8021x
+NMSetting8021x:phase2-ca-path, object property in NMSetting8021x
 

 

 

-NMSetting8021x:private-key-password, object property in NMSetting8021x
+NMSetting8021x:phase2-client-cert, object property in NMSetting8021x
 

 

 

-NMSetting8021x:private-key-password-flags, object property in NMSetting8021x
+NMSetting8021x:phase2-private-key, object property in NMSetting8021x
 

 

 

-NMSetting8021x:subject-match, object property in NMSetting8021x
+NMSetting8021x:phase2-private-key-password, object property in NMSetting8021x
 

 

 

-NMSetting8021x:system-ca-certs, object property in NMSetting8021x
+NMSetting8021x:phase2-private-key-password-flags, object property in NMSetting8021x
 

 

 

-NMSetting8021xCKFormat, enum in NMSetting8021x
+NMSetting8021x:phase2-subject-match, object property in NMSetting8021x
 

 

 

-NMSetting8021xCKScheme, enum in NMSetting8021x
+NMSetting8021x:pin, object property in NMSetting8021x
 

 

 

-NMSetting8021xClass, struct in NMSetting8021x
+NMSetting8021x:pin-flags, object property in NMSetting8021x
 

 

 

-NMSetting8021xError, enum in NMSetting8021x
+NMSetting8021x:private-key, object property in NMSetting8021x
 

 

 

-NMSetting:name, object property in NMSetting
+NMSetting8021x:private-key-password, object property in NMSetting8021x
 

 

 

-NMSettingAdsl, struct in NMSettingAdsl
+NMSetting8021x:private-key-password-flags, object property in NMSetting8021x
 

 

 

-NMSettingAdsl:encapsulation, object property in NMSettingAdsl
+NMSetting8021x:subject-match, object property in NMSetting8021x
 

 

 

-NMSettingAdsl:password, object property in NMSettingAdsl
+NMSetting8021x:system-ca-certs, object property in NMSetting8021x
 

 

 

-NMSettingAdsl:password-flags, object property in NMSettingAdsl
+NMSetting8021xCKFormat, enum in NMSetting8021x
 

 

 

-NMSettingAdsl:protocol, object property in NMSettingAdsl
+NMSetting8021xCKScheme, enum in NMSetting8021x
 

 

 

-NMSettingAdsl:username, object property in NMSettingAdsl
+NMSetting8021xError, enum in NMSetting8021x
 

 

 

-NMSettingAdsl:vci, object property in NMSettingAdsl
+NMSetting:name, object property in NMSetting
 

 

 

-NMSettingAdsl:vpi, object property in NMSettingAdsl
+NMSettingAdsl:encapsulation, object property in NMSettingAdsl
 

 

 

-NMSettingAdslClass, struct in NMSettingAdsl
+NMSettingAdsl:password, object property in NMSettingAdsl
 

 

 

-NMSettingAdslError, enum in NMSettingAdsl
+NMSettingAdsl:password-flags, object property in NMSettingAdsl
 

 

 

-NMSettingBluetooth, struct in NMSettingBluetooth
+NMSettingAdsl:protocol, object property in NMSettingAdsl
 

 

 

-NMSettingBluetooth:bdaddr, object property in NMSettingBluetooth
+NMSettingAdsl:username, object property in NMSettingAdsl
 

 

 

-NMSettingBluetooth:type, object property in NMSettingBluetooth
+NMSettingAdsl:vci, object property in NMSettingAdsl
 

 

 

-NMSettingBluetoothClass, struct in NMSettingBluetooth
+NMSettingAdsl:vpi, object property in NMSettingAdsl
 

 

 

-NMSettingBluetoothError, enum in NMSettingBluetooth
+NMSettingAdslError, enum in NMSettingAdsl
 

 

 

-NMSettingBond, struct in NMSettingBond
+NMSettingBluetooth:bdaddr, object property in NMSettingBluetooth
 

 

 

-NMSettingBond:interface-name, object property in NMSettingBond
+NMSettingBluetooth:type, object property in NMSettingBluetooth
 

 

 

-NMSettingBond:options, object property in NMSettingBond
+NMSettingBluetoothError, enum in NMSettingBluetooth
 

 

 

-NMSettingBondClass, struct in NMSettingBond
+NMSettingBond:interface-name, object property in NMSettingBond
 

 

 

-NMSettingBondError, enum in NMSettingBond
+NMSettingBond:options, object property in NMSettingBond
 

 

 

-NMSettingBridge, struct in NMSettingBridge
+NMSettingBondError, enum in NMSettingBond
 

 

 

-NMSettingBridge:ageing-time, object property in NMSettingBridge
+NMSettingBridge:ageing-time, object property in NMSettingBridge
 

 

 

-NMSettingBridge:forward-delay, object property in NMSettingBridge
+NMSettingBridge:forward-delay, object property in NMSettingBridge
 

 

 

-NMSettingBridge:hello-time, object property in NMSettingBridge
+NMSettingBridge:hello-time, object property in NMSettingBridge
 

 

 

-NMSettingBridge:interface-name, object property in NMSettingBridge
+NMSettingBridge:interface-name, object property in NMSettingBridge
 

 

 

-NMSettingBridge:max-age, object property in NMSettingBridge
+NMSettingBridge:max-age, object property in NMSettingBridge
 

 

 

-NMSettingBridge:priority, object property in NMSettingBridge
+NMSettingBridge:priority, object property in NMSettingBridge
 

 

 

-NMSettingBridge:stp, object property in NMSettingBridge
+NMSettingBridge:stp, object property in NMSettingBridge
 

 

 

-NMSettingBridgeClass, struct in NMSettingBridge
+NMSettingBridgeError, enum in NMSettingBridge
 

 

 

-NMSettingBridgeError, enum in NMSettingBridge
+NMSettingBridgePort:hairpin-mode, object property in NMSettingBridgePort
 

 

 

-NMSettingBridgePort, struct in NMSettingBridgePort
+NMSettingBridgePort:path-cost, object property in NMSettingBridgePort
 

 

 

-NMSettingBridgePort:hairpin-mode, object property in NMSettingBridgePort
+NMSettingBridgePort:priority, object property in NMSettingBridgePort
 

 

 

-NMSettingBridgePort:path-cost, object property in NMSettingBridgePort
+NMSettingBridgePortError, enum in NMSettingBridgePort
 

 

 

-NMSettingBridgePort:priority, object property in NMSettingBridgePort
+NMSettingCdma:number, object property in NMSettingCdma
 

 

 

-NMSettingBridgePortClass, struct in NMSettingBridgePort
+NMSettingCdma:password, object property in NMSettingCdma
 

 

 

-NMSettingBridgePortError, enum in NMSettingBridgePort
+NMSettingCdma:password-flags, object property in NMSettingCdma
 

 

 

-NMSettingCdma, struct in NMSettingCdma
+NMSettingCdma:username, object property in NMSettingCdma
 

 

 

-NMSettingCdma:number, object property in NMSettingCdma
+NMSettingCdmaError, enum in NMSettingCdma
 

 

 

-NMSettingCdma:password, object property in NMSettingCdma
+NMSettingClearSecretsWithFlagsFn, user_function in NMSetting
 

 

 

-NMSettingCdma:password-flags, object property in NMSettingCdma
-

-

-

-NMSettingCdma:username, object property in NMSettingCdma
-

-

-

-NMSettingCdmaClass, struct in NMSettingCdma
-

-

-

-NMSettingCdmaError, enum in NMSettingCdma
-

-

-

-NMSettingClass, struct in NMSetting
-

-

-

-NMSettingClearSecretsWithFlagsFn, user_function in NMSetting
-

-

-

-NMSettingCompareFlags, enum in NMSetting
+NMSettingCompareFlags, enum in NMSetting
 

 

 

@@ -825,751 +740,635 @@
 

 

 

-NMSettingConnection:autoconnect, object property in NMSettingConnection
-

-

-

-NMSettingConnection:id, object property in NMSettingConnection
-

-

-

-NMSettingConnection:master, object property in NMSettingConnection
-

-

-

-NMSettingConnection:permissions, object property in NMSettingConnection
-

-

-

-NMSettingConnection:read-only, object property in NMSettingConnection
-

-

-

-NMSettingConnection:secondaries, object property in NMSettingConnection
-

-

-

-NMSettingConnection:slave-type, object property in NMSettingConnection
-

-

-

-NMSettingConnection:timestamp, object property in NMSettingConnection
-

-

-

-NMSettingConnection:type, object property in NMSettingConnection
-

-

-

-NMSettingConnection:uuid, object property in NMSettingConnection
-

-

-

-NMSettingConnection:zone, object property in NMSettingConnection
-

-

-

-NMSettingConnectionClass, struct in NMSettingConnection
-

-

-

-NMSettingConnectionError, enum in NMSettingConnection
-

-

-

-NMSettingDiffResult, enum in NMSetting
-

-

-

-NMSettingError, enum in NMSetting
-

-

-

-NMSettingGsm, struct in NMSettingGsm
-

-

-

-NMSettingGsm:allowed-bands, object property in NMSettingGsm
-

-

-

-NMSettingGsm:apn, object property in NMSettingGsm
-

-

-

-NMSettingGsm:home-only, object property in NMSettingGsm
-

-

-

-NMSettingGsm:network-id, object property in NMSettingGsm
-

-

-

-NMSettingGsm:network-type, object property in NMSettingGsm
-

-

-

-NMSettingGsm:number, object property in NMSettingGsm
-

-

-

-NMSettingGsm:password, object property in NMSettingGsm
-

-

-

-NMSettingGsm:password-flags, object property in NMSettingGsm
-

-

-

-NMSettingGsm:pin, object property in NMSettingGsm
-

-

-

-NMSettingGsm:pin-flags, object property in NMSettingGsm
-

-

-

-NMSettingGsm:username, object property in NMSettingGsm
-

-

-

-NMSettingGsmClass, struct in NMSettingGsm
-

-

-

-NMSettingGsmError, enum in NMSettingGsm
-

-

-

-NMSettingGsmNetworkBand, enum in NMSettingGsm
+NMSettingConnection:autoconnect, object property in NMSettingConnection
 

 

 

-NMSettingGsmNetworkType, enum in NMSettingGsm
+NMSettingConnection:id, object property in NMSettingConnection
 

 

 

-NMSettingHashFlags, enum in NMSetting
+NMSettingConnection:master, object property in NMSettingConnection
 

 

 

-NMSettingInfiniband, struct in NMSettingInfiniband
+NMSettingConnection:permissions, object property in NMSettingConnection
 

 

 

-NMSettingInfiniband:mac-address, object property in NMSettingInfiniband
+NMSettingConnection:read-only, object property in NMSettingConnection
 

 

 

-NMSettingInfiniband:mtu, object property in NMSettingInfiniband
+NMSettingConnection:secondaries, object property in NMSettingConnection
 

 

 

-NMSettingInfiniband:transport-mode, object property in NMSettingInfiniband
+NMSettingConnection:slave-type, object property in NMSettingConnection
 

 

 

-NMSettingInfinibandClass, struct in NMSettingInfiniband
+NMSettingConnection:timestamp, object property in NMSettingConnection
 

 

 

-NMSettingInfinibandError, enum in NMSettingInfiniband
+NMSettingConnection:type, object property in NMSettingConnection
 

 

 

-NMSettingIP4Config, struct in NMSettingIP4Config
+NMSettingConnection:uuid, object property in NMSettingConnection
 

 

 

-NMSettingIP4Config:addresses, object property in NMSettingIP4Config
+NMSettingConnection:zone, object property in NMSettingConnection
 

 

 

-NMSettingIP4Config:dhcp-client-id, object property in NMSettingIP4Config
+NMSettingConnectionError, enum in NMSettingConnection
 

 

 

-NMSettingIP4Config:dhcp-hostname, object property in NMSettingIP4Config
+NMSettingDiffResult, enum in NMSetting
 

 

 

-NMSettingIP4Config:dhcp-send-hostname, object property in NMSettingIP4Config
+NMSettingError, enum in NMSetting
 

 

 

-NMSettingIP4Config:dns, object property in NMSettingIP4Config
+NMSettingGsm:allowed-bands, object property in NMSettingGsm
 

 

 

-NMSettingIP4Config:dns-search, object property in NMSettingIP4Config
+NMSettingGsm:apn, object property in NMSettingGsm
 

 

 

-NMSettingIP4Config:ignore-auto-dns, object property in NMSettingIP4Config
+NMSettingGsm:home-only, object property in NMSettingGsm
 

 

 

-NMSettingIP4Config:ignore-auto-routes, object property in NMSettingIP4Config
+NMSettingGsm:network-id, object property in NMSettingGsm
 

 

 

-NMSettingIP4Config:may-fail, object property in NMSettingIP4Config
+NMSettingGsm:network-type, object property in NMSettingGsm
 

 

 

-NMSettingIP4Config:method, object property in NMSettingIP4Config
+NMSettingGsm:number, object property in NMSettingGsm
 

 

 

-NMSettingIP4Config:never-default, object property in NMSettingIP4Config
+NMSettingGsm:password, object property in NMSettingGsm
 

 

 

-NMSettingIP4Config:routes, object property in NMSettingIP4Config
+NMSettingGsm:password-flags, object property in NMSettingGsm
 

 

 

-NMSettingIP4ConfigClass, struct in NMSettingIP4Config
+NMSettingGsm:pin, object property in NMSettingGsm
 

 

 

-NMSettingIP4ConfigError, enum in NMSettingIP4Config
+NMSettingGsm:pin-flags, object property in NMSettingGsm
 

 

 

-NMSettingIP6Config, struct in NMSettingIP6Config
+NMSettingGsm:username, object property in NMSettingGsm
 

 

 

-NMSettingIP6Config:addresses, object property in NMSettingIP6Config
+NMSettingGsmError, enum in NMSettingGsm
 

 

 

-NMSettingIP6Config:dhcp-hostname, object property in NMSettingIP6Config
+NMSettingGsmNetworkBand, enum in NMSettingGsm
 

 

 

-NMSettingIP6Config:dns, object property in NMSettingIP6Config
+NMSettingGsmNetworkType, enum in NMSettingGsm
 

 

 

-NMSettingIP6Config:dns-search, object property in NMSettingIP6Config
+NMSettingHashFlags, enum in NMSetting
 

 

 

-NMSettingIP6Config:ignore-auto-dns, object property in NMSettingIP6Config
+NMSettingInfiniband:mac-address, object property in NMSettingInfiniband
 

 

 

-NMSettingIP6Config:ignore-auto-routes, object property in NMSettingIP6Config
+NMSettingInfiniband:mtu, object property in NMSettingInfiniband
 

 

 

-NMSettingIP6Config:ip6-privacy, object property in NMSettingIP6Config
+NMSettingInfiniband:transport-mode, object property in NMSettingInfiniband
 

 

 

-NMSettingIP6Config:may-fail, object property in NMSettingIP6Config
+NMSettingInfinibandError, enum in NMSettingInfiniband
 

 

 

-NMSettingIP6Config:method, object property in NMSettingIP6Config
+NMSettingIP4Config:addresses, object property in NMSettingIP4Config
 

 

 

-NMSettingIP6Config:never-default, object property in NMSettingIP6Config
+NMSettingIP4Config:dhcp-client-id, object property in NMSettingIP4Config
 

 

 

-NMSettingIP6Config:routes, object property in NMSettingIP6Config
+NMSettingIP4Config:dhcp-hostname, object property in NMSettingIP4Config
 

 

 

-NMSettingIP6ConfigClass, struct in NMSettingIP6Config
+NMSettingIP4Config:dhcp-send-hostname, object property in NMSettingIP4Config
 

 

 

-NMSettingIP6ConfigError, enum in NMSettingIP6Config
+NMSettingIP4Config:dns, object property in NMSettingIP4Config
 

 

 

-NMSettingIP6ConfigPrivacy, enum in NMSettingIP6Config
+NMSettingIP4Config:dns-search, object property in NMSettingIP4Config
 

 

 

-NMSettingOlpcMesh, struct in NMSettingOlpcMesh
+NMSettingIP4Config:ignore-auto-dns, object property in NMSettingIP4Config
 

 

 

-NMSettingOlpcMesh:channel, object property in NMSettingOlpcMesh
+NMSettingIP4Config:ignore-auto-routes, object property in NMSettingIP4Config
 

 

 

-NMSettingOlpcMesh:dhcp-anycast-address, object property in NMSettingOlpcMesh
+NMSettingIP4Config:may-fail, object property in NMSettingIP4Config
 

 

 

-NMSettingOlpcMesh:ssid, object property in NMSettingOlpcMesh
+NMSettingIP4Config:method, object property in NMSettingIP4Config
 

 

 

-NMSettingOlpcMeshClass, struct in NMSettingOlpcMesh
+NMSettingIP4Config:never-default, object property in NMSettingIP4Config
 

 

 

-NMSettingOlpcMeshError, enum in NMSettingOlpcMesh
+NMSettingIP4Config:routes, object property in NMSettingIP4Config
 

 

 

-NMSettingPPP, struct in NMSettingPPP
+NMSettingIP4ConfigError, enum in NMSettingIP4Config
 

 

 

-NMSettingPPP:baud, object property in NMSettingPPP
+NMSettingIP6Config:addresses, object property in NMSettingIP6Config
 

 

 

-NMSettingPPP:crtscts, object property in NMSettingPPP
+NMSettingIP6Config:dhcp-hostname, object property in NMSettingIP6Config
 

 

 

-NMSettingPPP:lcp-echo-failure, object property in NMSettingPPP
+NMSettingIP6Config:dns, object property in NMSettingIP6Config
 

 

 

-NMSettingPPP:lcp-echo-interval, object property in NMSettingPPP
+NMSettingIP6Config:dns-search, object property in NMSettingIP6Config
 

 

 

-NMSettingPPP:mppe-stateful, object property in NMSettingPPP
+NMSettingIP6Config:ignore-auto-dns, object property in NMSettingIP6Config
 

 

 

-NMSettingPPP:mru, object property in NMSettingPPP
+NMSettingIP6Config:ignore-auto-routes, object property in NMSettingIP6Config
 

 

 

-NMSettingPPP:mtu, object property in NMSettingPPP
+NMSettingIP6Config:ip6-privacy, object property in NMSettingIP6Config
 

 

 

-NMSettingPPP:no-vj-comp, object property in NMSettingPPP
+NMSettingIP6Config:may-fail, object property in NMSettingIP6Config
 

 

 

-NMSettingPPP:noauth, object property in NMSettingPPP
+NMSettingIP6Config:method, object property in NMSettingIP6Config
 

 

 

-NMSettingPPP:nobsdcomp, object property in NMSettingPPP
+NMSettingIP6Config:never-default, object property in NMSettingIP6Config
 

 

 

-NMSettingPPP:nodeflate, object property in NMSettingPPP
+NMSettingIP6Config:routes, object property in NMSettingIP6Config
 

 

 

-NMSettingPPP:refuse-chap, object property in NMSettingPPP
+NMSettingIP6ConfigError, enum in NMSettingIP6Config
 

 

 

-NMSettingPPP:refuse-eap, object property in NMSettingPPP
+NMSettingIP6ConfigPrivacy, enum in NMSettingIP6Config
 

 

 

-NMSettingPPP:refuse-mschap, object property in NMSettingPPP
+NMSettingOlpcMesh:channel, object property in NMSettingOlpcMesh
 

 

 

-NMSettingPPP:refuse-mschapv2, object property in NMSettingPPP
+NMSettingOlpcMesh:dhcp-anycast-address, object property in NMSettingOlpcMesh
 

 

 

-NMSettingPPP:refuse-pap, object property in NMSettingPPP
+NMSettingOlpcMesh:ssid, object property in NMSettingOlpcMesh
 

 

 

-NMSettingPPP:require-mppe, object property in NMSettingPPP
+NMSettingOlpcMeshError, enum in NMSettingOlpcMesh
 

 

 

-NMSettingPPP:require-mppe-128, object property in NMSettingPPP
+NMSettingPPP:baud, object property in NMSettingPPP
 

 

 

-NMSettingPPPClass, struct in NMSettingPPP
+NMSettingPPP:crtscts, object property in NMSettingPPP
 

 

 

-NMSettingPPPError, enum in NMSettingPPP
+NMSettingPPP:lcp-echo-failure, object property in NMSettingPPP
 

 

 

-NMSettingPPPOE, struct in NMSettingPPPOE
+NMSettingPPP:lcp-echo-interval, object property in NMSettingPPP
 

 

 

-NMSettingPPPOE:password, object property in NMSettingPPPOE
+NMSettingPPP:mppe-stateful, object property in NMSettingPPP
 

 

 

-NMSettingPPPOE:password-flags, object property in NMSettingPPPOE
+NMSettingPPP:mru, object property in NMSettingPPP
 

 

 

-NMSettingPPPOE:service, object property in NMSettingPPPOE
+NMSettingPPP:mtu, object property in NMSettingPPP
 

 

 

-NMSettingPPPOE:username, object property in NMSettingPPPOE
+NMSettingPPP:no-vj-comp, object property in NMSettingPPP
 

 

 

-NMSettingPPPOEClass, struct in NMSettingPPPOE
+NMSettingPPP:noauth, object property in NMSettingPPP
 

 

 

-NMSettingPPPOEError, enum in NMSettingPPPOE
+NMSettingPPP:nobsdcomp, object property in NMSettingPPP
 

 

 

-NMSettingSecretFlags, enum in NMSetting
+NMSettingPPP:nodeflate, object property in NMSettingPPP
 

 

 

-NMSettingSerial, struct in NMSettingSerial
+NMSettingPPP:refuse-chap, object property in NMSettingPPP
 

 

 

-NMSettingSerial:baud, object property in NMSettingSerial
+NMSettingPPP:refuse-eap, object property in NMSettingPPP
 

 

 

-NMSettingSerial:bits, object property in NMSettingSerial
+NMSettingPPP:refuse-mschap, object property in NMSettingPPP
 

 

 

-NMSettingSerial:parity, object property in NMSettingSerial
+NMSettingPPP:refuse-mschapv2, object property in NMSettingPPP
 

 

 

-NMSettingSerial:send-delay, object property in NMSettingSerial
+NMSettingPPP:refuse-pap, object property in NMSettingPPP
 

 

 

-NMSettingSerial:stopbits, object property in NMSettingSerial
+NMSettingPPP:require-mppe, object property in NMSettingPPP
 

 

 

-NMSettingSerialClass, struct in NMSettingSerial
+NMSettingPPP:require-mppe-128, object property in NMSettingPPP
 

 

 

-NMSettingSerialError, enum in NMSettingSerial
+NMSettingPPPError, enum in NMSettingPPP
 

 

 

-NMSettingValueIterFn, user_function in NMSetting
+NMSettingPPPOE:password, object property in NMSettingPPPOE
 

 

 

-NMSettingVlan, struct in NMSettingVlan
+NMSettingPPPOE:password-flags, object property in NMSettingPPPOE
 

 

 

-NMSettingVlan:egress-priority-map, object property in NMSettingVlan
+NMSettingPPPOE:service, object property in NMSettingPPPOE
 

 

 

-NMSettingVlan:flags, object property in NMSettingVlan
+NMSettingPPPOE:username, object property in NMSettingPPPOE
 

 

 

-NMSettingVlan:id, object property in NMSettingVlan
+NMSettingPPPOEError, enum in NMSettingPPPOE
 

 

 

-NMSettingVlan:ingress-priority-map, object property in NMSettingVlan
+NMSettingSecretFlags, enum in NMSetting
 

 

 

-NMSettingVlan:interface-name, object property in NMSettingVlan
+NMSettingSerial:baud, object property in NMSettingSerial
 

 

 

-NMSettingVlan:parent, object property in NMSettingVlan
+NMSettingSerial:bits, object property in NMSettingSerial
 

 

 

-NMSettingVlanClass, struct in NMSettingVlan
+NMSettingSerial:parity, object property in NMSettingSerial
 

 

 

-NMSettingVlanError, enum in NMSettingVlan
+NMSettingSerial:send-delay, object property in NMSettingSerial
 

 

 

-NMSettingVPN, struct in NMSettingVPN
+NMSettingSerial:stopbits, object property in NMSettingSerial
 

 

 

-NMSettingVPN:data, object property in NMSettingVPN
+NMSettingSerialError, enum in NMSettingSerial
 

 

 

-NMSettingVPN:secrets, object property in NMSettingVPN
+NMSettingValueIterFn, user_function in NMSetting
 

 

 

-NMSettingVPN:service-type, object property in NMSettingVPN
+NMSettingVlan:egress-priority-map, object property in NMSettingVlan
 

 

 

-NMSettingVPN:user-name, object property in NMSettingVPN
+NMSettingVlan:flags, object property in NMSettingVlan
 

 

 

-NMSettingVPNClass, struct in NMSettingVPN
+NMSettingVlan:id, object property in NMSettingVlan
 

 

 

-NMSettingVpnError, enum in NMSettingVPN
+NMSettingVlan:ingress-priority-map, object property in NMSettingVlan
 

 

 

-NMSettingWimax, struct in NMSettingWimax
+NMSettingVlan:interface-name, object property in NMSettingVlan
 

 

 

-NMSettingWimax:mac-address, object property in NMSettingWimax
+NMSettingVlan:parent, object property in NMSettingVlan
 

 

 

-NMSettingWimax:network-name, object property in NMSettingWimax
+NMSettingVlanError, enum in NMSettingVlan
 

 

 

-NMSettingWimaxClass, struct in NMSettingWimax
+NMSettingVPN:data, object property in NMSettingVPN
 

 

 

-NMSettingWimaxError, enum in NMSettingWimax
+NMSettingVPN:secrets, object property in NMSettingVPN
 

 

 

-NMSettingWired, struct in NMSettingWired
+NMSettingVPN:service-type, object property in NMSettingVPN
 

 

 

-NMSettingWired:auto-negotiate, object property in NMSettingWired
+NMSettingVPN:user-name, object property in NMSettingVPN
 

 

 

-NMSettingWired:cloned-mac-address, object property in NMSettingWired
+NMSettingVpnError, enum in NMSettingVPN
 

 

 

-NMSettingWired:duplex, object property in NMSettingWired
+NMSettingWimax:mac-address, object property in NMSettingWimax
 

 

 

-NMSettingWired:mac-address, object property in NMSettingWired
+NMSettingWimax:network-name, object property in NMSettingWimax
 

 

 

-NMSettingWired:mac-address-blacklist, object property in NMSettingWired
+NMSettingWimaxError, enum in NMSettingWimax
 

 

 

-NMSettingWired:mtu, object property in NMSettingWired
+NMSettingWired:auto-negotiate, object property in NMSettingWired
 

 

 

-NMSettingWired:port, object property in NMSettingWired
+NMSettingWired:cloned-mac-address, object property in NMSettingWired
 

 

 

-NMSettingWired:s390-nettype, object property in NMSettingWired
+NMSettingWired:duplex, object property in NMSettingWired
 

 

 

-NMSettingWired:s390-options, object property in NMSettingWired
+NMSettingWired:mac-address, object property in NMSettingWired
 

 

 

-NMSettingWired:s390-subchannels, object property in NMSettingWired
+NMSettingWired:mac-address-blacklist, object property in NMSettingWired
 

 

 

-NMSettingWired:speed, object property in NMSettingWired
+NMSettingWired:mtu, object property in NMSettingWired
 

 

 

-NMSettingWiredClass, struct in NMSettingWired
+NMSettingWired:port, object property in NMSettingWired
 

 

 

-NMSettingWiredError, enum in NMSettingWired
+NMSettingWired:s390-nettype, object property in NMSettingWired
 

 

 

-NMSettingWireless, struct in NMSettingWireless
+NMSettingWired:s390-options, object property in NMSettingWired
 

 

 

-NMSettingWireless:band, object property in NMSettingWireless
+NMSettingWired:s390-subchannels, object property in NMSettingWired
 

 

 

-NMSettingWireless:bssid, object property in NMSettingWireless
+NMSettingWired:speed, object property in NMSettingWired
 

 

 

-NMSettingWireless:channel, object property in NMSettingWireless
+NMSettingWiredError, enum in NMSettingWired
 

 

 

-NMSettingWireless:cloned-mac-address, object property in NMSettingWireless
+NMSettingWireless:band, object property in NMSettingWireless
 

 

 

-NMSettingWireless:hidden, object property in NMSettingWireless
+NMSettingWireless:bssid, object property in NMSettingWireless
 

 

 

-NMSettingWireless:mac-address, object property in NMSettingWireless
+NMSettingWireless:channel, object property in NMSettingWireless
 

 

 

-NMSettingWireless:mac-address-blacklist, object property in NMSettingWireless
+NMSettingWireless:cloned-mac-address, object property in NMSettingWireless
 

 

 

-NMSettingWireless:mode, object property in NMSettingWireless
+NMSettingWireless:hidden, object property in NMSettingWireless
 

 

 

-NMSettingWireless:mtu, object property in NMSettingWireless
+NMSettingWireless:mac-address, object property in NMSettingWireless
 

 

 

-NMSettingWireless:rate, object property in NMSettingWireless
+NMSettingWireless:mac-address-blacklist, object property in NMSettingWireless
 

 

 

-NMSettingWireless:security, object property in NMSettingWireless
+NMSettingWireless:mode, object property in NMSettingWireless
 

 

 

-NMSettingWireless:seen-bssids, object property in NMSettingWireless
+NMSettingWireless:mtu, object property in NMSettingWireless
 

 

 

-NMSettingWireless:ssid, object property in NMSettingWireless
+NMSettingWireless:rate, object property in NMSettingWireless
 

 

 

-NMSettingWireless:tx-power, object property in NMSettingWireless
+NMSettingWireless:security, object property in NMSettingWireless
 

 

 

-NMSettingWirelessClass, struct in NMSettingWireless
+NMSettingWireless:seen-bssids, object property in NMSettingWireless
 

 

 

-NMSettingWirelessError, enum in NMSettingWireless
+NMSettingWireless:ssid, object property in NMSettingWireless
 

 

 

-NMSettingWirelessSecurity, struct in NMSettingWirelessSecurity
+NMSettingWireless:tx-power, object property in NMSettingWireless
 

 

 

-NMSettingWirelessSecurity:auth-alg, object property in NMSettingWirelessSecurity
+NMSettingWirelessError, enum in NMSettingWireless
 

 

 

-NMSettingWirelessSecurity:group, object property in NMSettingWirelessSecurity
+NMSettingWirelessSecurity:auth-alg, object property in NMSettingWirelessSecurity
 

 

 

-NMSettingWirelessSecurity:key-mgmt, object property in NMSettingWirelessSecurity
+NMSettingWirelessSecurity:group, object property in NMSettingWirelessSecurity
 

 

 

-NMSettingWirelessSecurity:leap-password, object property in NMSettingWirelessSecurity
+NMSettingWirelessSecurity:key-mgmt, object property in NMSettingWirelessSecurity
 

 

 

-NMSettingWirelessSecurity:leap-password-flags, object property in NMSettingWirelessSecurity
+NMSettingWirelessSecurity:leap-password, object property in NMSettingWirelessSecurity
 

 

 

-NMSettingWirelessSecurity:leap-username, object property in NMSettingWirelessSecurity
+NMSettingWirelessSecurity:leap-password-flags, object property in NMSettingWirelessSecurity
 

 

 

-NMSettingWirelessSecurity:pairwise, object property in NMSettingWirelessSecurity
+NMSettingWirelessSecurity:leap-username, object property in NMSettingWirelessSecurity
 

 

 

-NMSettingWirelessSecurity:proto, object property in NMSettingWirelessSecurity
+NMSettingWirelessSecurity:pairwise, object property in NMSettingWirelessSecurity
 

 

 

-NMSettingWirelessSecurity:psk, object property in NMSettingWirelessSecurity
+NMSettingWirelessSecurity:proto, object property in NMSettingWirelessSecurity
 

 

 

-NMSettingWirelessSecurity:psk-flags, object property in NMSettingWirelessSecurity
+NMSettingWirelessSecurity:psk, object property in NMSettingWirelessSecurity
 

 

 

-NMSettingWirelessSecurity:wep-key-flags, object property in NMSettingWirelessSecurity
+NMSettingWirelessSecurity:psk-flags, object property in NMSettingWirelessSecurity
 

 

 

-NMSettingWirelessSecurity:wep-key-type, object property in NMSettingWirelessSecurity
+NMSettingWirelessSecurity:wep-key-flags, object property in NMSettingWirelessSecurity
 

 

 

-NMSettingWirelessSecurity:wep-key0, object property in NMSettingWirelessSecurity
+NMSettingWirelessSecurity:wep-key-type, object property in NMSettingWirelessSecurity
 

 

 

-NMSettingWirelessSecurity:wep-key1, object property in NMSettingWirelessSecurity
+NMSettingWirelessSecurity:wep-key0, object property in NMSettingWirelessSecurity
 

 

 

-NMSettingWirelessSecurity:wep-key2, object property in NMSettingWirelessSecurity
+NMSettingWirelessSecurity:wep-key1, object property in NMSettingWirelessSecurity
 

 

 

-NMSettingWirelessSecurity:wep-key3, object property in NMSettingWirelessSecurity
+NMSettingWirelessSecurity:wep-key2, object property in NMSettingWirelessSecurity
 

 

 

-NMSettingWirelessSecurity:wep-tx-keyidx, object property in NMSettingWirelessSecurity
+NMSettingWirelessSecurity:wep-key3, object property in NMSettingWirelessSecurity
 

 

 

-NMSettingWirelessSecurityClass, struct in NMSettingWirelessSecurity
+NMSettingWirelessSecurity:wep-tx-keyidx, object property in NMSettingWirelessSecurity
 

 

 

-NMSettingWirelessSecurityError, enum in NMSettingWirelessSecurity
+NMSettingWirelessSecurityError, enum in NMSettingWirelessSecurity
 

 

 

-nm_setting_802_1x_add_altsubject_match, function in NMSetting8021x
+nm_setting_802_1x_add_altsubject_match, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_add_eap_method, function in NMSetting8021x
+nm_setting_802_1x_add_eap_method, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_add_phase2_altsubject_match, function in NMSetting8021x
+nm_setting_802_1x_add_phase2_altsubject_match, function in NMSetting8021x
 

 

 

@@ -1589,15 +1388,15 @@
 

 

 

-nm_setting_802_1x_clear_altsubject_matches, function in NMSetting8021x
+nm_setting_802_1x_clear_altsubject_matches, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_clear_eap_methods, function in NMSetting8021x
+nm_setting_802_1x_clear_eap_methods, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_clear_phase2_altsubject_matches, function in NMSetting8021x
+nm_setting_802_1x_clear_phase2_altsubject_matches, function in NMSetting8021x
 

 

 

@@ -1613,203 +1412,203 @@
 

 

 

-nm_setting_802_1x_error_quark, function in NMSetting8021x
+nm_setting_802_1x_error_quark, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_altsubject_match, function in NMSetting8021x
+nm_setting_802_1x_get_altsubject_match, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_anonymous_identity, function in NMSetting8021x
+nm_setting_802_1x_get_anonymous_identity, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_ca_cert_blob, function in NMSetting8021x
+nm_setting_802_1x_get_ca_cert_blob, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_ca_cert_path, function in NMSetting8021x
+nm_setting_802_1x_get_ca_cert_path, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_ca_cert_scheme, function in NMSetting8021x
+nm_setting_802_1x_get_ca_cert_scheme, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_ca_path, function in NMSetting8021x
+nm_setting_802_1x_get_ca_path, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_client_cert_blob, function in NMSetting8021x
+nm_setting_802_1x_get_client_cert_blob, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_client_cert_path, function in NMSetting8021x
+nm_setting_802_1x_get_client_cert_path, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_client_cert_scheme, function in NMSetting8021x
+nm_setting_802_1x_get_client_cert_scheme, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_eap_method, function in NMSetting8021x
+nm_setting_802_1x_get_eap_method, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_identity, function in NMSetting8021x
+nm_setting_802_1x_get_identity, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_num_altsubject_matches, function in NMSetting8021x
+nm_setting_802_1x_get_num_altsubject_matches, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_num_eap_methods, function in NMSetting8021x
+nm_setting_802_1x_get_num_eap_methods, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_num_phase2_altsubject_matches, function in NMSetting8021x
+nm_setting_802_1x_get_num_phase2_altsubject_matches, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_pac_file, function in NMSetting8021x
+nm_setting_802_1x_get_pac_file, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_password, function in NMSetting8021x
+nm_setting_802_1x_get_password, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_password_flags, function in NMSetting8021x
+nm_setting_802_1x_get_password_flags, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_password_raw, function in NMSetting8021x
+nm_setting_802_1x_get_password_raw, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_password_raw_flags, function in NMSetting8021x
+nm_setting_802_1x_get_password_raw_flags, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_phase1_fast_provisioning, function in NMSetting8021x
+nm_setting_802_1x_get_phase1_fast_provisioning, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_phase1_peaplabel, function in NMSetting8021x
+nm_setting_802_1x_get_phase1_peaplabel, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_phase1_peapver, function in NMSetting8021x
+nm_setting_802_1x_get_phase1_peapver, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_phase2_altsubject_match, function in NMSetting8021x
+nm_setting_802_1x_get_phase2_altsubject_match, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_phase2_auth, function in NMSetting8021x
+nm_setting_802_1x_get_phase2_auth, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_phase2_autheap, function in NMSetting8021x
+nm_setting_802_1x_get_phase2_autheap, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_phase2_ca_cert_blob, function in NMSetting8021x
+nm_setting_802_1x_get_phase2_ca_cert_blob, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_phase2_ca_cert_path, function in NMSetting8021x
+nm_setting_802_1x_get_phase2_ca_cert_path, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_phase2_ca_cert_scheme, function in NMSetting8021x
+nm_setting_802_1x_get_phase2_ca_cert_scheme, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_phase2_ca_path, function in NMSetting8021x
+nm_setting_802_1x_get_phase2_ca_path, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_phase2_client_cert_blob, function in NMSetting8021x
+nm_setting_802_1x_get_phase2_client_cert_blob, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_phase2_client_cert_path, function in NMSetting8021x
+nm_setting_802_1x_get_phase2_client_cert_path, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_phase2_client_cert_scheme, function in NMSetting8021x
+nm_setting_802_1x_get_phase2_client_cert_scheme, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_phase2_private_key_blob, function in NMSetting8021x
+nm_setting_802_1x_get_phase2_private_key_blob, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_phase2_private_key_format, function in NMSetting8021x
+nm_setting_802_1x_get_phase2_private_key_format, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_phase2_private_key_password, function in NMSetting8021x
+nm_setting_802_1x_get_phase2_private_key_password, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_phase2_private_key_password_flags, function in NMSetting8021x
+nm_setting_802_1x_get_phase2_private_key_password_flags, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_phase2_private_key_path, function in NMSetting8021x
+nm_setting_802_1x_get_phase2_private_key_path, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_phase2_private_key_scheme, function in NMSetting8021x
+nm_setting_802_1x_get_phase2_private_key_scheme, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_phase2_subject_match, function in NMSetting8021x
+nm_setting_802_1x_get_phase2_subject_match, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_pin, function in NMSetting8021x
+nm_setting_802_1x_get_pin, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_pin_flags, function in NMSetting8021x
+nm_setting_802_1x_get_pin_flags, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_private_key_blob, function in NMSetting8021x
+nm_setting_802_1x_get_private_key_blob, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_private_key_format, function in NMSetting8021x
+nm_setting_802_1x_get_private_key_format, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_private_key_password, function in NMSetting8021x
+nm_setting_802_1x_get_private_key_password, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_private_key_password_flags, function in NMSetting8021x
+nm_setting_802_1x_get_private_key_password_flags, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_private_key_path, function in NMSetting8021x
+nm_setting_802_1x_get_private_key_path, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_private_key_scheme, function in NMSetting8021x
+nm_setting_802_1x_get_private_key_scheme, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_subject_match, function in NMSetting8021x
+nm_setting_802_1x_get_subject_match, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_get_system_ca_certs, function in NMSetting8021x
+nm_setting_802_1x_get_system_ca_certs, function in NMSetting8021x
 

 

 

@@ -1817,7 +1616,7 @@
 

 

 

-nm_setting_802_1x_new, function in NMSetting8021x
+nm_setting_802_1x_new, function in NMSetting8021x
 

 

 

@@ -1913,15 +1712,15 @@
 

 

 

-nm_setting_802_1x_remove_altsubject_match, function in NMSetting8021x
+nm_setting_802_1x_remove_altsubject_match, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_remove_eap_method, function in NMSetting8021x
+nm_setting_802_1x_remove_eap_method, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_remove_phase2_altsubject_match, function in NMSetting8021x
+nm_setting_802_1x_remove_phase2_altsubject_match, function in NMSetting8021x
 

 

 

@@ -1929,27 +1728,27 @@
 

 

 

-nm_setting_802_1x_set_ca_cert, function in NMSetting8021x
+nm_setting_802_1x_set_ca_cert, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_set_client_cert, function in NMSetting8021x
+nm_setting_802_1x_set_client_cert, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_set_phase2_ca_cert, function in NMSetting8021x
+nm_setting_802_1x_set_phase2_ca_cert, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_set_phase2_client_cert, function in NMSetting8021x
+nm_setting_802_1x_set_phase2_client_cert, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_set_phase2_private_key, function in NMSetting8021x
+nm_setting_802_1x_set_phase2_private_key, function in NMSetting8021x
 

 

 

-nm_setting_802_1x_set_private_key, function in NMSetting8021x
+nm_setting_802_1x_set_private_key, function in NMSetting8021x
 

 

 

@@ -1977,39 +1776,39 @@
 

 

 

-nm_setting_adsl_error_quark, function in NMSettingAdsl
+nm_setting_adsl_error_quark, function in NMSettingAdsl
 

 

 

-nm_setting_adsl_get_encapsulation, function in NMSettingAdsl
+nm_setting_adsl_get_encapsulation, function in NMSettingAdsl
 

 

 

-nm_setting_adsl_get_password, function in NMSettingAdsl
+nm_setting_adsl_get_password, function in NMSettingAdsl
 

 

 

-nm_setting_adsl_get_password_flags, function in NMSettingAdsl
+nm_setting_adsl_get_password_flags, function in NMSettingAdsl
 

 

 

-nm_setting_adsl_get_protocol, function in NMSettingAdsl
+nm_setting_adsl_get_protocol, function in NMSettingAdsl
 

 

 

-nm_setting_adsl_get_username, function in NMSettingAdsl
+nm_setting_adsl_get_username, function in NMSettingAdsl
 

 

 

-nm_setting_adsl_get_vci, function in NMSettingAdsl
+nm_setting_adsl_get_vci, function in NMSettingAdsl
 

 

 

-nm_setting_adsl_get_vpi, function in NMSettingAdsl
+nm_setting_adsl_get_vpi, function in NMSettingAdsl
 

 

 

-nm_setting_adsl_new, function in NMSettingAdsl
+nm_setting_adsl_new, function in NMSettingAdsl
 

 

 

@@ -2061,19 +1860,19 @@
 

 

 

-nm_setting_bluetooth_error_quark, function in NMSettingBluetooth
+nm_setting_bluetooth_error_quark, function in NMSettingBluetooth
 

 

 

-nm_setting_bluetooth_get_bdaddr, function in NMSettingBluetooth
+nm_setting_bluetooth_get_bdaddr, function in NMSettingBluetooth
 

 

 

-nm_setting_bluetooth_get_connection_type, function in NMSettingBluetooth
+nm_setting_bluetooth_get_connection_type, function in NMSettingBluetooth
 

 

 

-nm_setting_bluetooth_new, function in NMSettingBluetooth
+nm_setting_bluetooth_new, function in NMSettingBluetooth
 

 

 

@@ -2093,7 +1892,7 @@
 

 

 

-nm_setting_bond_add_option, function in NMSettingBond
+nm_setting_bond_add_option, function in NMSettingBond
 

 

 

@@ -2101,31 +1900,31 @@
 

 

 

-nm_setting_bond_error_quark, function in NMSettingBond
+nm_setting_bond_error_quark, function in NMSettingBond
 

 

 

-nm_setting_bond_get_interface_name, function in NMSettingBond
+nm_setting_bond_get_interface_name, function in NMSettingBond
 

 

 

-nm_setting_bond_get_num_options, function in NMSettingBond
+nm_setting_bond_get_num_options, function in NMSettingBond
 

 

 

-nm_setting_bond_get_option, function in NMSettingBond
+nm_setting_bond_get_option, function in NMSettingBond
 

 

 

-nm_setting_bond_get_option_by_name, function in NMSettingBond
+nm_setting_bond_get_option_by_name, function in NMSettingBond
 

 

 

-nm_setting_bond_get_option_default, function in NMSettingBond
+nm_setting_bond_get_option_default, function in NMSettingBond
 

 

 

-nm_setting_bond_get_valid_options, function in NMSettingBond
+nm_setting_bond_get_valid_options, function in NMSettingBond
 

 

 

@@ -2133,7 +1932,7 @@
 

 

 

-nm_setting_bond_new, function in NMSettingBond
+nm_setting_bond_new, function in NMSettingBond
 

 

 

@@ -2165,7 +1964,7 @@
 

 

 

-nm_setting_bond_remove_option, function in NMSettingBond
+nm_setting_bond_remove_option, function in NMSettingBond
 

 

 

@@ -2181,7 +1980,7 @@
 

 

 

-nm_setting_bridge_error_quark, function in NMSettingBridge
+nm_setting_bridge_error_quark, function in NMSettingBridge
 

 

 

@@ -2189,31 +1988,31 @@
 

 

 

-nm_setting_bridge_get_ageing_time, function in NMSettingBridge
+nm_setting_bridge_get_ageing_time, function in NMSettingBridge
 

 

 

-nm_setting_bridge_get_forward_delay, function in NMSettingBridge
+nm_setting_bridge_get_forward_delay, function in NMSettingBridge
 

 

 

-nm_setting_bridge_get_hello_time, function in NMSettingBridge
+nm_setting_bridge_get_hello_time, function in NMSettingBridge
 

 

 

-nm_setting_bridge_get_interface_name, function in NMSettingBridge
+nm_setting_bridge_get_interface_name, function in NMSettingBridge
 

 

 

-nm_setting_bridge_get_max_age, function in NMSettingBridge
+nm_setting_bridge_get_max_age, function in NMSettingBridge
 

 

 

-nm_setting_bridge_get_priority, function in NMSettingBridge
+nm_setting_bridge_get_priority, function in NMSettingBridge
 

 

 

-nm_setting_bridge_get_stp, function in NMSettingBridge
+nm_setting_bridge_get_stp, function in NMSettingBridge
 

 

 

@@ -2229,7 +2028,7 @@
 

 

 

-nm_setting_bridge_new, function in NMSettingBridge
+nm_setting_bridge_new, function in NMSettingBridge
 

 

 

@@ -2237,19 +2036,19 @@
 

 

 

-nm_setting_bridge_port_error_quark, function in NMSettingBridgePort
+nm_setting_bridge_port_error_quark, function in NMSettingBridgePort
 

 

 

-nm_setting_bridge_port_get_hairpin_mode, function in NMSettingBridgePort
+nm_setting_bridge_port_get_hairpin_mode, function in NMSettingBridgePort
 

 

 

-nm_setting_bridge_port_get_path_cost, function in NMSettingBridgePort
+nm_setting_bridge_port_get_path_cost, function in NMSettingBridgePort
 

 

 

-nm_setting_bridge_port_get_priority, function in NMSettingBridgePort
+nm_setting_bridge_port_get_priority, function in NMSettingBridgePort
 

 

 

@@ -2257,7 +2056,7 @@
 

 

 

-nm_setting_bridge_port_new, function in NMSettingBridgePort
+nm_setting_bridge_port_new, function in NMSettingBridgePort
 

 

 

@@ -2289,27 +2088,27 @@
 

 

 

-nm_setting_cdma_error_quark, function in NMSettingCdma
+nm_setting_cdma_error_quark, function in NMSettingCdma
 

 

 

-nm_setting_cdma_get_number, function in NMSettingCdma
+nm_setting_cdma_get_number, function in NMSettingCdma
 

 

 

-nm_setting_cdma_get_password, function in NMSettingCdma
+nm_setting_cdma_get_password, function in NMSettingCdma
 

 

 

-nm_setting_cdma_get_password_flags, function in NMSettingCdma
+nm_setting_cdma_get_password_flags, function in NMSettingCdma
 

 

 

-nm_setting_cdma_get_username, function in NMSettingCdma
+nm_setting_cdma_get_username, function in NMSettingCdma
 

 

 

-nm_setting_cdma_new, function in NMSettingCdma
+nm_setting_cdma_new, function in NMSettingCdma
 

 

 

@@ -2333,23 +2132,23 @@
 

 

 

-nm_setting_clear_secrets, function in NMSetting
+nm_setting_clear_secrets, function in NMSetting
 

 

 

-nm_setting_clear_secrets_with_flags, function in NMSetting
+nm_setting_clear_secrets_with_flags, function in NMSetting
 

 

 

-nm_setting_compare, function in NMSetting
+nm_setting_compare, function in NMSetting
 

 

 

-nm_setting_connection_add_permission, function in NMSettingConnection
+nm_setting_connection_add_permission, function in NMSettingConnection
 

 

 

-nm_setting_connection_add_secondary, function in NMSettingConnection
+nm_setting_connection_add_secondary, function in NMSettingConnection
 

 

 

@@ -2361,59 +2160,59 @@
 

 

 

-nm_setting_connection_error_quark, function in NMSettingConnection
+nm_setting_connection_error_quark, function in NMSettingConnection
 

 

 

-nm_setting_connection_get_autoconnect, function in NMSettingConnection
+nm_setting_connection_get_autoconnect, function in NMSettingConnection
 

 

 

-nm_setting_connection_get_connection_type, function in NMSettingConnection
+nm_setting_connection_get_connection_type, function in NMSettingConnection
 

 

 

-nm_setting_connection_get_id, function in NMSettingConnection
+nm_setting_connection_get_id, function in NMSettingConnection
 

 

 

-nm_setting_connection_get_master, function in NMSettingConnection
+nm_setting_connection_get_master, function in NMSettingConnection
 

 

 

-nm_setting_connection_get_num_permissions, function in NMSettingConnection
+nm_setting_connection_get_num_permissions, function in NMSettingConnection
 

 

 

-nm_setting_connection_get_num_secondaries, function in NMSettingConnection
+nm_setting_connection_get_num_secondaries, function in NMSettingConnection
 

 

 

-nm_setting_connection_get_permission, function in NMSettingConnection
+nm_setting_connection_get_permission, function in NMSettingConnection
 

 

 

-nm_setting_connection_get_read_only, function in NMSettingConnection
+nm_setting_connection_get_read_only, function in NMSettingConnection
 

 

 

-nm_setting_connection_get_secondary, function in NMSettingConnection
+nm_setting_connection_get_secondary, function in NMSettingConnection
 

 

 

-nm_setting_connection_get_slave_type, function in NMSettingConnection
+nm_setting_connection_get_slave_type, function in NMSettingConnection
 

 

 

-nm_setting_connection_get_timestamp, function in NMSettingConnection
+nm_setting_connection_get_timestamp, function in NMSettingConnection
 

 

 

-nm_setting_connection_get_uuid, function in NMSettingConnection
+nm_setting_connection_get_uuid, function in NMSettingConnection
 

 

 

-nm_setting_connection_get_zone, function in NMSettingConnection
+nm_setting_connection_get_zone, function in NMSettingConnection
 

 

 

@@ -2421,7 +2220,7 @@
 

 

 

-nm_setting_connection_is_slave_type, function in NMSettingConnection
+nm_setting_connection_is_slave_type, function in NMSettingConnection
 

 

 

@@ -2429,7 +2228,7 @@
 

 

 

-nm_setting_connection_new, function in NMSettingConnection
+nm_setting_connection_new, function in NMSettingConnection
 

 

 

@@ -2437,7 +2236,7 @@
 

 

 

-nm_setting_connection_permissions_user_allowed, function in NMSettingConnection
+nm_setting_connection_permissions_user_allowed, function in NMSettingConnection
 

 

 

@@ -2445,11 +2244,11 @@
 

 

 

-nm_setting_connection_remove_permission, function in NMSettingConnection
+nm_setting_connection_remove_permission, function in NMSettingConnection
 

 

 

-nm_setting_connection_remove_secondary, function in NMSettingConnection
+nm_setting_connection_remove_secondary, function in NMSettingConnection
 

 

 

@@ -2481,15 +2280,15 @@
 

 

 

-nm_setting_diff, function in NMSetting
+nm_setting_diff, function in NMSetting
 

 

 

-nm_setting_duplicate, function in NMSetting
+nm_setting_duplicate, function in NMSetting
 

 

 

-nm_setting_enumerate_values, function in NMSetting
+nm_setting_enumerate_values, function in NMSetting
 

 

 

@@ -2497,19 +2296,19 @@
 

 

 

-nm_setting_error_quark, function in NMSetting
+nm_setting_error_quark, function in NMSetting
 

 

 

-nm_setting_get_name, function in NMSetting
+nm_setting_get_name, function in NMSetting
 

 

 

-nm_setting_get_secret_flags, function in NMSetting
+nm_setting_get_secret_flags, function in NMSetting
 

 

 

-nm_setting_get_virtual_iface_name, function in NMSetting
+nm_setting_get_virtual_iface_name, function in NMSetting
 

 

 

@@ -2525,51 +2324,51 @@
 

 

 

-nm_setting_gsm_error_quark, function in NMSettingGsm
+nm_setting_gsm_error_quark, function in NMSettingGsm
 

 

 

-nm_setting_gsm_get_allowed_bands, function in NMSettingGsm
+nm_setting_gsm_get_allowed_bands, function in NMSettingGsm
 

 

 

-nm_setting_gsm_get_apn, function in NMSettingGsm
+nm_setting_gsm_get_apn, function in NMSettingGsm
 

 

 

-nm_setting_gsm_get_home_only, function in NMSettingGsm
+nm_setting_gsm_get_home_only, function in NMSettingGsm
 

 

 

-nm_setting_gsm_get_network_id, function in NMSettingGsm
+nm_setting_gsm_get_network_id, function in NMSettingGsm
 

 

 

-nm_setting_gsm_get_network_type, function in NMSettingGsm
+nm_setting_gsm_get_network_type, function in NMSettingGsm
 

 

 

-nm_setting_gsm_get_number, function in NMSettingGsm
+nm_setting_gsm_get_number, function in NMSettingGsm
 

 

 

-nm_setting_gsm_get_password, function in NMSettingGsm
+nm_setting_gsm_get_password, function in NMSettingGsm
 

 

 

-nm_setting_gsm_get_password_flags, function in NMSettingGsm
+nm_setting_gsm_get_password_flags, function in NMSettingGsm
 

 

 

-nm_setting_gsm_get_pin, function in NMSettingGsm
+nm_setting_gsm_get_pin, function in NMSettingGsm
 

 

 

-nm_setting_gsm_get_pin_flags, function in NMSettingGsm
+nm_setting_gsm_get_pin_flags, function in NMSettingGsm
 

 

 

-nm_setting_gsm_get_username, function in NMSettingGsm
+nm_setting_gsm_get_username, function in NMSettingGsm
 

 

 

@@ -2585,7 +2384,7 @@
 

 

 

-nm_setting_gsm_new, function in NMSettingGsm
+nm_setting_gsm_new, function in NMSettingGsm
 

 

 

@@ -2621,19 +2420,19 @@
 

 

 

-nm_setting_infiniband_error_quark, function in NMSettingInfiniband
+nm_setting_infiniband_error_quark, function in NMSettingInfiniband
 

 

 

-nm_setting_infiniband_get_mac_address, function in NMSettingInfiniband
+nm_setting_infiniband_get_mac_address, function in NMSettingInfiniband
 

 

 

-nm_setting_infiniband_get_mtu, function in NMSettingInfiniband
+nm_setting_infiniband_get_mtu, function in NMSettingInfiniband
 

 

 

-nm_setting_infiniband_get_transport_mode, function in NMSettingInfiniband
+nm_setting_infiniband_get_transport_mode, function in NMSettingInfiniband
 

 

 

@@ -2645,7 +2444,7 @@
 

 

 

-nm_setting_infiniband_new, function in NMSettingInfiniband
+nm_setting_infiniband_new, function in NMSettingInfiniband
 

 

 

@@ -2661,35 +2460,35 @@
 

 

 

-nm_setting_ip4_config_add_address, function in NMSettingIP4Config
+nm_setting_ip4_config_add_address, function in NMSettingIP4Config
 

 

 

-nm_setting_ip4_config_add_dns, function in NMSettingIP4Config
+nm_setting_ip4_config_add_dns, function in NMSettingIP4Config
 

 

 

-nm_setting_ip4_config_add_dns_search, function in NMSettingIP4Config
+nm_setting_ip4_config_add_dns_search, function in NMSettingIP4Config
 

 

 

-nm_setting_ip4_config_add_route, function in NMSettingIP4Config
+nm_setting_ip4_config_add_route, function in NMSettingIP4Config
 

 

 

-nm_setting_ip4_config_clear_addresses, function in NMSettingIP4Config
+nm_setting_ip4_config_clear_addresses, function in NMSettingIP4Config
 

 

 

-nm_setting_ip4_config_clear_dns, function in NMSettingIP4Config
+nm_setting_ip4_config_clear_dns, function in NMSettingIP4Config
 

 

 

-nm_setting_ip4_config_clear_dns_searches, function in NMSettingIP4Config
+nm_setting_ip4_config_clear_dns_searches, function in NMSettingIP4Config
 

 

 

-nm_setting_ip4_config_clear_routes, function in NMSettingIP4Config
+nm_setting_ip4_config_clear_routes, function in NMSettingIP4Config
 

 

 

@@ -2717,71 +2516,71 @@
 

 

 

-nm_setting_ip4_config_error_quark, function in NMSettingIP4Config
+nm_setting_ip4_config_error_quark, function in NMSettingIP4Config
 

 

 

-nm_setting_ip4_config_get_address, function in NMSettingIP4Config
+nm_setting_ip4_config_get_address, function in NMSettingIP4Config
 

 

 

-nm_setting_ip4_config_get_dhcp_client_id, function in NMSettingIP4Config
+nm_setting_ip4_config_get_dhcp_client_id, function in NMSettingIP4Config
 

 

 

-nm_setting_ip4_config_get_dhcp_hostname, function in NMSettingIP4Config
+nm_setting_ip4_config_get_dhcp_hostname, function in NMSettingIP4Config
 

 

 

-nm_setting_ip4_config_get_dhcp_send_hostname, function in NMSettingIP4Config
+nm_setting_ip4_config_get_dhcp_send_hostname, function in NMSettingIP4Config
 

 

 

-nm_setting_ip4_config_get_dns, function in NMSettingIP4Config
+nm_setting_ip4_config_get_dns, function in NMSettingIP4Config
 

 

 

-nm_setting_ip4_config_get_dns_search, function in NMSettingIP4Config
+nm_setting_ip4_config_get_dns_search, function in NMSettingIP4Config
 

 

 

-nm_setting_ip4_config_get_ignore_auto_dns, function in NMSettingIP4Config
+nm_setting_ip4_config_get_ignore_auto_dns, function in NMSettingIP4Config
 

 

 

-nm_setting_ip4_config_get_ignore_auto_routes, function in NMSettingIP4Config
+nm_setting_ip4_config_get_ignore_auto_routes, function in NMSettingIP4Config
 

 

 

-nm_setting_ip4_config_get_may_fail, function in NMSettingIP4Config
+nm_setting_ip4_config_get_may_fail, function in NMSettingIP4Config
 

 

 

-nm_setting_ip4_config_get_method, function in NMSettingIP4Config
+nm_setting_ip4_config_get_method, function in NMSettingIP4Config
 

 

 

-nm_setting_ip4_config_get_never_default, function in NMSettingIP4Config
+nm_setting_ip4_config_get_never_default, function in NMSettingIP4Config
 

 

 

-nm_setting_ip4_config_get_num_addresses, function in NMSettingIP4Config
+nm_setting_ip4_config_get_num_addresses, function in NMSettingIP4Config
 

 

 

-nm_setting_ip4_config_get_num_dns, function in NMSettingIP4Config
+nm_setting_ip4_config_get_num_dns, function in NMSettingIP4Config
 

 

 

-nm_setting_ip4_config_get_num_dns_searches, function in NMSettingIP4Config
+nm_setting_ip4_config_get_num_dns_searches, function in NMSettingIP4Config
 

 

 

-nm_setting_ip4_config_get_num_routes, function in NMSettingIP4Config
+nm_setting_ip4_config_get_num_routes, function in NMSettingIP4Config
 

 

 

-nm_setting_ip4_config_get_route, function in NMSettingIP4Config
+nm_setting_ip4_config_get_route, function in NMSettingIP4Config
 

 

 

@@ -2825,23 +2624,23 @@
 

 

 

-nm_setting_ip4_config_new, function in NMSettingIP4Config
+nm_setting_ip4_config_new, function in NMSettingIP4Config
 

 

 

-nm_setting_ip4_config_remove_address, function in NMSettingIP4Config
+nm_setting_ip4_config_remove_address, function in NMSettingIP4Config
 

 

 

-nm_setting_ip4_config_remove_dns, function in NMSettingIP4Config
+nm_setting_ip4_config_remove_dns, function in NMSettingIP4Config
 

 

 

-nm_setting_ip4_config_remove_dns_search, function in NMSettingIP4Config
+nm_setting_ip4_config_remove_dns_search, function in NMSettingIP4Config
 

 

 

-nm_setting_ip4_config_remove_route, function in NMSettingIP4Config
+nm_setting_ip4_config_remove_route, function in NMSettingIP4Config
 

 

 

@@ -2857,35 +2656,35 @@
 

 

 

-nm_setting_ip6_config_add_address, function in NMSettingIP6Config
+nm_setting_ip6_config_add_address, function in NMSettingIP6Config
 

 

 

-nm_setting_ip6_config_add_dns, function in NMSettingIP6Config
+nm_setting_ip6_config_add_dns, function in NMSettingIP6Config
 

 

 

-nm_setting_ip6_config_add_dns_search, function in NMSettingIP6Config
+nm_setting_ip6_config_add_dns_search, function in NMSettingIP6Config
 

 

 

-nm_setting_ip6_config_add_route, function in NMSettingIP6Config
+nm_setting_ip6_config_add_route, function in NMSettingIP6Config
 

 

 

-nm_setting_ip6_config_clear_addresses, function in NMSettingIP6Config
+nm_setting_ip6_config_clear_addresses, function in NMSettingIP6Config
 

 

 

-nm_setting_ip6_config_clear_dns, function in NMSettingIP6Config
+nm_setting_ip6_config_clear_dns, function in NMSettingIP6Config
 

 

 

-nm_setting_ip6_config_clear_dns_searches, function in NMSettingIP6Config
+nm_setting_ip6_config_clear_dns_searches, function in NMSettingIP6Config
 

 

 

-nm_setting_ip6_config_clear_routes, function in NMSettingIP6Config
+nm_setting_ip6_config_clear_routes, function in NMSettingIP6Config
 

 

 

@@ -2905,67 +2704,67 @@
 

 

 

-nm_setting_ip6_config_error_quark, function in NMSettingIP6Config
+nm_setting_ip6_config_error_quark, function in NMSettingIP6Config
 

 

 

-nm_setting_ip6_config_get_address, function in NMSettingIP6Config
+nm_setting_ip6_config_get_address, function in NMSettingIP6Config
 

 

 

-nm_setting_ip6_config_get_dhcp_hostname, function in NMSettingIP6Config
+nm_setting_ip6_config_get_dhcp_hostname, function in NMSettingIP6Config
 

 

 

-nm_setting_ip6_config_get_dns, function in NMSettingIP6Config
+nm_setting_ip6_config_get_dns, function in NMSettingIP6Config
 

 

 

-nm_setting_ip6_config_get_dns_search, function in NMSettingIP6Config
+nm_setting_ip6_config_get_dns_search, function in NMSettingIP6Config
 

 

 

-nm_setting_ip6_config_get_ignore_auto_dns, function in NMSettingIP6Config
+nm_setting_ip6_config_get_ignore_auto_dns, function in NMSettingIP6Config
 

 

 

-nm_setting_ip6_config_get_ignore_auto_routes, function in NMSettingIP6Config
+nm_setting_ip6_config_get_ignore_auto_routes, function in NMSettingIP6Config
 

 

 

-nm_setting_ip6_config_get_ip6_privacy, function in NMSettingIP6Config
+nm_setting_ip6_config_get_ip6_privacy, function in NMSettingIP6Config
 

 

 

-nm_setting_ip6_config_get_may_fail, function in NMSettingIP6Config
+nm_setting_ip6_config_get_may_fail, function in NMSettingIP6Config
 

 

 

-nm_setting_ip6_config_get_method, function in NMSettingIP6Config
+nm_setting_ip6_config_get_method, function in NMSettingIP6Config
 

 

 

-nm_setting_ip6_config_get_never_default, function in NMSettingIP6Config
+nm_setting_ip6_config_get_never_default, function in NMSettingIP6Config
 

 

 

-nm_setting_ip6_config_get_num_addresses, function in NMSettingIP6Config
+nm_setting_ip6_config_get_num_addresses, function in NMSettingIP6Config
 

 

 

-nm_setting_ip6_config_get_num_dns, function in NMSettingIP6Config
+nm_setting_ip6_config_get_num_dns, function in NMSettingIP6Config
 

 

 

-nm_setting_ip6_config_get_num_dns_searches, function in NMSettingIP6Config
+nm_setting_ip6_config_get_num_dns_searches, function in NMSettingIP6Config
 

 

 

-nm_setting_ip6_config_get_num_routes, function in NMSettingIP6Config
+nm_setting_ip6_config_get_num_routes, function in NMSettingIP6Config
 

 

 

-nm_setting_ip6_config_get_route, function in NMSettingIP6Config
+nm_setting_ip6_config_get_route, function in NMSettingIP6Config
 

 

 

@@ -3017,23 +2816,23 @@
 

 

 

-nm_setting_ip6_config_new, function in NMSettingIP6Config
+nm_setting_ip6_config_new, function in NMSettingIP6Config
 

 

 

-nm_setting_ip6_config_remove_address, function in NMSettingIP6Config
+nm_setting_ip6_config_remove_address, function in NMSettingIP6Config
 

 

 

-nm_setting_ip6_config_remove_dns, function in NMSettingIP6Config
+nm_setting_ip6_config_remove_dns, function in NMSettingIP6Config
 

 

 

-nm_setting_ip6_config_remove_dns_search, function in NMSettingIP6Config
+nm_setting_ip6_config_remove_dns_search, function in NMSettingIP6Config
 

 

 

-nm_setting_ip6_config_remove_route, function in NMSettingIP6Config
+nm_setting_ip6_config_remove_route, function in NMSettingIP6Config
 

 

 

@@ -3049,11 +2848,11 @@
 

 

 

-nm_setting_need_secrets, function in NMSetting
+nm_setting_need_secrets, function in NMSetting
 

 

 

-nm_setting_new_from_hash, function in NMSetting
+nm_setting_new_from_hash, function in NMSetting
 

 

 

@@ -3069,23 +2868,23 @@
 

 

 

-nm_setting_olpc_mesh_error_quark, function in NMSettingOlpcMesh
+nm_setting_olpc_mesh_error_quark, function in NMSettingOlpcMesh
 

 

 

-nm_setting_olpc_mesh_get_channel, function in NMSettingOlpcMesh
+nm_setting_olpc_mesh_get_channel, function in NMSettingOlpcMesh
 

 

 

-nm_setting_olpc_mesh_get_dhcp_anycast_address, function in NMSettingOlpcMesh
+nm_setting_olpc_mesh_get_dhcp_anycast_address, function in NMSettingOlpcMesh
 

 

 

-nm_setting_olpc_mesh_get_ssid, function in NMSettingOlpcMesh
+nm_setting_olpc_mesh_get_ssid, function in NMSettingOlpcMesh
 

 

 

-nm_setting_olpc_mesh_new, function in NMSettingOlpcMesh
+nm_setting_olpc_mesh_new, function in NMSettingOlpcMesh
 

 

 

@@ -3117,27 +2916,27 @@
 

 

 

-nm_setting_pppoe_error_quark, function in NMSettingPPPOE
+nm_setting_pppoe_error_quark, function in NMSettingPPPOE
 

 

 

-nm_setting_pppoe_get_password, function in NMSettingPPPOE
+nm_setting_pppoe_get_password, function in NMSettingPPPOE
 

 

 

-nm_setting_pppoe_get_password_flags, function in NMSettingPPPOE
+nm_setting_pppoe_get_password_flags, function in NMSettingPPPOE
 

 

 

-nm_setting_pppoe_get_service, function in NMSettingPPPOE
+nm_setting_pppoe_get_service, function in NMSettingPPPOE
 

 

 

-nm_setting_pppoe_get_username, function in NMSettingPPPOE
+nm_setting_pppoe_get_username, function in NMSettingPPPOE
 

 

 

-nm_setting_pppoe_new, function in NMSettingPPPOE
+nm_setting_pppoe_new, function in NMSettingPPPOE
 

 

 

@@ -3173,79 +2972,79 @@
 

 

 

-nm_setting_ppp_error_quark, function in NMSettingPPP
+nm_setting_ppp_error_quark, function in NMSettingPPP
 

 

 

-nm_setting_ppp_get_baud, function in NMSettingPPP
+nm_setting_ppp_get_baud, function in NMSettingPPP
 

 

 

-nm_setting_ppp_get_crtscts, function in NMSettingPPP
+nm_setting_ppp_get_crtscts, function in NMSettingPPP
 

 

 

-nm_setting_ppp_get_lcp_echo_failure, function in NMSettingPPP
+nm_setting_ppp_get_lcp_echo_failure, function in NMSettingPPP
 

 

 

-nm_setting_ppp_get_lcp_echo_interval, function in NMSettingPPP
+nm_setting_ppp_get_lcp_echo_interval, function in NMSettingPPP
 

 

 

-nm_setting_ppp_get_mppe_stateful, function in NMSettingPPP
+nm_setting_ppp_get_mppe_stateful, function in NMSettingPPP
 

 

 

-nm_setting_ppp_get_mru, function in NMSettingPPP
+nm_setting_ppp_get_mru, function in NMSettingPPP
 

 

 

-nm_setting_ppp_get_mtu, function in NMSettingPPP
+nm_setting_ppp_get_mtu, function in NMSettingPPP
 

 

 

-nm_setting_ppp_get_noauth, function in NMSettingPPP
+nm_setting_ppp_get_noauth, function in NMSettingPPP
 

 

 

-nm_setting_ppp_get_nobsdcomp, function in NMSettingPPP
+nm_setting_ppp_get_nobsdcomp, function in NMSettingPPP
 

 

 

-nm_setting_ppp_get_nodeflate, function in NMSettingPPP
+nm_setting_ppp_get_nodeflate, function in NMSettingPPP
 

 

 

-nm_setting_ppp_get_no_vj_comp, function in NMSettingPPP
+nm_setting_ppp_get_no_vj_comp, function in NMSettingPPP
 

 

 

-nm_setting_ppp_get_refuse_chap, function in NMSettingPPP
+nm_setting_ppp_get_refuse_chap, function in NMSettingPPP
 

 

 

-nm_setting_ppp_get_refuse_eap, function in NMSettingPPP
+nm_setting_ppp_get_refuse_eap, function in NMSettingPPP
 

 

 

-nm_setting_ppp_get_refuse_mschap, function in NMSettingPPP
+nm_setting_ppp_get_refuse_mschap, function in NMSettingPPP
 

 

 

-nm_setting_ppp_get_refuse_mschapv2, function in NMSettingPPP
+nm_setting_ppp_get_refuse_mschapv2, function in NMSettingPPP
 

 

 

-nm_setting_ppp_get_refuse_pap, function in NMSettingPPP
+nm_setting_ppp_get_refuse_pap, function in NMSettingPPP
 

 

 

-nm_setting_ppp_get_require_mppe, function in NMSettingPPP
+nm_setting_ppp_get_require_mppe, function in NMSettingPPP
 

 

 

-nm_setting_ppp_get_require_mppe_128, function in NMSettingPPP
+nm_setting_ppp_get_require_mppe_128, function in NMSettingPPP
 

 

 

@@ -3269,7 +3068,7 @@
 

 

 

-nm_setting_ppp_new, function in NMSettingPPP
+nm_setting_ppp_new, function in NMSettingPPP
 

 

 

@@ -3341,31 +3140,31 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

 

 

-nm_setting_serial_error_quark, function in NMSettingSerial
+nm_setting_serial_error_quark, function in NMSettingSerial
 

 

 

-nm_setting_serial_get_baud, function in NMSettingSerial
+nm_setting_serial_get_baud, function in NMSettingSerial
 

 

 

-nm_setting_serial_get_bits, function in NMSettingSerial
+nm_setting_serial_get_bits, function in NMSettingSerial
 

 

 

-nm_setting_serial_get_parity, function in NMSettingSerial
+nm_setting_serial_get_parity, function in NMSettingSerial
 

 

 

-nm_setting_serial_get_send_delay, function in NMSettingSerial
+nm_setting_serial_get_send_delay, function in NMSettingSerial
 

 

 

-nm_setting_serial_get_stopbits, function in NMSettingSerial
+nm_setting_serial_get_stopbits, function in NMSettingSerial
 

 

 

-nm_setting_serial_new, function in NMSettingSerial
+nm_setting_serial_new, function in NMSettingSerial
 

 

 

@@ -3385,35 +3184,35 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

 

 

-nm_setting_set_secret_flags, function in NMSetting
+nm_setting_set_secret_flags, function in NMSetting
 

 

 

-nm_setting_to_hash, function in NMSetting
+nm_setting_to_hash, function in NMSetting
 

 

 

-nm_setting_to_string, function in NMSetting
+nm_setting_to_string, function in NMSetting
 

 

 

-nm_setting_update_secrets, function in NMSetting
+nm_setting_update_secrets, function in NMSetting
 

 

 

-nm_setting_verify, function in NMSetting
+nm_setting_verify, function in NMSetting
 

 

 

-nm_setting_vlan_add_priority, function in NMSettingVlan
+nm_setting_vlan_add_priority, function in NMSettingVlan
 

 

 

-nm_setting_vlan_add_priority_str, function in NMSettingVlan
+nm_setting_vlan_add_priority_str, function in NMSettingVlan
 

 

 

-nm_setting_vlan_clear_priorities, function in NMSettingVlan
+nm_setting_vlan_clear_priorities, function in NMSettingVlan
 

 

 

@@ -3425,7 +3224,7 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

 

 

-nm_setting_vlan_error_quark, function in NMSettingVlan
+nm_setting_vlan_error_quark, function in NMSettingVlan
 

 

 

@@ -3433,27 +3232,27 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

 

 

-nm_setting_vlan_get_flags, function in NMSettingVlan
+nm_setting_vlan_get_flags, function in NMSettingVlan
 

 

 

-nm_setting_vlan_get_id, function in NMSettingVlan
+nm_setting_vlan_get_id, function in NMSettingVlan
 

 

 

-nm_setting_vlan_get_interface_name, function in NMSettingVlan
+nm_setting_vlan_get_interface_name, function in NMSettingVlan
 

 

 

-nm_setting_vlan_get_num_priorities, function in NMSettingVlan
+nm_setting_vlan_get_num_priorities, function in NMSettingVlan
 

 

 

-nm_setting_vlan_get_parent, function in NMSettingVlan
+nm_setting_vlan_get_parent, function in NMSettingVlan
 

 

 

-nm_setting_vlan_get_priority, function in NMSettingVlan
+nm_setting_vlan_get_priority, function in NMSettingVlan
 

 

 

@@ -3469,7 +3268,7 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

 

 

-nm_setting_vlan_new, function in NMSettingVlan
+nm_setting_vlan_new, function in NMSettingVlan
 

 

 

@@ -3477,7 +3276,7 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

 

 

-nm_setting_vlan_remove_priority, function in NMSettingVlan
+nm_setting_vlan_remove_priority, function in NMSettingVlan
 

 

 

@@ -3485,11 +3284,11 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

 

 

-nm_setting_vpn_add_data_item, function in NMSettingVPN
+nm_setting_vpn_add_data_item, function in NMSettingVPN
 

 

 

-nm_setting_vpn_add_secret, function in NMSettingVPN
+nm_setting_vpn_add_secret, function in NMSettingVPN
 

 

 

@@ -3501,51 +3300,51 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

 

 

-nm_setting_vpn_error_quark, function in NMSettingVPN
+nm_setting_vpn_error_quark, function in NMSettingVPN
 

 

 

-nm_setting_vpn_foreach_data_item, function in NMSettingVPN
+nm_setting_vpn_foreach_data_item, function in NMSettingVPN
 

 

 

-nm_setting_vpn_foreach_secret, function in NMSettingVPN
+nm_setting_vpn_foreach_secret, function in NMSettingVPN
 

 

 

-nm_setting_vpn_get_data_item, function in NMSettingVPN
+nm_setting_vpn_get_data_item, function in NMSettingVPN
 

 

 

-nm_setting_vpn_get_num_data_items, function in NMSettingVPN
+nm_setting_vpn_get_num_data_items, function in NMSettingVPN
 

 

 

-nm_setting_vpn_get_num_secrets, function in NMSettingVPN
+nm_setting_vpn_get_num_secrets, function in NMSettingVPN
 

 

 

-nm_setting_vpn_get_secret, function in NMSettingVPN
+nm_setting_vpn_get_secret, function in NMSettingVPN
 

 

 

-nm_setting_vpn_get_service_type, function in NMSettingVPN
+nm_setting_vpn_get_service_type, function in NMSettingVPN
 

 

 

-nm_setting_vpn_get_user_name, function in NMSettingVPN
+nm_setting_vpn_get_user_name, function in NMSettingVPN
 

 

 

-nm_setting_vpn_new, function in NMSettingVPN
+nm_setting_vpn_new, function in NMSettingVPN
 

 

 

-nm_setting_vpn_remove_data_item, function in NMSettingVPN
+nm_setting_vpn_remove_data_item, function in NMSettingVPN
 

 

 

-nm_setting_vpn_remove_secret, function in NMSettingVPN
+nm_setting_vpn_remove_secret, function in NMSettingVPN
 

 

 

@@ -3569,15 +3368,15 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

 

 

-nm_setting_wimax_error_quark, function in NMSettingWimax
+nm_setting_wimax_error_quark, function in NMSettingWimax
 

 

 

-nm_setting_wimax_get_mac_address, function in NMSettingWimax
+nm_setting_wimax_get_mac_address, function in NMSettingWimax
 

 

 

-nm_setting_wimax_get_network_name, function in NMSettingWimax
+nm_setting_wimax_get_network_name, function in NMSettingWimax
 

 

 

@@ -3589,7 +3388,7 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

 

 

-nm_setting_wimax_new, function in NMSettingWimax
+nm_setting_wimax_new, function in NMSettingWimax
 

 

 

@@ -3597,7 +3396,7 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

 

 

-nm_setting_wired_add_s390_option, function in NMSettingWired
+nm_setting_wired_add_s390_option, function in NMSettingWired
 

 

 

@@ -3617,59 +3416,59 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

 

 

-nm_setting_wired_error_quark, function in NMSettingWired
+nm_setting_wired_error_quark, function in NMSettingWired
 

 

 

-nm_setting_wired_get_auto_negotiate, function in NMSettingWired
+nm_setting_wired_get_auto_negotiate, function in NMSettingWired
 

 

 

-nm_setting_wired_get_cloned_mac_address, function in NMSettingWired
+nm_setting_wired_get_cloned_mac_address, function in NMSettingWired
 

 

 

-nm_setting_wired_get_duplex, function in NMSettingWired
+nm_setting_wired_get_duplex, function in NMSettingWired
 

 

 

-nm_setting_wired_get_mac_address, function in NMSettingWired
+nm_setting_wired_get_mac_address, function in NMSettingWired
 

 

 

-nm_setting_wired_get_mac_address_blacklist, function in NMSettingWired
+nm_setting_wired_get_mac_address_blacklist, function in NMSettingWired
 

 

 

-nm_setting_wired_get_mtu, function in NMSettingWired
+nm_setting_wired_get_mtu, function in NMSettingWired
 

 

 

-nm_setting_wired_get_num_s390_options, function in NMSettingWired
+nm_setting_wired_get_num_s390_options, function in NMSettingWired
 

 

 

-nm_setting_wired_get_port, function in NMSettingWired
+nm_setting_wired_get_port, function in NMSettingWired
 

 

 

-nm_setting_wired_get_s390_nettype, function in NMSettingWired
+nm_setting_wired_get_s390_nettype, function in NMSettingWired
 

 

 

-nm_setting_wired_get_s390_option, function in NMSettingWired
+nm_setting_wired_get_s390_option, function in NMSettingWired
 

 

 

-nm_setting_wired_get_s390_option_by_key, function in NMSettingWired
+nm_setting_wired_get_s390_option_by_key, function in NMSettingWired
 

 

 

-nm_setting_wired_get_s390_subchannels, function in NMSettingWired
+nm_setting_wired_get_s390_subchannels, function in NMSettingWired
 

 

 

-nm_setting_wired_get_speed, function in NMSettingWired
+nm_setting_wired_get_speed, function in NMSettingWired
 

 

 

@@ -3685,7 +3484,7 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

 

 

-nm_setting_wired_new, function in NMSettingWired
+nm_setting_wired_new, function in NMSettingWired
 

 

 

@@ -3693,7 +3492,7 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

 

 

-nm_setting_wired_remove_s390_option, function in NMSettingWired
+nm_setting_wired_remove_s390_option, function in NMSettingWired
 

 

 

@@ -3717,11 +3516,11 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

 

 

-nm_setting_wireless_add_seen_bssid, function in NMSettingWireless
+nm_setting_wireless_add_seen_bssid, function in NMSettingWireless
 

 

 

-nm_setting_wireless_ap_security_compatible, function in NMSettingWireless
+nm_setting_wireless_ap_security_compatible, function in NMSettingWireless
 

 

 

@@ -3745,67 +3544,67 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

 

 

-nm_setting_wireless_error_quark, function in NMSettingWireless
+nm_setting_wireless_error_quark, function in NMSettingWireless
 

 

 

-nm_setting_wireless_get_band, function in NMSettingWireless
+nm_setting_wireless_get_band, function in NMSettingWireless
 

 

 

-nm_setting_wireless_get_bssid, function in NMSettingWireless
+nm_setting_wireless_get_bssid, function in NMSettingWireless
 

 

 

-nm_setting_wireless_get_channel, function in NMSettingWireless
+nm_setting_wireless_get_channel, function in NMSettingWireless
 

 

 

-nm_setting_wireless_get_cloned_mac_address, function in NMSettingWireless
+nm_setting_wireless_get_cloned_mac_address, function in NMSettingWireless
 

 

 

-nm_setting_wireless_get_hidden, function in NMSettingWireless
+nm_setting_wireless_get_hidden, function in NMSettingWireless
 

 

 

-nm_setting_wireless_get_mac_address, function in NMSettingWireless
+nm_setting_wireless_get_mac_address, function in NMSettingWireless
 

 

 

-nm_setting_wireless_get_mac_address_blacklist, function in NMSettingWireless
+nm_setting_wireless_get_mac_address_blacklist, function in NMSettingWireless
 

 

 

-nm_setting_wireless_get_mode, function in NMSettingWireless
+nm_setting_wireless_get_mode, function in NMSettingWireless
 

 

 

-nm_setting_wireless_get_mtu, function in NMSettingWireless
+nm_setting_wireless_get_mtu, function in NMSettingWireless
 

 

 

-nm_setting_wireless_get_num_seen_bssids, function in NMSettingWireless
+nm_setting_wireless_get_num_seen_bssids, function in NMSettingWireless
 

 

 

-nm_setting_wireless_get_rate, function in NMSettingWireless
+nm_setting_wireless_get_rate, function in NMSettingWireless
 

 

 

-nm_setting_wireless_get_security, function in NMSettingWireless
+nm_setting_wireless_get_security, function in NMSettingWireless
 

 

 

-nm_setting_wireless_get_seen_bssid, function in NMSettingWireless
+nm_setting_wireless_get_seen_bssid, function in NMSettingWireless
 

 

 

-nm_setting_wireless_get_ssid, function in NMSettingWireless
+nm_setting_wireless_get_ssid, function in NMSettingWireless
 

 

 

-nm_setting_wireless_get_tx_power, function in NMSettingWireless
+nm_setting_wireless_get_tx_power, function in NMSettingWireless
 

 

 

@@ -3841,7 +3640,7 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

 

 

-nm_setting_wireless_new, function in NMSettingWireless
+nm_setting_wireless_new, function in NMSettingWireless
 

 

 

@@ -3853,15 +3652,15 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

 

 

-nm_setting_wireless_security_add_group, function in NMSettingWirelessSecurity
+nm_setting_wireless_security_add_group, function in NMSettingWirelessSecurity
 

 

 

-nm_setting_wireless_security_add_pairwise, function in NMSettingWirelessSecurity
+nm_setting_wireless_security_add_pairwise, function in NMSettingWirelessSecurity
 

 

 

-nm_setting_wireless_security_add_proto, function in NMSettingWirelessSecurity
+nm_setting_wireless_security_add_proto, function in NMSettingWirelessSecurity
 

 

 

@@ -3869,15 +3668,15 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

 

 

-nm_setting_wireless_security_clear_groups, function in NMSettingWirelessSecurity
+nm_setting_wireless_security_clear_groups, function in NMSettingWirelessSecurity
 

 

 

-nm_setting_wireless_security_clear_pairwise, function in NMSettingWirelessSecurity
+nm_setting_wireless_security_clear_pairwise, function in NMSettingWirelessSecurity
 

 

 

-nm_setting_wireless_security_clear_protos, function in NMSettingWirelessSecurity
+nm_setting_wireless_security_clear_protos, function in NMSettingWirelessSecurity
 

 

 

@@ -3885,75 +3684,75 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

 

 

-nm_setting_wireless_security_error_quark, function in NMSettingWirelessSecurity
+nm_setting_wireless_security_error_quark, function in NMSettingWirelessSecurity
 

 

 

-nm_setting_wireless_security_get_auth_alg, function in NMSettingWirelessSecurity
+nm_setting_wireless_security_get_auth_alg, function in NMSettingWirelessSecurity
 

 

 

-nm_setting_wireless_security_get_group, function in NMSettingWirelessSecurity
+nm_setting_wireless_security_get_group, function in NMSettingWirelessSecurity
 

 

 

-nm_setting_wireless_security_get_key_mgmt, function in NMSettingWirelessSecurity
+nm_setting_wireless_security_get_key_mgmt, function in NMSettingWirelessSecurity
 

 

 

-nm_setting_wireless_security_get_leap_password, function in NMSettingWirelessSecurity
+nm_setting_wireless_security_get_leap_password, function in NMSettingWirelessSecurity
 

 

 

-nm_setting_wireless_security_get_leap_password_flags, function in NMSettingWirelessSecurity
+nm_setting_wireless_security_get_leap_password_flags, function in NMSettingWirelessSecurity
 

 

 

-nm_setting_wireless_security_get_leap_username, function in NMSettingWirelessSecurity
+nm_setting_wireless_security_get_leap_username, function in NMSettingWirelessSecurity
 

 

 

-nm_setting_wireless_security_get_num_groups, function in NMSettingWirelessSecurity
+nm_setting_wireless_security_get_num_groups, function in NMSettingWirelessSecurity
 

 

 

-nm_setting_wireless_security_get_num_pairwise, function in NMSettingWirelessSecurity
+nm_setting_wireless_security_get_num_pairwise, function in NMSettingWirelessSecurity
 

 

 

-nm_setting_wireless_security_get_num_protos, function in NMSettingWirelessSecurity
+nm_setting_wireless_security_get_num_protos, function in NMSettingWirelessSecurity
 

 

 

-nm_setting_wireless_security_get_pairwise, function in NMSettingWirelessSecurity
+nm_setting_wireless_security_get_pairwise, function in NMSettingWirelessSecurity
 

 

 

-nm_setting_wireless_security_get_proto, function in NMSettingWirelessSecurity
+nm_setting_wireless_security_get_proto, function in NMSettingWirelessSecurity
 

 

 

-nm_setting_wireless_security_get_psk, function in NMSettingWirelessSecurity
+nm_setting_wireless_security_get_psk, function in NMSettingWirelessSecurity
 

 

 

-nm_setting_wireless_security_get_psk_flags, function in NMSettingWirelessSecurity
+nm_setting_wireless_security_get_psk_flags, function in NMSettingWirelessSecurity
 

 

 

-nm_setting_wireless_security_get_wep_key, function in NMSettingWirelessSecurity
+nm_setting_wireless_security_get_wep_key, function in NMSettingWirelessSecurity
 

 

 

-nm_setting_wireless_security_get_wep_key_flags, function in NMSettingWirelessSecurity
+nm_setting_wireless_security_get_wep_key_flags, function in NMSettingWirelessSecurity
 

 

 

-nm_setting_wireless_security_get_wep_key_type, function in NMSettingWirelessSecurity
+nm_setting_wireless_security_get_wep_key_type, function in NMSettingWirelessSecurity
 

 

 

-nm_setting_wireless_security_get_wep_tx_keyidx, function in NMSettingWirelessSecurity
+nm_setting_wireless_security_get_wep_tx_keyidx, function in NMSettingWirelessSecurity
 

 

 

@@ -3977,7 +3776,7 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

 

 

-nm_setting_wireless_security_new, function in NMSettingWirelessSecurity
+nm_setting_wireless_security_new, function in NMSettingWirelessSecurity
 

 

 

@@ -3997,15 +3796,15 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

 

 

-nm_setting_wireless_security_remove_group, function in NMSettingWirelessSecurity
+nm_setting_wireless_security_remove_group, function in NMSettingWirelessSecurity
 

 

 

-nm_setting_wireless_security_remove_pairwise, function in NMSettingWirelessSecurity
+nm_setting_wireless_security_remove_pairwise, function in NMSettingWirelessSecurity
 

 

 

-nm_setting_wireless_security_remove_proto, function in NMSettingWirelessSecurity
+nm_setting_wireless_security_remove_proto, function in NMSettingWirelessSecurity
 

 

 

@@ -4013,7 +3812,7 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

 

 

-nm_setting_wireless_security_set_wep_key, function in NMSettingWirelessSecurity
+nm_setting_wireless_security_set_wep_key, function in NMSettingWirelessSecurity
 

 

 

@@ -4062,39 +3861,39 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

 
U

 

-NMUtilsSecurityType, enum in nm-utils
+NMUtilsSecurityType, enum in nm-utils
 

 

 

-nm_utils_ap_mode_security_valid, function in nm-utils
+nm_utils_ap_mode_security_valid, function in nm-utils
 

 

 

-nm_utils_deinit, function in nm-utils
+nm_utils_deinit, function in nm-utils
 

 

 

-nm_utils_escape_ssid, function in nm-utils
+nm_utils_escape_ssid, function in nm-utils
 

 

 

-nm_utils_file_is_pkcs12, function in nm-utils
+nm_utils_file_is_pkcs12, function in nm-utils
 

 

 

-nm_utils_gvalue_hash_dup, function in nm-utils
+nm_utils_gvalue_hash_dup, function in nm-utils
 

 

 

-nm_utils_hwaddr_atoba, function in nm-utils
+nm_utils_hwaddr_atoba, function in nm-utils
 

 

 

-nm_utils_hwaddr_aton, function in nm-utils
+nm_utils_hwaddr_aton, function in nm-utils
 

 

 

-nm_utils_hwaddr_len, function in nm-utils
+nm_utils_hwaddr_len, function in nm-utils
 

 

 

@@ -4102,154 +3901,154 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

 

 

-nm_utils_hwaddr_ntoa, function in nm-utils
+nm_utils_hwaddr_ntoa, function in nm-utils
 

 

 

-nm_utils_hwaddr_type, function in nm-utils
+nm_utils_hwaddr_type, function in nm-utils
 

 

 

-nm_utils_iface_valid_name, function in nm-utils
+nm_utils_iface_valid_name, function in nm-utils
 

 

 

-nm_utils_init, function in nm-utils
+nm_utils_init, function in nm-utils
 

 

 

-nm_utils_ip4_addresses_from_gvalue, function in nm-utils
+nm_utils_ip4_addresses_from_gvalue, function in nm-utils
 

 

 

-nm_utils_ip4_addresses_to_gvalue, function in nm-utils
+nm_utils_ip4_addresses_to_gvalue, function in nm-utils
 

 

 

-nm_utils_ip4_get_default_prefix, function in nm-utils
+nm_utils_ip4_get_default_prefix, function in nm-utils
 

 

 

-nm_utils_ip4_netmask_to_prefix, function in nm-utils
+nm_utils_ip4_netmask_to_prefix, function in nm-utils
 

 

 

-nm_utils_ip4_prefix_to_netmask, function in nm-utils
+nm_utils_ip4_prefix_to_netmask, function in nm-utils
 

 

 

-nm_utils_ip4_routes_from_gvalue, function in nm-utils
+nm_utils_ip4_routes_from_gvalue, function in nm-utils
 

 

 

-nm_utils_ip4_routes_to_gvalue, function in nm-utils
+nm_utils_ip4_routes_to_gvalue, function in nm-utils
 

 

 

-nm_utils_ip6_addresses_from_gvalue, function in nm-utils
+nm_utils_ip6_addresses_from_gvalue, function in nm-utils
 

 

 

-nm_utils_ip6_addresses_to_gvalue, function in nm-utils
+nm_utils_ip6_addresses_to_gvalue, function in nm-utils
 

 

 

-nm_utils_ip6_dns_from_gvalue, function in nm-utils
+nm_utils_ip6_dns_from_gvalue, function in nm-utils
 

 

 

-nm_utils_ip6_dns_to_gvalue, function in nm-utils
+nm_utils_ip6_dns_to_gvalue, function in nm-utils
 

 

 

-nm_utils_ip6_routes_from_gvalue, function in nm-utils
+nm_utils_ip6_routes_from_gvalue, function in nm-utils
 

 

 

-nm_utils_ip6_routes_to_gvalue, function in nm-utils
+nm_utils_ip6_routes_to_gvalue, function in nm-utils
 

 

 

-nm_utils_is_empty_ssid, function in nm-utils
+nm_utils_is_empty_ssid, function in nm-utils
 

 

 

-nm_utils_is_uuid, function in nm-utils
+nm_utils_is_uuid, function in nm-utils
 

 

 

-nm_utils_rsa_key_encrypt, function in nm-utils
+nm_utils_rsa_key_encrypt, function in nm-utils
 

 

 

-nm_utils_same_ssid, function in nm-utils
+nm_utils_same_ssid, function in nm-utils
 

 

 

-nm_utils_security_valid, function in nm-utils
+nm_utils_security_valid, function in nm-utils
 

 

 

-nm_utils_slist_free, function in nm-utils
+nm_utils_slist_free, function in nm-utils
 

 

 

-nm_utils_ssid_to_utf8, function in nm-utils
+nm_utils_ssid_to_utf8, function in nm-utils
 

 

 

-nm_utils_uuid_generate, function in nm-utils
+nm_utils_uuid_generate, function in nm-utils
 

 

 

-nm_utils_uuid_generate_from_string, function in nm-utils
+nm_utils_uuid_generate_from_string, function in nm-utils
 

 

 

-nm_utils_wep_key_valid, function in nm-utils
+nm_utils_wep_key_valid, function in nm-utils
 

 

 

-nm_utils_wifi_channel_to_freq, function in nm-utils
+nm_utils_wifi_channel_to_freq, function in nm-utils
 

 

 

-nm_utils_wifi_find_next_channel, function in nm-utils
+nm_utils_wifi_find_next_channel, function in nm-utils
 

 

 

-nm_utils_wifi_freq_to_channel, function in nm-utils
+nm_utils_wifi_freq_to_channel, function in nm-utils
 

 

 

-nm_utils_wifi_is_channel_valid, function in nm-utils
+nm_utils_wifi_is_channel_valid, function in nm-utils
 

 

 

-nm_utils_wpa_psk_valid, function in nm-utils
+nm_utils_wpa_psk_valid, function in nm-utils
 

 

 
V

 

-NMVlanFlags, enum in NMSettingVlan
+NMVlanFlags, enum in NMSettingVlan
 

 

 

-NMVlanPriorityMap, enum in NMSettingVlan
+NMVlanPriorityMap, enum in NMSettingVlan
 

 

 

-NMVPNIterFunc, user_function in NMSettingVPN
+NMVPNIterFunc, user_function in NMSettingVPN
 

 

 
W

 

-NMWepKeyType, enum in NMSettingWirelessSecurity
+NMWepKeyType, enum in NMSettingWirelessSecurity
 

 

 

 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.20
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/ch01.html b/docs/libnm-util/html/ch01.html
index 5b79f668..6b733efe 100644
--- a/docs/libnm-util/html/ch01.html
+++ b/docs/libnm-util/html/ch01.html
@@ -2,22 +2,22 @@
 
 
 
-libnm-util API Reference
+libnm-util Reference Manual: libnm-util API Reference
 
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
+
+
+
+
+
+
 

 

@@ -105,6 +105,6 @@ that require PPP to deliver IP capability
 

 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.20

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/home.png b/docs/libnm-util/html/home.png
index 17003611..9346b336 100644
Binary files a/docs/libnm-util/html/home.png and b/docs/libnm-util/html/home.png differ
diff --git a/docs/libnm-util/html/index.html b/docs/libnm-util/html/index.html
index a7e470a3..8eecb7c8 100644
--- a/docs/libnm-util/html/index.html
+++ b/docs/libnm-util/html/index.html
@@ -2,11 +2,11 @@
 
 
 
-libnm-util Reference Manual
+libnm-util Reference Manual: libnm-util Reference Manual
 
 
 
-
+
 
 
 
@@ -15,10 +15,10 @@
 

 

 

-      for libnm-util 0.9.8.8
+      for libnm-util 0.9.8.10
 
       The latest version of this documentation can be found on-line at
-      http://projects.gnome.org/NetworkManager/developers/libnm-util/09/.
+      https://developer.gnome.org/libnm-util/0.9/.
     

 
Copyright © 2012 The NetworkManager Authors

 

@@ -135,6 +135,6 @@ that require PPP to deliver IP capability
 

 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.20

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/index.sgml b/docs/libnm-util/html/index.sgml
index 203b6e1b..9fbc3d5c 100644
--- a/docs/libnm-util/html/index.sgml
+++ b/docs/libnm-util/html/index.sgml
@@ -1,22 +1,14 @@
-
+
 
-
-
-
+
 
 
+
+
+
 
-
-
-
-
-
-
-
+
 
-
-
-
 
 
 
@@ -66,64 +58,37 @@
 
 
 
+
+
+
+
+
 
 
 
 
 
 
-
-
-
-
-
-
-
+
 
+
+
+
 
-
-
-
-
-
-
-
+
 
 
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
-
 
-
-
-
-
 
 
 
 
 
 
-
-
-
-
 
 
 
@@ -134,37 +99,26 @@
 
 
 
+
+
+
+
+
+
+
+
+
 
 
 
-
-
-
+
 
+
+
+
 
-
-
-
-
-
-
-
-
-
+
 
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 
@@ -185,6 +139,22 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -198,32 +168,14 @@
 
 
 
-
-
-
+
 
+
+
+
 
-
-
-
-
-
-
-
+
 
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 
@@ -240,6 +192,21 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -253,40 +220,14 @@
 
 
 
-
-
-
+
 
+
+
+
 
-
-
-
-
-
-
-
-
-
+
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 
@@ -305,6 +246,27 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -321,48 +283,14 @@
 
 
 
-
-
-
-
+
 
+
+
+
 
-
-
-
-
-
-
-
-
-
-
-
+
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 
@@ -391,6 +319,28 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -410,60 +360,52 @@
 
 
 
-
-
-
+
 
+
+
+
 
-
+
+
+
+
+
+
 
-
-
-
-
-
+
 
-
 
 
 
 
-
-
-
-
-
 
 
 
 
-
-
-
+
 
+
+
+
 
-
-
-
-
-
-
-
-
+
 
-
-
-
-
-
-
-
 
 
 
 
 
 
+
+
+
+
+
+
+
+
+
 
 
 
@@ -471,90 +413,41 @@
 
 
 
-
-
-
+
 
+
+
+
 
-
-
-
-
-
-
-
-
+
 
-
-
-
-
-
-
 
 
 
 
 
+
+
+
+
+
+
+
+
 
 
 
 
 
 
-
-
-
-
-
+
 
+
+
+
 
-
-
-
-
-
-
-
-
+
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 
@@ -567,6 +460,23 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -580,55 +490,35 @@
 
 
 
-
-
-
+
 
+
+
+
 
-
-
-
-
-
-
-
+
 
-
-
-
-
 
 
 
+
+
+
+
+
+
 
 
 
 
-
-
-
+
 
+
+
+
 
-
-
-
-
-
-
-
-
-
+
 
-
-
-
-
-
-
-
-
-
-
 
 
 
@@ -638,32 +528,30 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
 
-
-
-
+
 
+
+
+
 
-
-
-
-
-
-
-
+
 
-
-
-
-
-
-
-
-
-
 
 
 
@@ -672,6 +560,17 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -681,91 +580,62 @@
 
 
 
-
-
-
+
 
+
+
+
 
-
-
-
-
-
-
-
+
 
-
-
-
-
-
 
 
 
 
+
+
+
+
+
+
+
 
 
 
 
 
-
-
-
+
 
+
+
+
 
-
-
-
-
-
-
-
+
 
-
-
-
-
-
 
 
 
 
+
+
+
+
+
+
+
 
 
 
 
 
-
-
-
-
-
+
 
+
+
+
 
-
-
-
-
-
-
-
-
+
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 
@@ -777,6 +647,18 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -785,46 +667,49 @@
 
 
 
-
-
-
+
 
+
+
 
-
-
-
-
-
-
-
+
 
-
-
-
-
-
 
 
 
 
+
+
+
+
+
+
+
 
 
 
 
 
-
-
-
+
 
+
+
+
 
-
+
+
+
+
+
+
+
+
+
+
+
 
-
-
-
-
+
 
-
 
 
 
@@ -835,18 +720,8 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
+
+
 
 
 
@@ -856,64 +731,14 @@
 
 
 
-
-
-
-
-
+
 
+
+
+
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 
@@ -979,6 +804,44 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -1013,40 +876,16 @@
 
 
 
-
-
+
+
 
 
+
 
-
+
 
-
-
-
-
-
-
-
-
+
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 
@@ -1058,7 +897,6 @@
 
 
 
-
 
 
 
@@ -1072,8 +910,6 @@
 
 
 
-
-
 
 
 
@@ -1103,6 +939,27 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -1117,46 +974,16 @@
 
 
 
-
-
-
+
+
 
 
+
 
-
+
 
-
-
-
-
-
-
-
-
+
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 
@@ -1168,7 +995,6 @@
 
 
 
-
 
 
 
@@ -1182,8 +1008,6 @@
 
 
 
-
-
 
 
 
@@ -1212,6 +1036,28 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -1225,40 +1071,14 @@
 
 
 
-
-
-
+
 
+
+
+
 
-
-
-
-
-
-
-
-
+
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 
@@ -1278,6 +1098,28 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -1298,56 +1140,41 @@
 
 
 
-
-
-
+
 
+
+
+
 
-
-
-
-
-
-
-
-
+
 
-
-
-
-
-
-
 
 
 
 
 
+
+
+
+
+
+
+
+
 
 
 
 
 
 
-
-
-
+
 
+
+
+
 
-
-
-
-
-
-
-
+
 
-
-
-
-
-
-
 
 
 
@@ -1362,17 +1189,26 @@
 
 
 
+
+
+
+
+
+
+
+
 
 
 
 
 
 
-
-
+
+
 
+
 
-
+
 
 
 
@@ -1381,16 +1217,6 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
 
 
 
@@ -1416,7 +1242,6 @@
 
 
 
-
 
 
 
@@ -1424,11 +1249,15 @@
 
 
 
-
+
+
+
 
-
+
+
+
 
 
-
-
+
 
+
diff --git a/docs/libnm-util/html/left-insensitive.png b/docs/libnm-util/html/left-insensitive.png
new file mode 100644
index 00000000..3269393a
Binary files /dev/null and b/docs/libnm-util/html/left-insensitive.png differ
diff --git a/docs/libnm-util/html/left.png b/docs/libnm-util/html/left.png
index 2d05b3d5..2abde032 100644
Binary files a/docs/libnm-util/html/left.png and b/docs/libnm-util/html/left.png differ
diff --git a/docs/libnm-util/html/libnm-util-nm-utils.html b/docs/libnm-util/html/libnm-util-nm-utils.html
index 91e04c2d..22e4362b 100644
--- a/docs/libnm-util/html/libnm-util-nm-utils.html
+++ b/docs/libnm-util/html/libnm-util-nm-utils.html
@@ -2,32 +2,27 @@
 
 
 
-nm-utils
+libnm-util Reference Manual: nm-utils
 
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
 

 

 

@@ -35,263 +30,552 @@
 
nm-utils
nm-utils — Utility functions

-
+

 
 
 

-

-
Synopsis

-
-#include <nm-utils.h>
-
-gboolean            nm_utils_init                       (GError **error);
-void                nm_utils_deinit                     (void);
-gboolean            nm_utils_is_empty_ssid              (const guint8 *ssid,
-                                                         int len);
-const char *        nm_utils_escape_ssid                (const guint8 *ssid,
-                                                         guint32 len);
-gboolean            nm_utils_same_ssid                  (const GByteArray *ssid1,
-                                                         const GByteArray *ssid2,
-                                                         gboolean ignore_trailing_null);
-char *              nm_utils_ssid_to_utf8               (const GByteArray *ssid);
-GHashTable *        nm_utils_gvalue_hash_dup            (GHashTable *hash);
-void                nm_utils_slist_free                 (GSList *list,
-                                                         GDestroyNotify elem_destroy_fn);
-enum                NMUtilsSecurityType;
-gboolean            nm_utils_security_valid             (NMUtilsSecurityType type,
-                                                         NMDeviceWifiCapabilities wifi_caps,
-                                                         gboolean have_ap,
-                                                         gboolean adhoc,
-                                                         NM80211ApFlags ap_flags,
-                                                         NM80211ApSecurityFlags ap_wpa,
-                                                         NM80211ApSecurityFlags ap_rsn);
-gboolean            nm_utils_ap_mode_security_valid     (NMUtilsSecurityType type,
-                                                         NMDeviceWifiCapabilities wifi_caps);
-gboolean            nm_utils_wep_key_valid              (const char *key,
-                                                         NMWepKeyType wep_type);
-gboolean            nm_utils_wpa_psk_valid              (const char *psk);
-GSList *            nm_utils_ip4_addresses_from_gvalue  (const GValue *value);
-void                nm_utils_ip4_addresses_to_gvalue    (GSList *list,
-                                                         GValue *value);
-GSList *            nm_utils_ip4_routes_from_gvalue     (const GValue *value);
-void                nm_utils_ip4_routes_to_gvalue       (GSList *list,
-                                                         GValue *value);
-guint32             nm_utils_ip4_netmask_to_prefix      (guint32 netmask);
-guint32             nm_utils_ip4_prefix_to_netmask      (guint32 prefix);
-guint32             nm_utils_ip4_get_default_prefix     (guint32 ip);
-GSList *            nm_utils_ip6_addresses_from_gvalue  (const GValue *value);
-void                nm_utils_ip6_addresses_to_gvalue    (GSList *list,
-                                                         GValue *value);
-GSList *            nm_utils_ip6_routes_from_gvalue     (const GValue *value);
-void                nm_utils_ip6_routes_to_gvalue       (GSList *list,
-                                                         GValue *value);
-GSList *            nm_utils_ip6_dns_from_gvalue        (const GValue *value);
-void                nm_utils_ip6_dns_to_gvalue          (GSList *list,
-                                                         GValue *value);
-char *              nm_utils_uuid_generate              (void);
-char *              nm_utils_uuid_generate_from_string  (const char *s);
-GByteArray *        nm_utils_rsa_key_encrypt            (const GByteArray *data,
-                                                         const char *in_password,
-                                                         char **out_password,
-                                                         GError **error);
-gboolean            nm_utils_file_is_pkcs12             (const char *filename);
-guint32             nm_utils_wifi_freq_to_channel       (guint32 freq);
-guint32             nm_utils_wifi_channel_to_freq       (guint32 channel,
-                                                         const char *band);
-guint32             nm_utils_wifi_find_next_channel     (guint32 channel,
-                                                         int direction,
-                                                         char *band);
-gboolean            nm_utils_wifi_is_channel_valid      (guint32 channel,
-                                                         const char *band);
-#define             NM_UTILS_HWADDR_LEN_MAX
-int                 nm_utils_hwaddr_len                 (int type);
-int                 nm_utils_hwaddr_type                (int len);
-char *              nm_utils_hwaddr_ntoa                (gconstpointer addr,
-                                                         int type);
-GByteArray *        nm_utils_hwaddr_atoba               (const char *asc,
-                                                         int type);
-guint8 *            nm_utils_hwaddr_aton                (const char *asc,
-                                                         int type,
-                                                         gpointer buffer);
-gboolean            nm_utils_iface_valid_name           (const char *name);
-gboolean            nm_utils_is_uuid                    (const char *str);
-

+

+
Functions

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





+gboolean
+
+nm_utils_init ()
+

+void
+
+nm_utils_deinit ()
+

+gboolean
+
+nm_utils_is_empty_ssid ()
+
const char *
+
+nm_utils_escape_ssid ()
+

+gboolean
+
+nm_utils_same_ssid ()
+

+char *
+
+nm_utils_ssid_to_utf8 ()
+

+GHashTable *
+
+nm_utils_gvalue_hash_dup ()
+

+void
+
+nm_utils_slist_free ()
+

+gboolean
+
+nm_utils_security_valid ()
+

+gboolean
+
+nm_utils_ap_mode_security_valid ()
+

+gboolean
+
+nm_utils_wep_key_valid ()
+

+gboolean
+
+nm_utils_wpa_psk_valid ()
+

+GSList *
+
+nm_utils_ip4_addresses_from_gvalue ()
+

+void
+
+nm_utils_ip4_addresses_to_gvalue ()
+

+GSList *
+
+nm_utils_ip4_routes_from_gvalue ()
+

+void
+
+nm_utils_ip4_routes_to_gvalue ()
+

+guint32
+
+nm_utils_ip4_netmask_to_prefix ()
+

+guint32
+
+nm_utils_ip4_prefix_to_netmask ()
+

+guint32
+
+nm_utils_ip4_get_default_prefix ()
+

+GSList *
+
+nm_utils_ip6_addresses_from_gvalue ()
+

+void
+
+nm_utils_ip6_addresses_to_gvalue ()
+

+GSList *
+
+nm_utils_ip6_routes_from_gvalue ()
+

+void
+
+nm_utils_ip6_routes_to_gvalue ()
+

+GSList *
+
+nm_utils_ip6_dns_from_gvalue ()
+

+void
+
+nm_utils_ip6_dns_to_gvalue ()
+

+char *
+
+nm_utils_uuid_generate ()
+

+char *
+
+nm_utils_uuid_generate_from_string ()
+

+GByteArray *
+
+nm_utils_rsa_key_encrypt ()
+

+gboolean
+
+nm_utils_file_is_pkcs12 ()
+

+guint32
+
+nm_utils_wifi_freq_to_channel ()
+

+guint32
+
+nm_utils_wifi_channel_to_freq ()
+

+guint32
+
+nm_utils_wifi_find_next_channel ()
+

+gboolean
+
+nm_utils_wifi_is_channel_valid ()
+

+int
+
+nm_utils_hwaddr_len ()
+

+int
+
+nm_utils_hwaddr_type ()
+

+char *
+
+nm_utils_hwaddr_ntoa ()
+

+GByteArray *
+
+nm_utils_hwaddr_atoba ()
+

+guint8 *
+
+nm_utils_hwaddr_aton ()
+

+gboolean
+
+nm_utils_iface_valid_name ()
+

+gboolean
+
+nm_utils_is_uuid ()
+

+

+

+
Types and Values

+

++++
+
+
+
+
+
+
+
+
+
+
+




enumNMUtilsSecurityType
#defineNM_UTILS_HWADDR_LEN_MAX

 

 

 
Object Hierarchy

-
-  GEnum
-   +----NMUtilsSecurityType
+
    GEnum
+    ╰── NMUtilsSecurityType
+

+

+

+
Includes

+
#include <nm-utils.h>
 

 

 

 
Description

-

-A collection of utility functions for working SSIDs, IP addresses, WiFi
-access points and devices, among other things.
-

+
A collection of utility functions for working SSIDs, IP addresses, WiFi
+access points and devices, among other things.

 

 

-
Details

+
Functions

 

-
nm_utils_init ()

-
gboolean            nm_utils_init                       (GError **error);

-

-Initializes libnm-util; should be called when starting and program that
+
nm_utils_init ()

+
gboolean
+nm_utils_init (GError **error);

+
Initializes libnm-util; should be called when starting and program that
 uses libnm-util.  Sets up an atexit() handler to ensure de-initialization
-is performed, but calling nm_utils_deinit() to explicitly deinitialize
-libnm-util can also be done.  This function can be called more than once.
-

-

+is performed, but calling nm_utils_deinit() to explicitly deinitialize
+libnm-util can also be done.  This function can be called more than once.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
error :
location to store error, or NULL
-
Returns :
TRUE if the initialization was successful, FALSE on failure.
error
location to store error, or NULL
 

 

 

+

+
Returns

+
 TRUE if the initialization was successful, FALSE on failure.

+

+

+

 

 

-
nm_utils_deinit ()

-
void                nm_utils_deinit                     (void);

-

-Frees all resources used internally by libnm-util.  This function is called
-from an atexit() handler, set up by nm_utils_init(), but is safe to be called
-more than once.  Subsequent calls have no effect until nm_utils_init() is
-called again.
-

+
nm_utils_deinit ()

+
void
+nm_utils_deinit (void);

+
Frees all resources used internally by libnm-util.  This function is called
+from an atexit() handler, set up by nm_utils_init(), but is safe to be called
+more than once.  Subsequent calls have no effect until nm_utils_init() is
+called again.

 

 

 

-
nm_utils_is_empty_ssid ()

-
gboolean            nm_utils_is_empty_ssid              (const guint8 *ssid,
-                                                         int len);

-

-Different manufacturers use different mechanisms for not broadcasting the
+
nm_utils_is_empty_ssid ()

+
gboolean
+nm_utils_is_empty_ssid (const guint8 *ssid,
+                        int len);

+
Different manufacturers use different mechanisms for not broadcasting the
 AP's SSID.  This function attempts to detect blank/empty SSIDs using a
-number of known SSID-cloaking methods.
-

-

+number of known SSID-cloaking methods.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
-
-
-
-
+
+
+

 





 
 
 
ssid :
pointer to a buffer containing the SSID data
ssid
pointer to a buffer containing the SSID data
 
 

 
len :
length of the SSID data in ssid
-
Returns :
TRUE if the SSID is "empty", FALSE if it is not
len
length of the SSID data in ssid
+
 
 

 
 

 

+

+
Returns

+
 TRUE if the SSID is "empty", FALSE if it is not

+

+

+

 

 

-
nm_utils_escape_ssid ()

-
const char *        nm_utils_escape_ssid                (const guint8 *ssid,
-                                                         guint32 len);

-

-This function does a quick printable character conversion of the SSID, simply
+
nm_utils_escape_ssid ()

+
const char *
+nm_utils_escape_ssid (const guint8 *ssid,
+                      guint32 len);

+
This function does a quick printable character conversion of the SSID, simply
 replacing embedded NULLs and non-printable characters with the hexadecimal
 representation of that character.  Intended for debugging only, should not
-be used for display of SSIDs.
-

-

+be used for display of SSIDs.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
-
-
-
-
+
+
+

 





 
 
 
ssid :
pointer to a buffer containing the SSID data
ssid
pointer to a buffer containing the SSID data
 
 

 
len :
length of the SSID data in ssid
-
Returns :
pointer to the escaped SSID, which uses an internal static buffer
-and will be overwritten by subsequent calls to this function
len
length of the SSID data in ssid
+
 
 

 
 

 

+

+
Returns

+
 pointer to the escaped SSID, which uses an internal static buffer
+and will be overwritten by subsequent calls to this function

+

+

+

 

 

-
nm_utils_same_ssid ()

-
gboolean            nm_utils_same_ssid                  (const GByteArray *ssid1,
-                                                         const GByteArray *ssid2,
-                                                         gboolean ignore_trailing_null);

-

-Earlier versions of the Linux kernel added a NULL byte to the end of the
+
nm_utils_same_ssid ()

+
gboolean
+nm_utils_same_ssid (const GByteArray *ssid1,
+                    const GByteArray *ssid2,
+                    gboolean ignore_trailing_null);

+
Earlier versions of the Linux kernel added a NULL byte to the end of the
 SSID to enable easy printing of the SSID on the console or in a terminal,
 but this behavior was problematic (SSIDs are simply byte arrays, not strings)
 and thus was changed.  This function compensates for that behavior at the
 cost of some compatibility with odd SSIDs that may legitimately have trailing
-NULLs, even though that is functionally pointless.
-

-

+NULLs, even though that is functionally pointless.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+
-
-
-
-
-
-
+
+
+

 





 
 
 
ssid1 :
first SSID data to compare
ssid1
first SSID data to compare
 
 

 
ssid2 :
second SSID data to compare
ssid2
second SSID data to compare
 
 

 
ignore_trailing_null :
TRUE to ignore one trailing NULL byte
Returns :
TRUE if the SSIDs are the same, FALSE if they are not
ignore_trailing_null
TRUE to ignore one trailing NULL byte
 
 

 
 

 

+

+
Returns

+
 TRUE if the SSIDs are the same, FALSE if they are not

+

+

+

 

 

-
nm_utils_ssid_to_utf8 ()

-
char *              nm_utils_ssid_to_utf8               (const GByteArray *ssid);

-

-WiFi SSIDs are byte arrays, they are _not_ strings.  Thus, an SSID may
+
nm_utils_ssid_to_utf8 ()

+
char *
+nm_utils_ssid_to_utf8 (const GByteArray *ssid);

+
WiFi SSIDs are byte arrays, they are _not_ strings.  Thus, an SSID may
 contain embedded NULLs and other unprintable characters.  Often it is
 useful to print the SSID out for debugging purposes, but that should be the
 _only_ use of this function.  Do not use this function for any persistent
 storage of the SSID, since the printable SSID returned from this function
-cannot be converted back into the real SSID of the access point.
-

-

-This function does almost everything humanly possible to convert the input
-into a printable UTF-8 string, using roughly the following procedure:
-

-

-1) if the input data is already UTF-8 safe, no conversion is performed
+cannot be converted back into the real SSID of the access point.

+
This function does almost everything humanly possible to convert the input
+into a printable UTF-8 string, using roughly the following procedure:

+
1) if the input data is already UTF-8 safe, no conversion is performed
 2) attempts to get the current system language from the LANG environment
    variable, and depending on the language, uses a table of alternative
    encodings to try.  For example, if LANG=hu_HU, the table may first try
@@ -299,1146 +583,1292 @@ into a printable UTF-8 string, using roughly the following procedure:
    If all fallback encodings fail, replaces non-UTF-8 characters with '?'.
 3) If the system language was unable to be determined, falls back to the
    ISO-8859-1 encoding, then to the Windows-1251 encoding.
-4) If step 3 fails, replaces non-UTF-8 characters with '?'.
-

-

-Again, this function should be used for debugging and display purposes
-_only_.
-

-

+4) If step 3 fails, replaces non-UTF-8 characters with '?'.

+
Again, this function should be used for debugging and display purposes
+_only_.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
ssid :
a byte array containing the SSID data
Returns :
an allocated string containing a UTF-8
-representation of the SSID, which must be freed by the caller using g_free().
-Returns NULL on errors. [transfer full]
-
ssid
a byte array containing the SSID data
 

 

 

-

-

-
nm_utils_gvalue_hash_dup ()

-
GHashTable *        nm_utils_gvalue_hash_dup            (GHashTable *hash);

-

-Utility function to duplicate a hash table of GValues.
-

-

----
-
-
-
-
-
-
-
-
-
-
-




hash :
a GHashTable mapping string:GValue
Returns :
a newly allocated duplicated GHashTable, caller must free the
-returned hash with g_hash_table_unref() or g_hash_table_destroy(). [transfer container][element-type utf8 GObject.Value]
-

+

+
Returns

+
 an allocated string containing a UTF-8
+representation of the SSID, which must be freed by the caller using g_free().
+Returns NULL on errors. 

+
[transfer full]

+

 

 

 

-
nm_utils_slist_free ()

-
void                nm_utils_slist_free                 (GSList *list,
-                                                         GDestroyNotify elem_destroy_fn);

-

-Utility function to free a GSList.
-

-

+
nm_utils_gvalue_hash_dup ()

+
GHashTable *
+nm_utils_gvalue_hash_dup (GHashTable *hash);

+
Utility function to duplicate a hash table of GValues.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
list :
a GSList
-
elem_destroy_fn :
user function called for each element in list
-
hash
a GHashTable mapping string:GValue
 

 

 

+

+
Returns

+
 a newly allocated duplicated GHashTable, caller must free the
+returned hash with g_hash_table_unref() or g_hash_table_destroy(). 

+
[transfer container][element-type utf8 GObject.Value]

+

+

 

 

-
enum NMUtilsSecurityType

-
typedef enum {
-	NMU_SEC_INVALID = 0,
-	NMU_SEC_NONE,
-	NMU_SEC_STATIC_WEP,
-	NMU_SEC_LEAP,
-	NMU_SEC_DYNAMIC_WEP,
-	NMU_SEC_WPA_PSK,
-	NMU_SEC_WPA_ENTERPRISE,
-	NMU_SEC_WPA2_PSK,
-	NMU_SEC_WPA2_ENTERPRISE
-} NMUtilsSecurityType;
-

-

-Describes generic security mechanisms that 802.11 access points may offer.
-Used with nm_utils_security_valid() for checking whether a given access
-point is compatible with a network device.
-

-

+
nm_utils_slist_free ()

+
void
+nm_utils_slist_free (GSList *list,
+                     GDestroyNotify elem_destroy_fn);

+
Utility function to free a GSList.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+

 





 
 
 
NMU_SEC_INVALID
unknown or invalid security, placeholder and not used
-
NMU_SEC_NONE
unencrypted and open
-
NMU_SEC_STATIC_WEP
static WEP keys are used for encryption
-
NMU_SEC_LEAP
Cisco LEAP is used for authentication and for generating the
-dynamic WEP keys automatically
-
NMU_SEC_DYNAMIC_WEP
standard 802.1x is used for authentication and
-generating the dynamic WEP keys automatically
-
NMU_SEC_WPA_PSK
WPA1 is used with Pre-Shared Keys (PSK)
-
list
a GSList
 
 

 
NMU_SEC_WPA_ENTERPRISE
WPA1 is used with 802.1x authentication
-
NMU_SEC_WPA2_PSK
WPA2/RSN is used with Pre-Shared Keys (PSK)
-
NMU_SEC_WPA2_ENTERPRISE
WPA2 is used with 802.1x authentication
-
elem_destroy_fn
user function called for each element in list
+
 
 

 
 

 

+

 

 

-
nm_utils_security_valid ()

-
gboolean            nm_utils_security_valid             (NMUtilsSecurityType type,
-                                                         NMDeviceWifiCapabilities wifi_caps,
-                                                         gboolean have_ap,
-                                                         gboolean adhoc,
-                                                         NM80211ApFlags ap_flags,
-                                                         NM80211ApSecurityFlags ap_wpa,
-                                                         NM80211ApSecurityFlags ap_rsn);

-

-Given a set of device capabilities, and a desired security type to check
+
nm_utils_security_valid ()

+
gboolean
+nm_utils_security_valid (NMUtilsSecurityType type,
+                         NMDeviceWifiCapabilities wifi_caps,
+                         gboolean have_ap,
+                         gboolean adhoc,
+                         NM80211ApFlags ap_flags,
+                         NM80211ApSecurityFlags ap_wpa,
+                         NM80211ApSecurityFlags ap_rsn);

+
Given a set of device capabilities, and a desired security type to check
 against, determines whether the combination of device, desired security
-type, and AP capabilities intersect.
-

-

-NOTE: this function cannot handle checking security for AP/Hotspot mode;
-use nm_utils_ap_mode_security_valid() instead.
-

-

+type, and AP capabilities intersect.

+
NOTE: this function cannot handle checking security for AP/Hotspot mode;
+use nm_utils_ap_mode_security_valid() instead.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
-
-
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+

 





 
 
 
type :
the security type to check AP flags and device capabilties against,
-e.g. NMU_SEC_STATIC_WEP
-
type
the security type to check AP flags and device capabilties against,
+e.g. NMU_SEC_STATIC_WEP
 
 

 
wifi_caps :
bitfield of the capabilities of the specific WiFi device, e.g.
-NM_WIFI_DEVICE_CAP_CIPHER_WEP40
-
have_ap :
whether the ap_flags, ap_wpa, and ap_rsn arguments are valid
wifi_caps
bitfield of the capabilities of the specific WiFi device, e.g.
+NM_WIFI_DEVICE_CAP_CIPHER_WEP40
 
 

 
adhoc :
whether the capabilities being tested are from an Ad-Hoc AP (IBSS)
have_ap
whether the ap_flags
+, ap_wpa
+, and ap_rsn
+arguments are valid
 
 

 
ap_flags :
bitfield of AP capabilities, e.g. NM_802_11_AP_FLAGS_PRIVACY
-
adhoc
whether the capabilities being tested are from an Ad-Hoc AP (IBSS)
 
 

 
ap_wpa :
bitfield of AP capabilties derived from the AP's WPA beacon,
-e.g. (NM_802_11_AP_SEC_PAIR_TKIP | NM_802_11_AP_SEC_KEY_MGMT_PSK)
ap_flags
bitfield of AP capabilities, e.g. NM_802_11_AP_FLAGS_PRIVACY
 
 

 
ap_rsn :
bitfield of AP capabilties derived from the AP's RSN/WPA2 beacon,
-e.g. (NM_802_11_AP_SEC_PAIR_CCMP | NM_802_11_AP_SEC_PAIR_TKIP)
ap_wpa
bitfield of AP capabilties derived from the AP's WPA beacon,
+e.g. (NM_802_11_AP_SEC_PAIR_TKIP | NM_802_11_AP_SEC_KEY_MGMT_PSK)
 
 

 
Returns :
TRUE if the device capabilities and AP capabilties intersect and are
-compatible with the desired type, FALSE if they are not
ap_rsn
bitfield of AP capabilties derived from the AP's RSN/WPA2 beacon,
+e.g. (NM_802_11_AP_SEC_PAIR_CCMP | NM_802_11_AP_SEC_PAIR_TKIP)
 
 

 
 

 

+

+
Returns

+
 TRUE if the device capabilities and AP capabilties intersect and are
+compatible with the desired type
+, FALSE if they are not

+

+

+
 

 

-
nm_utils_ap_mode_security_valid ()

-
gboolean            nm_utils_ap_mode_security_valid     (NMUtilsSecurityType type,
-                                                         NMDeviceWifiCapabilities wifi_caps);

-

-Given a set of device capabilities, and a desired security type to check
+
nm_utils_ap_mode_security_valid ()

+
gboolean
+nm_utils_ap_mode_security_valid (NMUtilsSecurityType type,
+                                 NMDeviceWifiCapabilities wifi_caps);

+
Given a set of device capabilities, and a desired security type to check
 against, determines whether the combination of device capabilities and
-desired security type are valid for AP/Hotspot connections.
-

-

+desired security type are valid for AP/Hotspot connections.

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+

 





 
 
 
type :
the security type to check device capabilties against,
-e.g. NMU_SEC_STATIC_WEP
-
wifi_caps :
bitfield of the capabilities of the specific WiFi device, e.g.
-NM_WIFI_DEVICE_CAP_CIPHER_WEP40
-
type
the security type to check device capabilties against,
+e.g. NMU_SEC_STATIC_WEP
 
 

 
Returns :
TRUE if the device capabilities are compatible with the desired
-type, FALSE if they are not.
wifi_caps
bitfield of the capabilities of the specific WiFi device, e.g.
+NM_WIFI_DEVICE_CAP_CIPHER_WEP40
 
 

 
 

+

+

+
Returns

+
 TRUE if the device capabilities are compatible with the desired
+type
+, FALSE if they are not.

+

+

 
Since 0.9.8

 
 

 

-
nm_utils_wep_key_valid ()

-
gboolean            nm_utils_wep_key_valid              (const char *key,
-                                                         NMWepKeyType wep_type);

-

-Checks if key is a valid WEP key
-

-

+
nm_utils_wep_key_valid ()

+
gboolean
+nm_utils_wep_key_valid (const char *key,
+                        NMWepKeyType wep_type);

+
Checks if key
+ is a valid WEP key

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
-
-
-
-
+
+
+

 





 
 
 
key :
a string that might be a WEP key
key
a string that might be a WEP key
 
 

 
wep_type :
the NMWepKeyType type of the WEP key
Returns :

-TRUE if key is a WEP key, FALSE if not
wep_type
the NMWepKeyType type of the WEP key
 
 

 
 

+

+

+
Returns

+
 TRUE if key
+is a WEP key, FALSE if not

+

+

 
Since 0.9.8

 
 

 

-
nm_utils_wpa_psk_valid ()

-
gboolean            nm_utils_wpa_psk_valid              (const char *psk);

-

-Checks if psk is a valid WPA PSK
-

-

+
nm_utils_wpa_psk_valid ()

+
gboolean
+nm_utils_wpa_psk_valid (const char *psk);

+
Checks if psk
+ is a valid WPA PSK

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
psk :
a string that might be a WPA PSK
Returns :

-TRUE if psk is a WPA PSK, FALSE if not
psk
a string that might be a WPA PSK
 

 

+

+

+
Returns

+
 TRUE if psk
+is a WPA PSK, FALSE if not

+

+

 
Since 0.9.8

 
 

 

-
nm_utils_ip4_addresses_from_gvalue ()

-
GSList *            nm_utils_ip4_addresses_from_gvalue  (const GValue *value);

-

-Utility function to convert a GPtrArray of GArrays of guint32s representing
+
nm_utils_ip4_addresses_from_gvalue ()

+
GSList *
+nm_utils_ip4_addresses_from_gvalue (const GValue *value);

+
Utility function to convert a GPtrArray of GArrays of guint32s representing
 a list of NetworkManager IPv4 addresses (which is a tuple of address, gateway,
 and prefix) into a GSList of NMIP4Address objects.  The specific format of
 this serialization is not guaranteed to be stable and the GArray may be
-extended in the future.
-

-

+extended in the future.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
value :
gvalue containing a GPtrArray of GArrays of guint32s
Returns :
a newly allocated GSList of NMIP4Address objects. [transfer full][element-type NetworkManager.IP4Address]
-
value
gvalue containing a GPtrArray of GArrays of guint32s
 

 

 

+

+
Returns

+
 a newly allocated GSList of NMIP4Address objects. 

+
[transfer full][element-type NetworkManager.IP4Address]

+

+
 

 

-
nm_utils_ip4_addresses_to_gvalue ()

-
void                nm_utils_ip4_addresses_to_gvalue    (GSList *list,
-                                                         GValue *value);

-

-Utility function to convert a GSList of NMIP4Address objects into a
+
nm_utils_ip4_addresses_to_gvalue ()

+
void
+nm_utils_ip4_addresses_to_gvalue (GSList *list,
+                                  GValue *value);

+
Utility function to convert a GSList of NMIP4Address objects into a
 GPtrArray of GArrays of guint32s representing a list of NetworkManager IPv4
 addresses (which is a tuple of address, gateway, and prefix).   The specific
 format of this serialization is not guaranteed to be stable and may be
-extended in the future.
-

-

+extended in the future.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+g_value_unset().

+

 





 
 
 
list :
a list of NMIP4Address objects. [element-type NMIP4Address]
-
list
 a list of NMIP4Address objects. 
[element-type NMIP4Address]
 

 
value :
a pointer to a GValue into which to place the converted addresses,
+
value
a pointer to a GValue into which to place the converted addresses,
 which should be unset by the caller (when no longer needed) with
-g_value_unset().
 
 

 
 

 

+
 

 

-
nm_utils_ip4_routes_from_gvalue ()

-
GSList *            nm_utils_ip4_routes_from_gvalue     (const GValue *value);

-

-Utility function to convert a GPtrArray of GArrays of guint32s representing
+
nm_utils_ip4_routes_from_gvalue ()

+
GSList *
+nm_utils_ip4_routes_from_gvalue (const GValue *value);

+
Utility function to convert a GPtrArray of GArrays of guint32s representing
 a list of NetworkManager IPv4 routes (which is a tuple of route, next hop,
 prefix, and metric) into a GSList of NMIP4Route objects.  The specific
 format of this serialization is not guaranteed to be stable and may be
-extended in the future.
-

-

+extended in the future.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
value :
gvalue containing a GPtrArray of GArrays of guint32s
Returns :
a newly allocated GSList of NMIP4Route objects. [transfer full][element-type NetworkManager.IP4Route]
-
value
gvalue containing a GPtrArray of GArrays of guint32s
 

 

 

+

+
Returns

+
 a newly allocated GSList of NMIP4Route objects. 

+
[transfer full][element-type NetworkManager.IP4Route]

+

+
 

 

-
nm_utils_ip4_routes_to_gvalue ()

-
void                nm_utils_ip4_routes_to_gvalue       (GSList *list,
-                                                         GValue *value);

-

-Utility function to convert a GSList of NMIP4Route objects into a
+
nm_utils_ip4_routes_to_gvalue ()

+
void
+nm_utils_ip4_routes_to_gvalue (GSList *list,
+                               GValue *value);

+
Utility function to convert a GSList of NMIP4Route objects into a
 GPtrArray of GArrays of guint32s representing a list of NetworkManager IPv4
 routes (which is a tuple of route, next hop, prefix, and metric).   The
 specific format of this serialization is not guaranteed to be stable and may
-be extended in the future.
-

-

+be extended in the future.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+g_value_unset().

+

 





 
 
 
list :
a list of NMIP4Route objects. [element-type NMIP4Route]
-
list
 a list of NMIP4Route objects. 
[element-type NMIP4Route]
 

 
value :
a pointer to a GValue into which to place the converted routes,
+
value
a pointer to a GValue into which to place the converted routes,
 which should be unset by the caller (when no longer needed) with
-g_value_unset().
 
 

 
 

 

+
 

 

-
nm_utils_ip4_netmask_to_prefix ()

-
guint32             nm_utils_ip4_netmask_to_prefix      (guint32 netmask);

-

+
nm_utils_ip4_netmask_to_prefix ()

+
guint32
+nm_utils_ip4_netmask_to_prefix (guint32 netmask);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
netmask :
an IPv4 netmask in network byte order
Returns :
the CIDR prefix represented by the netmask
netmask
an IPv4 netmask in network byte order
 

 

 

+

+
Returns

+
 the CIDR prefix represented by the netmask

+

+

+
 

 

-
nm_utils_ip4_prefix_to_netmask ()

-
guint32             nm_utils_ip4_prefix_to_netmask      (guint32 prefix);

-

+
nm_utils_ip4_prefix_to_netmask ()

+
guint32
+nm_utils_ip4_prefix_to_netmask (guint32 prefix);

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
prefix :
a CIDR prefix
Returns :
the netmask represented by the prefix, in network byte order
prefix
a CIDR prefix
 

 

 

+

+
Returns

+
 the netmask represented by the prefix, in network byte order

+

+

+
 

 

-
nm_utils_ip4_get_default_prefix ()

-
guint32             nm_utils_ip4_get_default_prefix     (guint32 ip);

-

-When the Internet was originally set up, various ranges of IP addresses were
+
nm_utils_ip4_get_default_prefix ()

+
guint32
+nm_utils_ip4_get_default_prefix (guint32 ip);

+
When the Internet was originally set up, various ranges of IP addresses were
 segmented into three network classes: A, B, and C.  This function will return
 a prefix that is associated with the IP address specified defining where it
-falls in the predefined classes.
-

-

+falls in the predefined classes.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
ip :
an IPv4 address (in network byte order)
Returns :
the default class prefix for the given IP
ip
an IPv4 address (in network byte order)
 

 

 

+

+
Returns

+
 the default class prefix for the given IP

+

+

+
 

 

-
nm_utils_ip6_addresses_from_gvalue ()

-
GSList *            nm_utils_ip6_addresses_from_gvalue  (const GValue *value);

-

-Utility function to convert a GPtrArray of GValueArrays of (GArray of guchars) and guint32
+
nm_utils_ip6_addresses_from_gvalue ()

+
GSList *
+nm_utils_ip6_addresses_from_gvalue (const GValue *value);

+
Utility function to convert a GPtrArray of GValueArrays of (GArray of guchars) and guint32
 representing a list of NetworkManager IPv6 addresses (which is a tuple of address,
 prefix, and gateway), into a GSList of NMIP6Address objects.  The specific format of
 this serialization is not guaranteed to be stable and the GValueArray may be
-extended in the future.
-

-

+extended in the future.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
value :
gvalue containing a GPtrArray of GValueArrays of (GArray of guchars) and guint32
Returns :
a newly allocated GSList of NMIP6Address objects. [transfer full][element-type NetworkManager.IP6Address]
-
value
gvalue containing a GPtrArray of GValueArrays of (GArray of guchars) and guint32
 

 

 

+

+
Returns

+
 a newly allocated GSList of NMIP6Address objects. 

+
[transfer full][element-type NetworkManager.IP6Address]

+

+
 

 

-
nm_utils_ip6_addresses_to_gvalue ()

-
void                nm_utils_ip6_addresses_to_gvalue    (GSList *list,
-                                                         GValue *value);

-

-Utility function to convert a GSList of NMIP6Address objects into a
+
nm_utils_ip6_addresses_to_gvalue ()

+
void
+nm_utils_ip6_addresses_to_gvalue (GSList *list,
+                                  GValue *value);

+
Utility function to convert a GSList of NMIP6Address objects into a
 GPtrArray of GValueArrays representing a list of NetworkManager IPv6 addresses
 (which is a tuple of address, prefix, and gateway). The specific format of
 this serialization is not guaranteed to be stable and may be extended in the
-future.
-

-

+future.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+g_value_unset().

+

 





 
 
 
list :
a list of NMIP6Address objects. [element-type NMIP6Address]
-
list
 a list of NMIP6Address objects. 
[element-type NMIP6Address]
 

 
value :
a pointer to a GValue into which to place the converted addresses,
+
value
a pointer to a GValue into which to place the converted addresses,
 which should be unset by the caller (when no longer needed) with
-g_value_unset().
 
 

 
 

 

+
 

 

-
nm_utils_ip6_routes_from_gvalue ()

-
GSList *            nm_utils_ip6_routes_from_gvalue     (const GValue *value);

-

-Utility function GPtrArray of GValueArrays of (GArray or guchars), guint32,
+
nm_utils_ip6_routes_from_gvalue ()

+
GSList *
+nm_utils_ip6_routes_from_gvalue (const GValue *value);

+
Utility function GPtrArray of GValueArrays of (GArray or guchars), guint32,
 (GArray of guchars), and guint32 representing a list of NetworkManager IPv6
 routes (which is a tuple of destination, prefix, next hop, and metric)
 into a GSList of NMIP6Route objects.  The specific format of this serialization
-is not guaranteed to be stable and may be extended in the future.
-

-

+is not guaranteed to be stable and may be extended in the future.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
value :
gvalue containing a GPtrArray of GValueArrays of (GArray or guchars), guint32,
-(GArray of guchars), and guint32
Returns :
a newly allocated GSList of NMIP6Route objects. [transfer full][element-type NetworkManager.IP6Route]
-
value
gvalue containing a GPtrArray of GValueArrays of (GArray or guchars), guint32,
+(GArray of guchars), and guint32
 

 

 

+

+
Returns

+
 a newly allocated GSList of NMIP6Route objects. 

+
[transfer full][element-type NetworkManager.IP6Route]

+

+
 

 

-
nm_utils_ip6_routes_to_gvalue ()

-
void                nm_utils_ip6_routes_to_gvalue       (GSList *list,
-                                                         GValue *value);

-

-Utility function to convert a GSList of NMIP6Route objects into a GPtrArray of
+
nm_utils_ip6_routes_to_gvalue ()

+
void
+nm_utils_ip6_routes_to_gvalue (GSList *list,
+                               GValue *value);

+
Utility function to convert a GSList of NMIP6Route objects into a GPtrArray of
 GValueArrays of (GArray or guchars), guint32, (GArray of guchars), and guint32
 representing a list of NetworkManager IPv6 routes (which is a tuple of destination,
 prefix, next hop, and metric).  The specific format of this serialization is not 
-guaranteed to be stable and may be extended in the future.
-

-

+guaranteed to be stable and may be extended in the future.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+g_value_unset().

+

 





 
 
 
list :
a list of NMIP6Route objects. [element-type NMIP6Route]
-
list
 a list of NMIP6Route objects. 
[element-type NMIP6Route]
 

 
value :
a pointer to a GValue into which to place the converted routes,
+
value
a pointer to a GValue into which to place the converted routes,
 which should be unset by the caller (when no longer needed) with
-g_value_unset().
 
 

 
 

 

+
 

 

-
nm_utils_ip6_dns_from_gvalue ()

-
GSList *            nm_utils_ip6_dns_from_gvalue        (const GValue *value);

-

-Converts a GValue containing a GPtrArray of IP6 DNS, represented as
-GByteArrays into a GSList of in6_addrs.
-

-

+
nm_utils_ip6_dns_from_gvalue ()

+
GSList *
+nm_utils_ip6_dns_from_gvalue (const GValue *value);

+
Converts a GValue containing a GPtrArray of IP6 DNS, represented as
+GByteArrays into a GSList of in6_addrs.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
value :
a GValue
-
Returns :
a GSList of IP6
-addresses. [transfer full][element-type Posix.in6_addr]
-
value
a GValue
 

 

 

+

+
Returns

+
 a GSList of IP6 addresses.

+

+

+
 

 

-
nm_utils_ip6_dns_to_gvalue ()

-
void                nm_utils_ip6_dns_to_gvalue          (GSList *list,
-                                                         GValue *value);

-

-Utility function to convert a GSList of 'struct in6_addr' structs into a
+
nm_utils_ip6_dns_to_gvalue ()

+
void
+nm_utils_ip6_dns_to_gvalue (GSList *list,
+                            GValue *value);

+
Utility function to convert a GSList of 'struct in6_addr' structs into a
 GPtrArray of GByteArrays representing each server's IPv6 addresses in
 network byte order.  The specific format of this serialization is not
-guaranteed to be stable and may be extended in the future.
-

-

+guaranteed to be stable and may be extended in the future.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+g_value_unset().

+

 





 
 
 
list :
a list of NMIP6Route objects
list
a list of NMIP6Route objects
 
 

 
value :
a pointer to a GValue into which to place the converted DNS server
+
value
a pointer to a GValue into which to place the converted DNS server
 addresses, which should be unset by the caller (when no longer needed) with
-g_value_unset().
 
 

 
 

 

+
 

 

-
nm_utils_uuid_generate ()

-
char *              nm_utils_uuid_generate              (void);

-

----
-
-
-
-
-




Returns :
a newly allocated UUID suitable for use as the NMSettingConnection
-object's "id": property.  Should be freed with g_free()
-

+
nm_utils_uuid_generate ()

+
char *
+nm_utils_uuid_generate (void);

+

+
Returns

+
 a newly allocated UUID suitable for use as the NMSettingConnection
+object's “id”: property.  Should be freed with g_free()

+

+

 

 

 

-
nm_utils_uuid_generate_from_string ()

-
char *              nm_utils_uuid_generate_from_string  (const char *s);

-

-For a given s, this function will always return the same UUID.
-

-

+
nm_utils_uuid_generate_from_string ()

+
char *
+nm_utils_uuid_generate_from_string (const char *s);

+
For a given s
+, this function will always return the same UUID.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
s :
a string to use as the seed for the UUID
Returns :
a newly allocated UUID suitable for use as the NMSettingConnection
-object's "id": property
s
a string to use as the seed for the UUID
 

 

 

+

+
Returns

+
 a newly allocated UUID suitable for use as the NMSettingConnection
+object's “id”: property

+

+

+
 

 

-
nm_utils_rsa_key_encrypt ()

-
GByteArray *        nm_utils_rsa_key_encrypt            (const GByteArray *data,
-                                                         const char *in_password,
-                                                         char **out_password,
-                                                         GError **error);

-

-Encrypts the given RSA private key data with the given password (or generates
+
nm_utils_rsa_key_encrypt ()

+
GByteArray *
+nm_utils_rsa_key_encrypt (const GByteArray *data,
+                          const char *in_password,
+                          char **out_password,
+                          GError **error);

+
Encrypts the given RSA private key data with the given password (or generates
 a password if no password was given) and converts the data to PEM format
-suitable for writing to a file.
-

-

+suitable for writing to a file.

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+

 





 
 
 
data :
RSA private key data to be encrypted
in_password :
existing password to use, if any. [allow-none]
-
data
RSA private key data to be encrypted
 
 

 
out_password :
if in_password was NULL, a random password will be generated
-and returned in this argument. [out][allow-none]
-
in_password
 existing password to use, if any. 
[allow-none]
 

 
error :
detailed error information on return, if an error occurred
out_password
 if in_password
+was NULL, a random password will be generated
+and returned in this argument. 
[out][allow-none]
 

 
Returns :
on success, PEM-formatted data suitable for writing to a PEM-formatted
-certificate/private key file. [transfer full]
-
error
detailed error information on return, if an error occurred
 
 

 
 

 

+

+
Returns

+
 on success, PEM-formatted data suitable for writing to a PEM-formatted
+certificate/private key file. 

+
[transfer full]

+

+
 

 

-
nm_utils_file_is_pkcs12 ()

-
gboolean            nm_utils_file_is_pkcs12             (const char *filename);

-

-Utility function to find out if the filename is in PKCS12 format.
-

-

+
nm_utils_file_is_pkcs12 ()

+
gboolean
+nm_utils_file_is_pkcs12 (const char *filename);

+
Utility function to find out if the filename
+ is in PKCS12 format.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
filename :
name of the file to test
Returns :
TRUE if the file is PKCS12, FALSE if it is not
filename
name of the file to test
 

 

 

+

+
Returns

+
 TRUE if the file is PKCS12, FALSE if it is not

+

+

+
 

 

-
nm_utils_wifi_freq_to_channel ()

-
guint32             nm_utils_wifi_freq_to_channel       (guint32 freq);

-

-Utility function to translate a WiFi frequency to its corresponding channel.
-

-

+
nm_utils_wifi_freq_to_channel ()

+
guint32
+nm_utils_wifi_freq_to_channel (guint32 freq);

+
Utility function to translate a WiFi frequency to its corresponding channel.

+

+
Parameters

+
--+++
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+

 





 
freq :
frequency
Returns :
the channel represented by the frequency or 0
freq
frequency
 

 

 

+

+
Returns

+
 the channel represented by the frequency or 0

+

+

+
 

 

-
nm_utils_wifi_channel_to_freq ()

-
guint32             nm_utils_wifi_channel_to_freq       (guint32 channel,
-                                                         const char *band);

-

-Utility function to translate a WiFi channel to its corresponding frequency.
-

-

+
nm_utils_wifi_channel_to_freq ()

+
guint32
+nm_utils_wifi_channel_to_freq (guint32 channel,
+                               const char *band);

+
Utility function to translate a WiFi channel to its corresponding frequency.

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+

 





 
 
 
channel :
channel
band :
frequency band for wireless ("a" or "bg")
channel
channel
 
 

 
Returns :
the frequency represented by the channel of the band,
-or -1 when the freq is invalid, or 0 when the band
-is invalid
band
frequency band for wireless ("a" or "bg")
 
 

 
 

 

+

+
Returns

+
 the frequency represented by the channel of the band,
+or -1 when the freq is invalid, or 0 when the band
+is invalid

+

+

+
 

 

-
nm_utils_wifi_find_next_channel ()

-
guint32             nm_utils_wifi_find_next_channel     (guint32 channel,
-                                                         int direction,
-                                                         char *band);

-

-Utility function to find out next/previous WiFi channel for a channel.
-

-

+
nm_utils_wifi_find_next_channel ()

+
guint32
+nm_utils_wifi_find_next_channel (guint32 channel,
+                                 int direction,
+                                 char *band);

+
Utility function to find out next/previous WiFi channel for a channel.

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+

 





 
 
 
channel :
current channel
direction :
whether going downward (0 or less) or upward (1 or more)
channel
current channel
 
 

 
band :
frequency band for wireless ("a" or "bg")
direction
whether going downward (0 or less) or upward (1 or more)
 
 

 
Returns :
the next channel in the specified direction or 0
band
frequency band for wireless ("a" or "bg")
 
 

 
 

 

+

+
Returns

+
 the next channel in the specified direction or 0

+

+

+
 

 

-
nm_utils_wifi_is_channel_valid ()

-
gboolean            nm_utils_wifi_is_channel_valid      (guint32 channel,
-                                                         const char *band);

-

-Utility function to verify WiFi channel validity.
-

-

+
nm_utils_wifi_is_channel_valid ()

+
gboolean
+nm_utils_wifi_is_channel_valid (guint32 channel,
+                                const char *band);

+
Utility function to verify WiFi channel validity.

+

+
Parameters

+
--+++
-
-
-
-
-
-
+
+
+
-
-
+
+
+

 





 
 
 
channel :
channel
band :
frequency band for wireless ("a" or "bg")
channel
channel
 
 

 
Returns :
TRUE or FALSE
band
frequency band for wireless ("a" or "bg")
 
 

 
 

 

+

+
Returns

+
 TRUE or FALSE

+

+

+
 

 

-
NM_UTILS_HWADDR_LEN_MAX

-
#define NM_UTILS_HWADDR_LEN_MAX 20 /* INFINIBAND_ALEN */
-

-

-The maximum length of a hardware address of a type known by
-nm_utils_hwaddr_len() or nm_utils_hwaddr_aton(). This can be used
-as the size of the buffer passed to nm_utils_hwaddr_aton().
-

+
nm_utils_hwaddr_len ()

+
int
+nm_utils_hwaddr_len (int type);

+
Returns the length in octets of a hardware address of type type
+.

+

+
Parameters

+

+++++
+
+
+
+
+
+





type
the type of address; either ARPHRD_ETHER or ARPHRD_INFINIBAND
 

+

+

+
Returns

+
 the length

+

+

+

+

+

+
nm_utils_hwaddr_type ()

+
int
+nm_utils_hwaddr_type (int len);

+
Returns the type (either ARPHRD_ETHER or ARPHRD_INFINIBAND) of the raw
+address given its length.

+

+
Parameters

+

+++++
+
+
+
+
+
+





len
the length of hardware address in bytes
 

+

+

+
Returns

+
 the type, either ARPHRD_ETHER or ARPHRD_INFINIBAND, or -1 if
+the address length was not recognized

+

+

 

 

 

-
nm_utils_hwaddr_len ()

-
int                 nm_utils_hwaddr_len                 (int type);

-

-Returns the length in octets of a hardware address of type type.
-

-

+
nm_utils_hwaddr_ntoa ()

+
char *
+nm_utils_hwaddr_ntoa (gconstpointer addr,
+                      int type);

+
Converts addr
+ to textual form.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
type :
the type of address; either ARPHRD_ETHER or ARPHRD_INFINIBAND
-
addr
a binary hardware address
 
 

 
Returns :
the length
type
the type of address; either ARPHRD_ETHER or ARPHRD_INFINIBAND
 
 

 
 

 

+

+
Returns

+
 the textual form of addr
+. 

+
[transfer full]

+

+
 

 

-
nm_utils_hwaddr_type ()

-
int                 nm_utils_hwaddr_type                (int len);

-

-Returns the type (either ARPHRD_ETHER or ARPHRD_INFINIBAND) of the raw
-address given its length.
-

-

+
nm_utils_hwaddr_atoba ()

+
GByteArray *
+nm_utils_hwaddr_atoba (const char *asc,
+                       int type);

+
Parses asc
+ and converts it to binary form in a GByteArray. See
+nm_utils_hwaddr_aton() if you don't want a GByteArray.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+

 





 
 
 
len :
the length of hardware address in bytes
asc
the ASCII representation of a hardware address
 
 

 
Returns :
the type, either ARPHRD_ETHER or ARPHRD_INFINIBAND, or -1 if
-the address length was not recognized
type
the type of address; either ARPHRD_ETHER or ARPHRD_INFINIBAND
 
 

 
 

 

+

+
Returns

+
 a new GByteArray, or NULL if asc
+couldn't
+be parsed. 

+
[transfer full]

+

+
 

 

-
nm_utils_hwaddr_ntoa ()

-
char *              nm_utils_hwaddr_ntoa                (gconstpointer addr,
-                                                         int type);

-

-Converts addr to textual form.
-

-

+
nm_utils_hwaddr_aton ()

+
guint8 *
+nm_utils_hwaddr_aton (const char *asc,
+                      int type,
+                      gpointer buffer);

+
Parses asc
+ and converts it to binary form in buffer
+. See
+nm_utils_hwaddr_atoba() if you'd rather have the result in a
+GByteArray.

+

+
Parameters

+
--+++
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+

 





 
 
 
addr :
a binary hardware address
asc
the ASCII representation of a hardware address
 
 

 
type :
the type of address; either ARPHRD_ETHER or ARPHRD_INFINIBAND
-
type
the type of address; either ARPHRD_ETHER or ARPHRD_INFINIBAND
 
 

 
Returns :
the textual form of addr. [transfer full]
-
buffer
buffer to store the result into
 
 

 
 

 

+

+
Returns

+
 buffer
+, or NULL if asc
+couldn't be parsed

+

+

+
+

+

+
nm_utils_iface_valid_name ()

+
gboolean
+nm_utils_iface_valid_name (const char *name);

+
This function is a 1:1 copy of the kernel's interface validation
+function in net/core/dev.c.

+

+
Parameters

+

+++++
+
+
+
+
+
+





name
Name of interface
 

+

+

+
Returns

+
 TRUE if interface name is valid, otherwise FALSE is returned.

+

+

+
Since 0.9.8

+

 

 

-
nm_utils_hwaddr_atoba ()

-
GByteArray *        nm_utils_hwaddr_atoba               (const char *asc,
-                                                         int type);

-

-Parses asc and converts it to binary form in a GByteArray. See
-nm_utils_hwaddr_aton() if you don't want a GByteArray.
-

-

+
nm_utils_is_uuid ()

+
gboolean
+nm_utils_is_uuid (const char *str);

+
Checks if str
+ is a UUID

+

+
Parameters

+

+++++
+
+
+
+
+
+





str
a string that might be a UUID
 

+

+

+
Returns

+
 TRUE if str
+is a UUID, FALSE if not

+

+

+
Since 0.9.8

+
+
+

+
Types and Values

+

+
enum NMUtilsSecurityType

+
Describes generic security mechanisms that 802.11 access points may offer.
+Used with nm_utils_security_valid() for checking whether a given access
+point is compatible with a network device.

+

+
Members

+
--+++
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-

 





 
 
 
asc :
the ASCII representation of a hardware address
NMU_SEC_INVALID

+
unknown or invalid security, placeholder and not used

+		 
 

 
type :
the type of address; either ARPHRD_ETHER or ARPHRD_INFINIBAND
+
NMU_SEC_NONE

+
unencrypted and open

 		 
 

 
Returns :
a new GByteArray, or NULL if asc couldn't
-be parsed. [transfer full]
+
NMU_SEC_STATIC_WEP

+
static WEP keys are used for encryption

 		 
 

-

-

-

-
nm_utils_hwaddr_aton ()

-
guint8 *            nm_utils_hwaddr_aton                (const char *asc,
-                                                         int type,
-                                                         gpointer buffer);

-

-Parses asc and converts it to binary form in buffer. See
-nm_utils_hwaddr_atoba() if you'd rather have the result in a
-GByteArray.
-

-

----
-
-
-
+
+
+
-
-
+
+
-
-
+
+
+
-
-
+
+
+
-
-




 
asc :
the ASCII representation of a hardware address
NMU_SEC_LEAP

+
Cisco LEAP is used for authentication and for generating the
+dynamic WEP keys automatically

+		 
 

 
type :
the type of address; either ARPHRD_ETHER or ARPHRD_INFINIBAND
+
NMU_SEC_DYNAMIC_WEP

+
standard 802.1x is used for authentication and
+generating the dynamic WEP keys automatically

 		 
 

 
buffer :
buffer to store the result into
NMU_SEC_WPA_PSK

+
WPA1 is used with Pre-Shared Keys (PSK)

+		 
 

 
Returns :

-buffer, or NULL if asc couldn't be parsed
NMU_SEC_WPA_ENTERPRISE

+
WPA1 is used with 802.1x authentication

+		 
 

-

-

-

-
nm_utils_iface_valid_name ()

-
gboolean            nm_utils_iface_valid_name           (const char *name);

-

-This function is a 1:1 copy of the kernel's interface validation
-function in net/core/dev.c.
-

-

----
-
-
-
+
+
+
-
-
+
+
+




 
name :
Name of interface
NMU_SEC_WPA2_PSK

+
WPA2/RSN is used with Pre-Shared Keys (PSK)

+		 
 

 
Returns :

-TRUE if interface name is valid, otherwise FALSE is returned.
NMU_SEC_WPA2_ENTERPRISE

+
WPA2 is used with 802.1x authentication

+		 
 

 
 

-
Since 0.9.8

+

 

 

 

-
nm_utils_is_uuid ()

-
gboolean            nm_utils_is_uuid                    (const char *str);

-

-Checks if str is a UUID
-

-

----
-
-
-
-
-
-
-
-
-
-
-




str :
a string that might be a UUID
Returns :

-TRUE if str is a UUID, FALSE if not

-
Since 0.9.8

+
NM_UTILS_HWADDR_LEN_MAX

+
#define NM_UTILS_HWADDR_LEN_MAX 20 /* INFINIBAND_ALEN */
+

+
The maximum length of a hardware address of a type known by
+nm_utils_hwaddr_len() or nm_utils_hwaddr_aton(). This can be used
+as the size of the buffer passed to nm_utils_hwaddr_aton().

 

 

 
 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.20
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/libnm-util.devhelp2 b/docs/libnm-util/html/libnm-util.devhelp2
index f1daa3d4..a5489de5 100644
--- a/docs/libnm-util/html/libnm-util.devhelp2
+++ b/docs/libnm-util/html/libnm-util.devhelp2
@@ -34,101 +34,119 @@
     
   
   
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
-    
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
     
     
     
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
-    
-    
+    
+    
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
-    
+    
     
-    
     
     
     
@@ -141,42 +159,37 @@
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
-    
+    
     
-    
     
     
     
@@ -188,39 +201,39 @@
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
-    
+    
     
-    
     
     
     
@@ -238,45 +251,53 @@
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
-    
+    
     
-    
-    
+    
     
     
     
@@ -294,113 +315,89 @@
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
-    
+    
     
-    
     
     
     
     
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
-    
+    
     
-    
     
     
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
-    
+    
     
-    
     
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
-    
+    
     
-    
     
     
     
@@ -412,50 +409,43 @@
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
-    
+    
     
-    
     
     
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
-    
+    
     
-    
     
     
     
@@ -464,23 +454,20 @@
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
-    
+    
     
-    
     
     
     
@@ -488,106 +475,96 @@
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
-    
+    
     
-    
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
     
-    
+    
     
-    
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
-    
+    
     
-    
     
     
     
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
-    
+    
     
-    
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
-    
+    
     
-    
     
     
     
@@ -600,29 +577,84 @@
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
-    
+    
     
-    
     
     
     
@@ -655,109 +687,95 @@
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
-    
+    
     
-    
     
     
     
@@ -775,79 +793,74 @@
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
-    
+    
     
-    
     
     
     
@@ -865,78 +878,41 @@
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
-    
+    
     
-    
     
     
     
@@ -955,293 +931,108 @@
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
-    
+    
     
-    
     
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
-    
+    
     
-    
     
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
   
 
diff --git a/docs/libnm-util/html/object-tree.html b/docs/libnm-util/html/object-tree.html
index df07ca9f..404390f1 100644
--- a/docs/libnm-util/html/object-tree.html
+++ b/docs/libnm-util/html/object-tree.html
@@ -2,99 +2,99 @@
 
 
 
-Object Hierarchy
+libnm-util Reference Manual: Object Hierarchy
 
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
+
+
+
+
+
+
 

 

 Object Hierarchy

 
     GObject
-        NMSetting
-            NMSetting8021x
-            NMSettingAdsl
-            NMSettingBluetooth
-            NMSettingBond
-            NMSettingBridge
-            NMSettingBridgePort
-            NMSettingConnection
-            NMSettingInfiniband
-            NMSettingIP4Config
-            NMSettingVlan
-            NMSettingIP6Config
-            NMSettingPPP
-            NMSettingPPPOE
-            NMSettingSerial
-            NMSettingGsm
-            NMSettingCdma
-            NMSettingOlpcMesh
-            NMSettingWimax
-            NMSettingWired
-            NMSettingWireless
-            NMSettingWirelessSecurity
-            NMSettingVPN
-        NMConnection
+    ├── NMSetting
+    │   ├── NMSetting8021x
+    │   ├── NMSettingAdsl
+    │   ├── NMSettingBluetooth
+    │   ├── NMSettingBond
+    │   ├── NMSettingBridge
+    │   ├── NMSettingBridgePort
+    │   ├── NMSettingConnection
+    │   ├── NMSettingInfiniband
+    │   ├── NMSettingIP4Config
+    │   ├── NMSettingVlan
+    │   ├── NMSettingIP6Config
+    │   ├── NMSettingPPP
+    │   ├── NMSettingPPPOE
+    │   ├── NMSettingSerial
+    │   ├── NMSettingGsm
+    │   ├── NMSettingCdma
+    │   ├── NMSettingOlpcMesh
+    │   ├── NMSettingWimax
+    │   ├── NMSettingWired
+    │   ├── NMSettingWireless
+    │   ├── NMSettingWirelessSecurity
+    │   ╰── NMSettingVPN
+    ╰── NMConnection
     GEnum
-        NMConnectionError
-        NMSetting8021xCKFormat
-        NMSetting8021xCKScheme
-        NMSetting8021xError
-        NMSettingAdslError
-        NMSettingBluetoothError
-        NMSettingBondError
-        NMSettingBridgeError
-        NMSettingBridgePortError
-        NMSettingCdmaError
-        NMSettingCompareFlags
-        NMSettingConnectionError
-        NMSettingDiffResult
-        NMSettingError
-        NMSettingGsmError
-        NMSettingGsmNetworkBand
-        NMSettingGsmNetworkType
-        NMSettingHashFlags
-        NMSettingInfinibandError
-        NMSettingIP4ConfigError
-        NMSettingIP6ConfigError
-        NMSettingIP6ConfigPrivacy
-        NMSettingOlpcMeshError
-        NMSettingPPPError
-        NMSettingPPPOEError
-        NMSettingSecretFlags
-        NMSettingSerialError
-        NMSettingVlanError
-        NMSettingVpnError
-        NMSettingWimaxError
-        NMSettingWiredError
-        NMSettingWirelessError
-        NMSettingWirelessSecurityError
-        NMUtilsSecurityType
-        NMVlanFlags
-        NMVlanPriorityMap
-        NMWepKeyType
+    ├── NMConnectionError
+    ├── NMSetting8021xCKFormat
+    ├── NMSetting8021xCKScheme
+    ├── NMSetting8021xError
+    ├── NMSettingAdslError
+    ├── NMSettingBluetoothError
+    ├── NMSettingBondError
+    ├── NMSettingBridgeError
+    ├── NMSettingBridgePortError
+    ├── NMSettingCdmaError
+    ├── NMSettingCompareFlags
+    ├── NMSettingConnectionError
+    ├── NMSettingDiffResult
+    ├── NMSettingError
+    ├── NMSettingGsmError
+    ├── NMSettingGsmNetworkBand
+    ├── NMSettingGsmNetworkType
+    ├── NMSettingHashFlags
+    ├── NMSettingInfinibandError
+    ├── NMSettingIP4ConfigError
+    ├── NMSettingIP6ConfigError
+    ├── NMSettingIP6ConfigPrivacy
+    ├── NMSettingOlpcMeshError
+    ├── NMSettingPPPError
+    ├── NMSettingPPPOEError
+    ├── NMSettingSecretFlags
+    ├── NMSettingSerialError
+    ├── NMSettingVlanError
+    ├── NMSettingVpnError
+    ├── NMSettingWimaxError
+    ├── NMSettingWiredError
+    ├── NMSettingWirelessError
+    ├── NMSettingWirelessSecurityError
+    ├── NMUtilsSecurityType
+    ├── NMVlanFlags
+    ├── NMVlanPriorityMap
+    ╰── NMWepKeyType
     GBoxed
-        NMIP4Address
-        NMIP4Route
-        NMIP6Address
-        NMIP6Route
+    ├── NMIP4Address
+    ├── NMIP4Route
+    ├── NMIP6Address
+    ╰── NMIP6Route
 

 

 

 

-          Generated by GTK-Doc V1.19

+          Generated by GTK-Doc V1.20
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/right-insensitive.png b/docs/libnm-util/html/right-insensitive.png
new file mode 100644
index 00000000..4c95785b
Binary files /dev/null and b/docs/libnm-util/html/right-insensitive.png differ
diff --git a/docs/libnm-util/html/right.png b/docs/libnm-util/html/right.png
index 92832e3a..76260ec8 100644
Binary files a/docs/libnm-util/html/right.png and b/docs/libnm-util/html/right.png differ
diff --git a/docs/libnm-util/html/style.css b/docs/libnm-util/html/style.css
index d6f6c26e..705a5c9a 100644
--- a/docs/libnm-util/html/style.css
+++ b/docs/libnm-util/html/style.css
@@ -1,15 +1,23 @@
+body
+{
+  font-family: cantarell, sans-serif;
+}
 .synopsis, .classsynopsis
 {
   /* tango:aluminium 1/2 */
   background: #eeeeec;
-  border: solid 1px #d3d7cf;
+  background: rgba(238, 238, 236, 0.5);
+  border: solid 1px rgb(238, 238, 236);
   padding: 0.5em;
 }
 .programlisting
 {
   /* tango:sky blue 0/1 */
+  /* fallback for no rgba support */
   background: #e6f3ff;
   border: solid 1px #729fcf;
+  background: rgba(114, 159, 207, 0.1);
+  border: solid 1px rgba(114, 159, 207, 0.2);
   padding: 0.5em;
 }
 .variablelist
@@ -27,7 +35,6 @@
   {
     position: relative;
     top: 0em ! important;
-    
   }
   /* this is needed so that the local anchors are displayed below the naviagtion */
   div.footnote a[name], div.refnamediv a[name], div.refsect1 a[name], div.refsect2 a[name], div.index a[name], div.glossary a[name], div.sect1 a[name]
@@ -46,16 +53,20 @@
    */
   body
   {
-    padding-top: 3.2em;
-    padding-bottom: 20em;
+    padding-top: 5em;
+    padding-bottom: 500px;
+    max-width: 60em;
+  }
+  p
+  {
+    max-width: 60em;
   }
   /* style and size the navigation bar */
   table.navigation#top
   {
     position: fixed;
-    /* tango:scarlet red 0/1 */
-    background: #ffe6e6;
-    border: solid 1px #ef2929;
+    background: #e2e2e2;
+    border-bottom: solid 1px #babdb6;
     margin-top: 0;
     margin-bottom: 0;
     top: 0;
@@ -65,21 +76,57 @@
   }
   .navigation a, .navigation a:visited
   {
-    /* tango:scarlet red 3 */
-    color: #a40000;
+    /* tango:sky blue 3 */
+    color: #204a87;
   }
   .navigation a:hover
   {
-    /* tango:scarlet red 1 */
-    color: #ef2929;
+    /* tango:sky blue 2 */
+    color: #3465a4;
   }
   td.shortcuts
   {
-    /* tango:scarlet red 1 */
-    color: #ef2929;
+    /* tango:sky blue 2 */
+    color: #3465a4;
     font-size: 80%;
     white-space: nowrap;
   }
+  td.shortcuts .dim
+  {
+    color: #babdb6;
+  }
+}
+@media screen and (min-width: 60em) {
+  /* screen larger than 60em */
+  body { margin: auto; }
+}
+@media screen and (max-width: 60em) {
+  /* screen less than 60em */
+  #nav_hierarchy { display: none; }
+  #nav_interfaces { display: none; }
+  #nav_prerequisites { display: none; }
+  #nav_derived_interfaces { display: none; }
+  #nav_implementations { display: none; }
+  #nav_child_properties { display: none; }
+  #nav_style_properties { display: none; }
+  #nav_index { display: none; }
+  #nav_glossary { display: none; }
+  .gallery_image { display: none; }
+  .property_flags { display: none; }
+  .signal_flags { display: none; }
+  .parameter_annotations { display: none; }
+  .enum_member_annotations { display: none; }
+  .struct_member_annotations { display: none; }
+  .union_member_annotations { display: none; }
+  /* now that a column is hidden, optimize space */
+  col.parameters_name { width: auto; }
+  col.parameters_description { width: auto; }
+  col.struct_members_name { width: auto; }
+  col.struct_members_description { width: auto; }
+  col.enum_members_name { width: auto; }
+  col.enum_members_description { width: auto; }
+  col.union_members_name { width: auto; }
+  col.union_members_description { width: auto; }
 }
 @media print {
   table.navigation {
@@ -89,9 +136,8 @@
   div.titlepage table.navigation {
     visibility: visible;
     display: table;
-    /* tango:scarlet red 0/1 */
-    background: #ffe6e6;
-    border: solid 1px #ef2929;
+    background: #e2e2e2;
+    border: solid 1px #babdb6;
     margin-top: 0;
     margin-bottom: 0;
     top: 0;
@@ -102,7 +148,7 @@
 
 .navigation .title
 {
-  font-size: 200%;
+  font-size: 120%;
 }
 
 div.gallery-float
@@ -132,6 +178,67 @@ a:hover
   color: #729fcf;
 }
 
+div.informaltable table
+{
+  border-collapse: separate;
+  border-spacing: 20px 3px;
+  border: none;
+}
+
+div.informaltable table td, div.informaltable table th
+{
+  vertical-align: top;
+}
+
+.function_type,
+.variable_type,
+.property_type,
+.signal_type,
+.parameter_name,
+.struct_member_name,
+.union_member_name,
+.define_keyword,
+.datatype_keyword,
+.typedef_keyword
+{
+  text-align: right;
+}
+
+/* dim non-primary columns */
+.c_punctuation,
+.function_type,
+.variable_type,
+.property_type,
+.signal_type,
+.define_keyword,
+.datatype_keyword,
+.typedef_keyword,
+.property_flags,
+.signal_flags,
+.parameter_annotations,
+.enum_member_annotations,
+.struct_member_annotations,
+.union_member_annotations
+{
+  color: #888a85;
+}
+
+.function_type a,
+.function_type a:visited,
+.function_type a:hover,
+.property_type a,
+.property_type a:visited,
+.property_type a:hover,
+.signal_type a,
+.signal_type a:visited,
+.signal_type a:hover,
+.signal_flags a,
+.signal_flags a:visited,
+.signal_flags a:hover
+{
+ color: #729fcf;
+}
+
 div.table table
 {
   border-collapse: collapse;
@@ -154,14 +261,43 @@ div.table table th
   background-color: #d3d7cf;
 }
 
+h4
+{
+  color: #555753;
+}
+
 hr
 {
-  /* tango:aluminium 3 */
-  color: #babdb6;
-  background: #babdb6;
+  /* tango:aluminium 1 */
+  color: #d3d7cf;
+  background: #d3d7cf;
   border: none 0px;
   height: 1px;
   clear: both;
+  margin: 2.0em 0em 2.0em 0em;
+}
+
+dl.toc dt
+{
+  padding-bottom: 0.25em;
+}
+
+dl.toc > dd > dl > dt
+{
+  padding-top: 0.25em;
+  padding-bottom: 0.25em;
+}
+
+dl.toc > dt
+{
+  padding-top: 1em;
+  padding-bottom: 0.5em;
+  font-weight: bold;
+}
+
+.parameter
+{
+  font-style: normal;
 }
 
 .footer
@@ -173,31 +309,70 @@ hr
   font-size: 80%;
 }
 
+.informalfigure,
+.figure
+{
+  margin: 1em;
+}
+
+.informalexample,
+.example
+{
+  margin-top: 1em;
+  margin-bottom: 1em;
+}
+
 .warning
 {
   /* tango:orange 0/1 */
   background: #ffeed9;
+  background: rgba(252, 175, 62, 0.1);
   border-color: #ffb04f;
+  border-color: rgba(252, 175, 62, 0.2);
 }
 .note
 {
   /* tango:chameleon 0/0.5 */
   background: #d8ffb2;
+  background: rgba(138, 226, 52, 0.1);
   border-color: #abf562;
+  border-color: rgba(138, 226, 52, 0.2);
 }
-.note, .warning
+div.blockquote
+{
+  border-color: #eeeeec;
+}
+.note, .warning, div.blockquote
 {
   padding: 0.5em;
   border-width: 1px;
   border-style: solid;
+  margin: 2em;
 }
-.note h3, .warning h3
+.note p, .warning p
 {
-  margin-top: 0.0em
+  margin: 0;
 }
-.note p, .warning p
+
+div.warning h3.title,
+div.note h3.title
 {
-  margin-bottom: 0.0em
+  display: none;
+}
+
+p + div.section
+{
+  margin-top: 1em;
+}
+
+div.refnamediv,
+div.refsynopsisdiv,
+div.refsect1,
+div.refsect2,
+div.toc,
+div.section
+{
+  margin-bottom: 1em;
 }
 
 /* blob links */
@@ -210,11 +385,22 @@ h2 .extralinks, h3 .extralinks
   font-weight: normal;
 }
 
+.lineart
+{
+  color: #d3d7cf;
+  font-weight: normal;
+}
+
 .annotation
 {
   /* tango:aluminium 5 */
   color: #555753;
-  font-size: 80%;
+  font-weight: normal;
+}
+
+.structfield
+{
+  font-style: normal;
   font-weight: normal;
 }
 
@@ -237,6 +423,7 @@ h2 .extralinks, h3 .extralinks
 .listing_frame {
   /* tango:sky blue 1 */
   border: solid 1px #729fcf;
+  border: solid 1px rgba(114, 159, 207, 0.2);
   padding: 0px;
 }
 
@@ -245,20 +432,28 @@ h2 .extralinks, h3 .extralinks
   margin-bottom: 0px;
   padding: 0.5em;
 }
+.listing_lines {
+  /* this just adds visual clutter and
+     takes precious room from small screens */
+  display: none;
+}
 .listing_lines {
   /* tango:sky blue 0.5 */
   background: #a6c5e3;
+  background: rgba(114, 159, 207, 0.2);
   /* tango:aluminium 6 */
   color: #2e3436;
 }
 .listing_code {
   /* tango:sky blue 0 */
   background: #e6f3ff;
+  background: rgba(114, 159, 207, 0.1);
 }
 .listing_code .programlisting {
   /* override from previous */
   border: none 0px;
   padding: 0px;
+  background: none;
 }
 .listing_lines pre, .listing_code pre {
   margin: 0px;
diff --git a/docs/libnm-util/html/up-insensitive.png b/docs/libnm-util/html/up-insensitive.png
new file mode 100644
index 00000000..f4049860
Binary files /dev/null and b/docs/libnm-util/html/up-insensitive.png differ
diff --git a/docs/libnm-util/html/up.png b/docs/libnm-util/html/up.png
index 85b3e2a2..80b4b37e 100644
Binary files a/docs/libnm-util/html/up.png and b/docs/libnm-util/html/up.png differ
diff --git a/docs/libnm-util/libnm-util-docs.sgml b/docs/libnm-util/libnm-util-docs.sgml
index eaef2623..b2b34c36 100644
--- a/docs/libnm-util/libnm-util-docs.sgml
+++ b/docs/libnm-util/libnm-util-docs.sgml
@@ -11,7 +11,7 @@
     
       for libnm-util &version;
       The latest version of this documentation can be found on-line at
-      http://projects.gnome.org/NetworkManager/developers/libnm-util/09/.
+      https://developer.gnome.org/libnm-util/0.9/.
     
 
     
diff --git a/docs/libnm-util/libnm-util-sections.txt b/docs/libnm-util/libnm-util-sections.txt
index e70e2682..49ebc622 100644
--- a/docs/libnm-util/libnm-util-sections.txt
+++ b/docs/libnm-util/libnm-util-sections.txt
@@ -6,7 +6,6 @@ NM_CONNECTION_ERROR
 nm_connection_error_quark
 NM_CONNECTION_PATH
 NMConnection
-NMConnectionClass
 nm_connection_new
 nm_connection_new_from_hash
 nm_connection_duplicate
@@ -57,6 +56,7 @@ nm_connection_get_setting_wireless
 nm_connection_get_setting_wireless_security
 nm_connection_get_setting_vlan
 
+NMConnectionClass
 NM_CONNECTION
 NM_CONNECTION_CLASS
 NM_CONNECTION_GET_CLASS
@@ -81,7 +81,6 @@ NMSettingSecretFlags
 NMSettingCompareFlags
 NMSetting
 NMSettingClearSecretsWithFlagsFn
-NMSettingClass
 NMSettingValueIterFn
 NMSettingHashFlags
 nm_setting_to_hash
@@ -102,6 +101,7 @@ nm_setting_get_secret_flags
 nm_setting_set_secret_flags
 nm_setting_get_virtual_iface_name
 
+NMSettingClass
 NM_IS_SETTING
 NM_IS_SETTING_CLASS
 NM_SETTING
@@ -152,8 +152,6 @@ NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS
 NM_SETTING_802_1X_PIN
 NM_SETTING_802_1X_PIN_FLAGS
 NM_SETTING_802_1X_SYSTEM_CA_CERTS
-NMSetting8021x
-NMSetting8021xClass
 nm_setting_802_1x_new
 nm_setting_802_1x_get_num_eap_methods
 nm_setting_802_1x_get_eap_method
@@ -220,6 +218,8 @@ nm_setting_802_1x_get_phase2_private_key_password
 nm_setting_802_1x_get_phase2_private_key_password_flags
 nm_setting_802_1x_get_phase2_private_key_format
 
+NMSetting8021x
+NMSetting8021xClass
 NM_IS_SETTING_802_1X
 NM_IS_SETTING_802_1X_CLASS
 NM_SETTING_802_1X
@@ -248,8 +248,6 @@ NM_SETTING_ADSL_PROTOCOL_PPPOE
 NM_SETTING_ADSL_PROTOCOL_IPOATM
 NM_SETTING_ADSL_ENCAPSULATION_VCMUX
 NM_SETTING_ADSL_ENCAPSULATION_LLC
-NMSettingAdsl
-NMSettingAdslClass
 nm_setting_adsl_new
 nm_setting_adsl_get_username
 nm_setting_adsl_get_password
@@ -259,6 +257,8 @@ nm_setting_adsl_get_vpi
 nm_setting_adsl_get_vci
 nm_setting_adsl_get_password_flags
 
+NMSettingAdsl
+NMSettingAdslClass
 NM_IS_SETTING_ADSL
 NM_IS_SETTING_ADSL_CLASS
 NM_SETTING_ADSL
@@ -279,12 +279,12 @@ NM_SETTING_BLUETOOTH_BDADDR
 NM_SETTING_BLUETOOTH_TYPE
 NM_SETTING_BLUETOOTH_TYPE_DUN
 NM_SETTING_BLUETOOTH_TYPE_PANU
-NMSettingBluetooth
-NMSettingBluetoothClass
 nm_setting_bluetooth_new
 nm_setting_bluetooth_get_bdaddr
 nm_setting_bluetooth_get_connection_type
 
+NMSettingBluetooth
+NMSettingBluetoothClass
 NM_IS_SETTING_BLUETOOTH
 NM_IS_SETTING_BLUETOOTH_CLASS
 NM_SETTING_BLUETOOTH
@@ -309,8 +309,6 @@ NM_SETTING_BOND_OPTION_DOWNDELAY
 NM_SETTING_BOND_OPTION_UPDELAY
 NM_SETTING_BOND_OPTION_ARP_INTERVAL
 NM_SETTING_BOND_OPTION_ARP_IP_TARGET
-NMSettingBond
-NMSettingBondClass
 nm_setting_bond_new
 nm_setting_bond_get_interface_name
 nm_setting_bond_get_num_options
@@ -321,6 +319,8 @@ nm_setting_bond_remove_option
 nm_setting_bond_get_valid_options
 nm_setting_bond_get_option_default
 
+NMSettingBond
+NMSettingBondClass
 NM_IS_SETTING_BOND
 NM_IS_SETTING_BOND_CLASS
 NM_SETTING_BOND
@@ -344,8 +344,6 @@ NM_SETTING_BRIDGE_FORWARD_DELAY
 NM_SETTING_BRIDGE_HELLO_TIME
 NM_SETTING_BRIDGE_MAX_AGE
 NM_SETTING_BRIDGE_AGEING_TIME
-NMSettingBridge
-NMSettingBridgeClass
 nm_setting_bridge_new
 nm_setting_bridge_get_interface_name
 nm_setting_bridge_get_stp
@@ -355,6 +353,8 @@ nm_setting_bridge_get_hello_time
 nm_setting_bridge_get_max_age
 nm_setting_bridge_get_ageing_time
 
+NMSettingBridge
+NMSettingBridgeClass
 NM_IS_SETTING_BRIDGE
 NM_IS_SETTING_BRIDGE_CLASS
 NM_SETTING_BRIDGE
@@ -374,13 +374,13 @@ nm_setting_bridge_port_error_quark
 NM_SETTING_BRIDGE_PORT_PRIORITY
 NM_SETTING_BRIDGE_PORT_PATH_COST
 NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE
-NMSettingBridgePort
-NMSettingBridgePortClass
 nm_setting_bridge_port_new
 nm_setting_bridge_port_get_priority
 nm_setting_bridge_port_get_path_cost
 nm_setting_bridge_port_get_hairpin_mode
 
+NMSettingBridgePort
+NMSettingBridgePortClass
 NM_IS_SETTING_BRIDGE_PORT
 NM_IS_SETTING_BRIDGE_PORT_CLASS
 NM_SETTING_BRIDGE_PORT
@@ -401,14 +401,14 @@ NM_SETTING_CDMA_NUMBER
 NM_SETTING_CDMA_USERNAME
 NM_SETTING_CDMA_PASSWORD
 NM_SETTING_CDMA_PASSWORD_FLAGS
-NMSettingCdma
-NMSettingCdmaClass
 nm_setting_cdma_new
 nm_setting_cdma_get_number
 nm_setting_cdma_get_username
 nm_setting_cdma_get_password
 nm_setting_cdma_get_password_flags
 
+NMSettingCdma
+NMSettingCdmaClass
 NM_IS_SETTING_CDMA
 NM_IS_SETTING_CDMA_CLASS
 NM_SETTING_CDMA
@@ -437,7 +437,6 @@ NM_SETTING_CONNECTION_MASTER
 NM_SETTING_CONNECTION_SLAVE_TYPE
 NM_SETTING_CONNECTION_SECONDARIES
 NMSettingConnection
-NMSettingConnectionClass
 nm_setting_connection_new
 nm_setting_connection_get_id
 nm_setting_connection_get_uuid
@@ -459,6 +458,7 @@ nm_setting_connection_get_secondary
 nm_setting_connection_add_secondary
 nm_setting_connection_remove_secondary
 
+NMSettingConnectionClass
 NM_IS_SETTING_CONNECTION
 NM_IS_SETTING_CONNECTION_CLASS
 NM_SETTING_CONNECTION
@@ -488,8 +488,6 @@ NM_SETTING_GSM_PIN_FLAGS
 NM_SETTING_GSM_HOME_ONLY
 NMSettingGsmNetworkType
 NMSettingGsmNetworkBand
-NMSettingGsm
-NMSettingGsmClass
 nm_setting_gsm_new
 nm_setting_gsm_get_number
 nm_setting_gsm_get_username
@@ -503,6 +501,8 @@ nm_setting_gsm_get_home_only
 nm_setting_gsm_get_pin_flags
 nm_setting_gsm_get_password_flags
 
+NMSettingGsm
+NMSettingGsmClass
 NM_IS_SETTING_GSM
 NM_IS_SETTING_GSM_CLASS
 NM_SETTING_GSM
@@ -522,13 +522,13 @@ nm_setting_infiniband_error_quark
 NM_SETTING_INFINIBAND_MAC_ADDRESS
 NM_SETTING_INFINIBAND_MTU
 NM_SETTING_INFINIBAND_TRANSPORT_MODE
-NMSettingInfiniband
-NMSettingInfinibandClass
 nm_setting_infiniband_new
 nm_setting_infiniband_get_mac_address
 nm_setting_infiniband_get_mtu
 nm_setting_infiniband_get_transport_mode
 
+NMSettingInfiniband
+NMSettingInfinibandClass
 NM_IS_SETTING_INFINIBAND
 NM_IS_SETTING_INFINIBAND_CLASS
 NM_SETTING_INFINIBAND
@@ -562,7 +562,6 @@ NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL
 NM_SETTING_IP4_CONFIG_METHOD_MANUAL
 NM_SETTING_IP4_CONFIG_METHOD_SHARED
 NM_SETTING_IP4_CONFIG_METHOD_DISABLED
-NMIP4Address
 nm_ip4_address_new
 nm_ip4_address_dup
 nm_ip4_address_ref
@@ -574,7 +573,6 @@ nm_ip4_address_get_prefix
 nm_ip4_address_set_prefix
 nm_ip4_address_get_gateway
 nm_ip4_address_set_gateway
-NMIP4Route
 nm_ip4_route_new
 nm_ip4_route_dup
 nm_ip4_route_ref
@@ -588,8 +586,6 @@ nm_ip4_route_get_next_hop
 nm_ip4_route_set_next_hop
 nm_ip4_route_get_metric
 nm_ip4_route_set_metric
-NMSettingIP4Config
-NMSettingIP4ConfigClass
 nm_setting_ip4_config_new
 nm_setting_ip4_config_get_method
 nm_setting_ip4_config_get_num_dns
@@ -620,6 +616,10 @@ nm_setting_ip4_config_get_dhcp_hostname
 nm_setting_ip4_config_get_never_default
 nm_setting_ip4_config_get_may_fail
 
+NMIP4Address
+NMIP4Route
+NMSettingIP4Config
+NMSettingIP4ConfigClass
 NM_IS_SETTING_IP4_CONFIG
 NM_IS_SETTING_IP4_CONFIG_CLASS
 NM_SETTING_IP4_CONFIG
@@ -656,7 +656,6 @@ NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL
 NM_SETTING_IP6_CONFIG_METHOD_MANUAL
 NM_SETTING_IP6_CONFIG_METHOD_SHARED
 NMSettingIP6ConfigPrivacy
-NMIP6Address
 nm_ip6_address_new
 nm_ip6_address_dup
 nm_ip6_address_ref
@@ -668,7 +667,6 @@ nm_ip6_address_get_prefix
 nm_ip6_address_set_prefix
 nm_ip6_address_get_gateway
 nm_ip6_address_set_gateway
-NMIP6Route
 nm_ip6_route_new
 nm_ip6_route_dup
 nm_ip6_route_ref
@@ -682,8 +680,6 @@ nm_ip6_route_get_next_hop
 nm_ip6_route_set_next_hop
 nm_ip6_route_get_metric
 nm_ip6_route_set_metric
-NMSettingIP6Config
-NMSettingIP6ConfigClass
 nm_setting_ip6_config_new
 nm_setting_ip6_config_get_method
 nm_setting_ip6_config_get_num_dns
@@ -713,6 +709,10 @@ nm_setting_ip6_config_get_never_default
 nm_setting_ip6_config_get_may_fail
 nm_setting_ip6_config_get_ip6_privacy
 
+NMIP6Address
+NMIP6Route
+NMSettingIP6Config
+NMSettingIP6ConfigClass
 NM_IS_SETTING_IP6_CONFIG
 NM_IS_SETTING_IP6_CONFIG_CLASS
 NM_SETTING_IP6_CONFIG
@@ -734,13 +734,13 @@ nm_setting_olpc_mesh_error_quark
 NM_SETTING_OLPC_MESH_SSID
 NM_SETTING_OLPC_MESH_CHANNEL
 NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS
-NMSettingOlpcMesh
-NMSettingOlpcMeshClass
 nm_setting_olpc_mesh_new
 nm_setting_olpc_mesh_get_ssid
 nm_setting_olpc_mesh_get_channel
 nm_setting_olpc_mesh_get_dhcp_anycast_address
 
+NMSettingOlpcMesh
+NMSettingOlpcMeshClass
 NM_IS_SETTING_OLPC_MESH
 NM_IS_SETTING_OLPC_MESH_CLASS
 NM_SETTING_OLPC_MESH
@@ -775,8 +775,6 @@ NM_SETTING_PPP_MRU
 NM_SETTING_PPP_MTU
 NM_SETTING_PPP_LCP_ECHO_FAILURE
 NM_SETTING_PPP_LCP_ECHO_INTERVAL
-NMSettingPPP
-NMSettingPPPClass
 nm_setting_ppp_new
 nm_setting_ppp_get_noauth
 nm_setting_ppp_get_refuse_eap
@@ -797,6 +795,8 @@ nm_setting_ppp_get_mtu
 nm_setting_ppp_get_lcp_echo_failure
 nm_setting_ppp_get_lcp_echo_interval
 
+NMSettingPPP
+NMSettingPPPClass
 NM_IS_SETTING_PPP
 NM_IS_SETTING_PPP_CLASS
 NM_SETTING_PPP
@@ -817,14 +817,14 @@ NM_SETTING_PPPOE_SERVICE
 NM_SETTING_PPPOE_USERNAME
 NM_SETTING_PPPOE_PASSWORD
 NM_SETTING_PPPOE_PASSWORD_FLAGS
-NMSettingPPPOE
-NMSettingPPPOEClass
 nm_setting_pppoe_new
 nm_setting_pppoe_get_service
 nm_setting_pppoe_get_username
 nm_setting_pppoe_get_password
 nm_setting_pppoe_get_password_flags
 
+NMSettingPPPOE
+NMSettingPPPOEClass
 NM_IS_SETTING_PPPOE
 NM_IS_SETTING_PPPOE_CLASS
 NM_SETTING_PPPOE
@@ -852,8 +852,6 @@ NM_SETTING_SERIAL_BITS
 NM_SETTING_SERIAL_PARITY
 NM_SETTING_SERIAL_STOPBITS
 NM_SETTING_SERIAL_SEND_DELAY
-NMSettingSerial
-NMSettingSerialClass
 nm_setting_serial_new
 nm_setting_serial_get_baud
 nm_setting_serial_get_bits
@@ -861,6 +859,8 @@ nm_setting_serial_get_parity
 nm_setting_serial_get_stopbits
 nm_setting_serial_get_send_delay
 
+NMSettingSerial
+NMSettingSerialClass
 NM_IS_SETTING_SERIAL
 NM_IS_SETTING_SERIAL_CLASS
 NM_SETTING_SERIAL
@@ -883,8 +883,6 @@ NM_SETTING_VLAN_ID
 NM_SETTING_VLAN_FLAGS
 NM_SETTING_VLAN_INGRESS_PRIORITY_MAP
 NM_SETTING_VLAN_EGRESS_PRIORITY_MAP
-NMSettingVlan
-NMSettingVlanClass
 NMVlanPriorityMap
 NMVlanFlags
 nm_setting_vlan_new
@@ -899,6 +897,8 @@ nm_setting_vlan_remove_priority
 nm_setting_vlan_clear_priorities
 nm_setting_vlan_add_priority_str
 
+NMSettingVlan
+NMSettingVlanClass
 NM_IS_SETTING_VLAN
 NM_IS_SETTING_VLAN_CLASS
 NM_SETTING_VLAN
@@ -919,8 +919,6 @@ NM_SETTING_VPN_SERVICE_TYPE
 NM_SETTING_VPN_USER_NAME
 NM_SETTING_VPN_DATA
 NM_SETTING_VPN_SECRETS
-NMSettingVPN
-NMSettingVPNClass
 NMVPNIterFunc
 nm_setting_vpn_new
 nm_setting_vpn_get_service_type
@@ -936,6 +934,8 @@ nm_setting_vpn_get_secret
 nm_setting_vpn_remove_secret
 nm_setting_vpn_foreach_secret
 
+NMSettingVPN
+NMSettingVPNClass
 NM_IS_SETTING_VPN
 NM_IS_SETTING_VPN_CLASS
 NM_SETTING_VPN
@@ -954,12 +954,12 @@ NM_SETTING_WIMAX_ERROR
 nm_setting_wimax_error_quark
 NM_SETTING_WIMAX_NETWORK_NAME
 NM_SETTING_WIMAX_MAC_ADDRESS
-NMSettingWimax
-NMSettingWimaxClass
 nm_setting_wimax_new
 nm_setting_wimax_get_network_name
 nm_setting_wimax_get_mac_address
 
+NMSettingWimax
+NMSettingWimaxClass
 NM_IS_SETTING_WIMAX
 NM_IS_SETTING_WIMAX_CLASS
 NM_SETTING_WIMAX
@@ -987,8 +987,6 @@ NM_SETTING_WIRED_MTU
 NM_SETTING_WIRED_S390_SUBCHANNELS
 NM_SETTING_WIRED_S390_NETTYPE
 NM_SETTING_WIRED_S390_OPTIONS
-NMSettingWired
-NMSettingWiredClass
 nm_setting_wired_new
 nm_setting_wired_get_port
 nm_setting_wired_get_speed
@@ -1006,6 +1004,8 @@ nm_setting_wired_get_s390_option_by_key
 nm_setting_wired_add_s390_option
 nm_setting_wired_remove_s390_option
 
+NMSettingWired
+NMSettingWiredClass
 NM_IS_SETTING_WIRED
 NM_IS_SETTING_WIRED_CLASS
 NM_SETTING_WIRED
@@ -1039,8 +1039,6 @@ NM_SETTING_WIRELESS_HIDDEN
 NM_SETTING_WIRELESS_MODE_ADHOC
 NM_SETTING_WIRELESS_MODE_AP
 NM_SETTING_WIRELESS_MODE_INFRA
-NMSettingWireless
-NMSettingWirelessClass
 nm_setting_wireless_new
 nm_setting_wireless_get_ssid
 nm_setting_wireless_get_mode
@@ -1060,6 +1058,8 @@ nm_setting_wireless_get_num_seen_bssids
 nm_setting_wireless_get_seen_bssid
 nm_setting_wireless_ap_security_compatible
 
+NMSettingWireless
+NMSettingWirelessClass
 NM_IS_SETTING_WIRELESS
 NM_IS_SETTING_WIRELESS_CLASS
 NM_SETTING_WIRELESS
@@ -1094,8 +1094,6 @@ NM_SETTING_WIRELESS_SECURITY_PSK
 NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS
 NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD
 NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS
-NMSettingWirelessSecurity
-NMSettingWirelessSecurityClass
 nm_setting_wireless_security_new
 nm_setting_wireless_security_get_key_mgmt
 nm_setting_wireless_security_get_num_protos
@@ -1125,6 +1123,8 @@ nm_setting_wireless_security_get_auth_alg
 nm_setting_wireless_security_get_wep_key_flags
 nm_setting_wireless_security_get_wep_key_type
 
+NMSettingWirelessSecurity
+NMSettingWirelessSecurityClass
 NM_IS_SETTING_WIRELESS_SECURITY
 NM_IS_SETTING_WIRELESS_SECURITY_CLASS
 NM_SETTING_WIRELESS_SECURITY
diff --git a/docs/libnm-util/tmpl/nm-connection.sgml b/docs/libnm-util/tmpl/nm-connection.sgml
index e8491ee1..7a40b5e0 100644
--- a/docs/libnm-util/tmpl/nm-connection.sgml
+++ b/docs/libnm-util/tmpl/nm-connection.sgml
@@ -81,14 +81,6 @@ NMConnection
 
 
 
-
-
-
-
-
-@parent: 
-@secrets_updated: 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-8021x.sgml b/docs/libnm-util/tmpl/nm-setting-8021x.sgml
index 881d2e94..580a508f 100644
--- a/docs/libnm-util/tmpl/nm-setting-8021x.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-8021x.sgml
@@ -297,183 +297,6 @@ NMSetting8021x
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-adsl.sgml b/docs/libnm-util/tmpl/nm-setting-adsl.sgml
index 4b3716ef..aa9a1661 100644
--- a/docs/libnm-util/tmpl/nm-setting-adsl.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-adsl.sgml
@@ -138,58 +138,6 @@ NMSettingAdsl
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml b/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml
index 3a9c9773..058e98fc 100644
--- a/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml
@@ -83,33 +83,6 @@ NMSettingBluetooth
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-bond.sgml b/docs/libnm-util/tmpl/nm-setting-bond.sgml
index 2500beed..bc2f7627 100644
--- a/docs/libnm-util/tmpl/nm-setting-bond.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-bond.sgml
@@ -112,33 +112,6 @@ NMSettingBond
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-bridge-port.sgml b/docs/libnm-util/tmpl/nm-setting-bridge-port.sgml
index 692cb73d..ebbed6db 100644
--- a/docs/libnm-util/tmpl/nm-setting-bridge-port.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-bridge-port.sgml
@@ -75,38 +75,6 @@ NMSettingBridgePort
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-bridge.sgml b/docs/libnm-util/tmpl/nm-setting-bridge.sgml
index bf9593e5..328eb755 100644
--- a/docs/libnm-util/tmpl/nm-setting-bridge.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-bridge.sgml
@@ -103,58 +103,6 @@ NMSettingBridge
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-cdma.sgml b/docs/libnm-util/tmpl/nm-setting-cdma.sgml
index 4c90acb1..fdcad0de 100644
--- a/docs/libnm-util/tmpl/nm-setting-cdma.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-cdma.sgml
@@ -83,43 +83,6 @@ NMSettingCdma
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-connection.sgml b/docs/libnm-util/tmpl/nm-setting-connection.sgml
index aa04897e..e92e758a 100644
--- a/docs/libnm-util/tmpl/nm-setting-connection.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-connection.sgml
@@ -194,17 +194,6 @@ NMSettingConnection
 
 
 
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-gsm.sgml b/docs/libnm-util/tmpl/nm-setting-gsm.sgml
index d73ab6df..ec7f841e 100644
--- a/docs/libnm-util/tmpl/nm-setting-gsm.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-gsm.sgml
@@ -166,78 +166,6 @@ NMSettingGsm
 @NM_SETTING_GSM_BAND_U1900: 
 @NM_SETTING_GSM_BAND_U2600: 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-infiniband.sgml b/docs/libnm-util/tmpl/nm-setting-infiniband.sgml
index 39f397eb..9331ee3e 100644
--- a/docs/libnm-util/tmpl/nm-setting-infiniband.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-infiniband.sgml
@@ -75,38 +75,6 @@ NMSettingInfiniband
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml b/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml
index ea5b49c9..c01e5a96 100644
--- a/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml
@@ -174,12 +174,6 @@ NMSettingIP4Config
 
 
 
-
-
-
-
-
-
 
 
 
@@ -278,12 +272,6 @@ NMSettingIP4Config
 @gateway: 
 
 
-
-
-
-
-
-
 
 
 
@@ -400,83 +388,6 @@ NMSettingIP4Config
 @metric: 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml b/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml
index df2fbec4..dc99e3e1 100644
--- a/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml
@@ -184,12 +184,6 @@ NMSettingIP6Config
 @NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_PUBLIC_ADDR: 
 @NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR: 
 
-
-
-
-
-
-
 
 
 
@@ -288,12 +282,6 @@ NMSettingIP6Config
 @gateway: 
 
 
-
-
-
-
-
-
 
 
 
@@ -410,78 +398,6 @@ NMSettingIP6Config
 @metric: 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml b/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml
index 6d525379..c3971303 100644
--- a/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml
@@ -75,38 +75,6 @@ NMSettingOlpcMesh
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-ppp.sgml b/docs/libnm-util/tmpl/nm-setting-ppp.sgml
index 69cf509c..ccf4f0d9 100644
--- a/docs/libnm-util/tmpl/nm-setting-ppp.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-ppp.sgml
@@ -181,113 +181,6 @@ NMSettingPPP
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-pppoe.sgml b/docs/libnm-util/tmpl/nm-setting-pppoe.sgml
index 1ab1ae55..f34ba1d2 100644
--- a/docs/libnm-util/tmpl/nm-setting-pppoe.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-pppoe.sgml
@@ -83,43 +83,6 @@ NMSettingPPPOE
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-serial.sgml b/docs/libnm-util/tmpl/nm-setting-serial.sgml
index b79ec0a9..fcd7e170 100644
--- a/docs/libnm-util/tmpl/nm-setting-serial.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-serial.sgml
@@ -90,48 +90,6 @@ NMSettingSerial
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-vlan.sgml b/docs/libnm-util/tmpl/nm-setting-vlan.sgml
index 47b44bd6..4443c2a0 100644
--- a/docs/libnm-util/tmpl/nm-setting-vlan.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-vlan.sgml
@@ -97,53 +97,6 @@ NMSettingVlan
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-vpn.sgml b/docs/libnm-util/tmpl/nm-setting-vpn.sgml
index 4b323f35..a3f8b7fb 100644
--- a/docs/libnm-util/tmpl/nm-setting-vpn.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-vpn.sgml
@@ -82,43 +82,6 @@ NMSettingVPN
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-wimax.sgml b/docs/libnm-util/tmpl/nm-setting-wimax.sgml
index 151e723e..ebfbd61a 100644
--- a/docs/libnm-util/tmpl/nm-setting-wimax.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-wimax.sgml
@@ -68,29 +68,6 @@ NMSettingWimax
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-wired.sgml b/docs/libnm-util/tmpl/nm-setting-wired.sgml
index 893a9c06..d2e80029 100644
--- a/docs/libnm-util/tmpl/nm-setting-wired.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-wired.sgml
@@ -131,78 +131,6 @@ NMSettingWired
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml b/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml
index 7c8b7dc8..cb67e6e2 100644
--- a/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml
@@ -187,108 +187,6 @@ NMSettingWirelessSecurity
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-wireless.sgml b/docs/libnm-util/tmpl/nm-setting-wireless.sgml
index e390bb09..af9da818 100644
--- a/docs/libnm-util/tmpl/nm-setting-wireless.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-wireless.sgml
@@ -175,93 +175,6 @@ NMSettingWireless
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting.sgml b/docs/libnm-util/tmpl/nm-setting.sgml
index d5df34e5..beb8c66b 100644
--- a/docs/libnm-util/tmpl/nm-setting.sgml
+++ b/docs/libnm-util/tmpl/nm-setting.sgml
@@ -128,22 +128,6 @@ NMSetting
 @Returns: 
 
 
-
-
-
-
-
-@parent: 
-@verify: 
-@need_secrets: 
-@update_one_secret: 
-@get_secret_flags: 
-@set_secret_flags: 
-@compare_property: 
-@clear_secrets_with_flags: 
-@get_virtual_iface_name: 
-@_reserved1: 
-
 
 
 
diff --git a/docs/libnm-util/version.xml b/docs/libnm-util/version.xml
index fe98bd59..dd62f24f 100644
--- a/docs/libnm-util/version.xml
+++ b/docs/libnm-util/version.xml
@@ -1 +1 @@
-0.9.8.8
+0.9.8.10
diff --git a/examples/C/Makefile.in b/examples/C/Makefile.in
index 25d3bbcd..724e1e09 100644
--- a/examples/C/Makefile.in
+++ b/examples/C/Makefile.in
@@ -212,6 +212,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -234,6 +235,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
diff --git a/examples/C/glib/Makefile.am b/examples/C/glib/Makefile.am
index 1511f607..1f4785da 100644
--- a/examples/C/glib/Makefile.am
+++ b/examples/C/glib/Makefile.am
@@ -1,10 +1,9 @@
-INCLUDES = -I${top_srcdir}/libnm-util         \
-	   -I${top_builddir}/libnm-util         \
-           -I${top_srcdir}/libnm-glib         \
-           -I${top_srcdir}/include	      \
-           -I${top_builddir}/include
-
 AM_CPPFLAGS = \
+	-I${top_srcdir}/libnm-util \
+	-I${top_builddir}/libnm-util \
+	-I${top_srcdir}/libnm-glib \
+	-I${top_srcdir}/include \
+	-I${top_builddir}/include \
 	$(DBUS_CFLAGS) \
 	$(GLIB_CFLAGS)
 
diff --git a/examples/C/glib/Makefile.in b/examples/C/glib/Makefile.in
index 3e4ae066..ff7d65a4 100644
--- a/examples/C/glib/Makefile.in
+++ b/examples/C/glib/Makefile.in
@@ -281,6 +281,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -303,6 +304,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -487,13 +489,12 @@ with_dhclient = @with_dhclient@
 with_dhcpcd = @with_dhcpcd@
 with_netconfig = @with_netconfig@
 with_resolvconf = @with_resolvconf@
-INCLUDES = -I${top_srcdir}/libnm-util         \
-	   -I${top_builddir}/libnm-util         \
-           -I${top_srcdir}/libnm-glib         \
-           -I${top_srcdir}/include	      \
-           -I${top_builddir}/include
-
 AM_CPPFLAGS = \
+	-I${top_srcdir}/libnm-util \
+	-I${top_builddir}/libnm-util \
+	-I${top_srcdir}/libnm-glib \
+	-I${top_srcdir}/include \
+	-I${top_builddir}/include \
 	$(DBUS_CFLAGS) \
 	$(GLIB_CFLAGS)
 
diff --git a/examples/C/qt/Makefile.am b/examples/C/qt/Makefile.am
index a0cf8f4d..15b6bf45 100644
--- a/examples/C/qt/Makefile.am
+++ b/examples/C/qt/Makefile.am
@@ -1,7 +1,6 @@
-INCLUDES = -I${top_srcdir}/include \
-	   -I${top_builddir}/include
-
 AM_CPPFLAGS = \
+	-I${top_srcdir}/include \
+	-I${top_builddir}/include \
 	$(DBUS_CFLAGS) \
 	$(QT_CFLAGS)
 
diff --git a/examples/C/qt/Makefile.in b/examples/C/qt/Makefile.in
index 7c51cff7..9ef5fea6 100644
--- a/examples/C/qt/Makefile.in
+++ b/examples/C/qt/Makefile.in
@@ -222,6 +222,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -244,6 +245,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -428,10 +430,9 @@ with_dhclient = @with_dhclient@
 with_dhcpcd = @with_dhcpcd@
 with_netconfig = @with_netconfig@
 with_resolvconf = @with_resolvconf@
-INCLUDES = -I${top_srcdir}/include \
-	   -I${top_builddir}/include
-
 AM_CPPFLAGS = \
+	-I${top_srcdir}/include \
+	-I${top_builddir}/include \
 	$(DBUS_CFLAGS) \
 	$(QT_CFLAGS)
 
diff --git a/examples/Makefile.in b/examples/Makefile.in
index 045c6141..22bf9efb 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -211,6 +211,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -233,6 +234,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
diff --git a/examples/dispatcher/Makefile.in b/examples/dispatcher/Makefile.in
index e14ae85a..7325da6b 100644
--- a/examples/dispatcher/Makefile.in
+++ b/examples/dispatcher/Makefile.in
@@ -151,6 +151,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -173,6 +174,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
diff --git a/examples/python/Makefile.in b/examples/python/Makefile.in
index a2d54eaf..e2dea30a 100644
--- a/examples/python/Makefile.in
+++ b/examples/python/Makefile.in
@@ -151,6 +151,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -173,6 +174,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
diff --git a/examples/python/add-connection.py b/examples/python/add-connection.py
index 24b3f600..6df14c10 100755
--- a/examples/python/add-connection.py
+++ b/examples/python/add-connection.py
@@ -21,7 +21,7 @@
 # This example adds a new ethernet connection via AddConnection() D-Bus call.
 #
 # Configuration settings are described at
-# http://projects.gnome.org/NetworkManager/developers/api/09/ref-settings.html
+# https://developer.gnome.org/NetworkManager/0.9/ref-settings.html
 #
 
 import socket, struct, dbus, uuid
diff --git a/examples/ruby/Makefile.in b/examples/ruby/Makefile.in
index caf315e3..5213269d 100644
--- a/examples/ruby/Makefile.in
+++ b/examples/ruby/Makefile.in
@@ -151,6 +151,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -173,6 +174,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
diff --git a/examples/ruby/add-connection.rb b/examples/ruby/add-connection.rb
index 4256848f..6af723bf 100755
--- a/examples/ruby/add-connection.rb
+++ b/examples/ruby/add-connection.rb
@@ -28,7 +28,7 @@ require 'ipaddr'
 # and "clone-mac-address".
 #
 # Configuration settings are described here:
-# http://projects.gnome.org/NetworkManager/developers/api/09/ref-settings.html
+# https://developer.gnome.org/NetworkManager/0.9/ref-settings.html
 #
 
 # Helper functions
diff --git a/examples/shell/Makefile.in b/examples/shell/Makefile.in
index c14a9e38..55f4fb21 100644
--- a/examples/shell/Makefile.in
+++ b/examples/shell/Makefile.in
@@ -151,6 +151,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -173,6 +174,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
diff --git a/gtk-doc.make b/gtk-doc.make
index 3b5bed0e..dd319930 100644
--- a/gtk-doc.make
+++ b/gtk-doc.make
@@ -49,9 +49,13 @@ REPORT_FILES = \
 	$(DOC_MODULE)-undeclared.txt \
 	$(DOC_MODULE)-unused.txt
 
-CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
+gtkdoc-check.test: Makefile
+	$(AM_V_GEN)echo "#!/bin/sh -e" > $@; \
+		echo "$(GTKDOC_CHECK_PATH) || exit 1" >> $@; \
+		chmod +x $@
+
+CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) gtkdoc-check.test
 
-if ENABLE_GTK_DOC
 if GTK_DOC_BUILD_HTML
 HTML_BUILD_STAMP=html-build.stamp
 else
@@ -63,9 +67,11 @@ else
 PDF_BUILD_STAMP=
 endif
 
-all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
-else
-all-local:
+all-gtk-doc: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
+.PHONY: all-gtk-doc
+
+if ENABLE_GTK_DOC
+all-local: all-gtk-doc
 endif
 
 docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
@@ -83,12 +89,14 @@ setup-build.stamp:
 	    files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
 	    if test "x$$files" != "x" ; then \
 	        for file in $$files ; do \
+	            destdir=`dirname $(abs_builddir)/$$file` ;\
+	            test -d "$$destdir" || mkdir -p "$$destdir"; \
 	            test -f $(abs_srcdir)/$$file && \
-	                cp -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
+	                cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
 	        done; \
 	    fi; \
 	    test -d $(abs_srcdir)/tmpl && \
-	        { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \
+	        { cp -pR $(abs_srcdir)/tmpl $(abs_builddir)/; \
 	        chmod -R u+w $(abs_builddir)/tmpl; } \
 	fi
 	$(AM_V_at)touch setup-build.stamp
@@ -103,7 +111,7 @@ GTK_DOC_V_INTROSPECT=$(GTK_DOC_V_INTROSPECT_$(V))
 GTK_DOC_V_INTROSPECT_=$(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY))
 GTK_DOC_V_INTROSPECT_0=@echo "  DOC   Introspecting gobjects";
 
-scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
+scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
 	$(GTK_DOC_V_SCAN)_source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
@@ -139,7 +147,7 @@ tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DO
 	$(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
 	$(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
 	  if test -w $(abs_srcdir) ; then \
-	    cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \
+	    cp -pR $(abs_builddir)/tmpl $(abs_srcdir)/; \
 	  fi \
 	fi
 	$(AM_V_at)touch tmpl-build.stamp
@@ -157,7 +165,7 @@ GTK_DOC_V_XML_=$(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY))
 GTK_DOC_V_XML_0=@echo "  DOC   Building XML";
 
 sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
-	$(GTK_DOC_V_XML)-chmod -R u+w $(srcdir) && _source_dir='' ; \
+	-$(GTK_DOC_V_XML)chmod -R u+w $(srcdir) && _source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
 	done ; \
@@ -235,6 +243,9 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 clean-local:
 	@rm -f *~ *.bak
 	@rm -rf .libs
+	@if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \
+	  rm -f $(DOC_MODULE).types; \
+	fi
 
 distclean-local:
 	@rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
@@ -280,15 +291,17 @@ uninstall-local:
 #
 # Require gtk-doc when making dist
 #
-if ENABLE_GTK_DOC
+if HAVE_GTK_DOC
 dist-check-gtkdoc: docs
 else
 dist-check-gtkdoc:
-	@echo "*** gtk-doc must be installed and enabled in order to make dist"
+	@echo "*** gtk-doc is needed to run 'make dist'.         ***"
+	@echo "*** gtk-doc was not found when 'configure' ran.   ***"
+	@echo "*** please install gtk-doc and rerun 'configure'. ***"
 	@false
 endif
 
-dist-hook: dist-check-gtkdoc dist-hook-local
+dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local
 	@mkdir $(distdir)/tmpl
 	@mkdir $(distdir)/html
 	@-cp ./tmpl/*.sgml $(distdir)/tmpl
diff --git a/include/Makefile.in b/include/Makefile.in
index dfe0a4a4..f4907841 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -200,6 +200,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -222,6 +223,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
diff --git a/introspection/Makefile.in b/introspection/Makefile.in
index a7e09542..f5c1f23a 100644
--- a/introspection/Makefile.in
+++ b/introspection/Makefile.in
@@ -152,6 +152,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -174,6 +175,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
diff --git a/libnm-glib/Makefile.am b/libnm-glib/Makefile.am
index c692a3ca..410848af 100644
--- a/libnm-glib/Makefile.am
+++ b/libnm-glib/Makefile.am
@@ -2,7 +2,7 @@ include $(GLIB_MAKEFILE)
 
 SUBDIRS = . tests
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libnm-util \
@@ -28,6 +28,7 @@ libdeprecated_nm_glib_la_SOURCES = \
 libdeprecated_nm_glib_la_CPPFLAGS = \
 	$(DBUS_CFLAGS) \
 	$(GLIB_CFLAGS) \
+	$(AM_CPPFLAGS) \
 	-Wno-deprecated-declarations \
 	-Wno-deprecated
 
@@ -219,7 +220,7 @@ NMClient-1.0.gir: libnm-glib.la
 NMClient_1_0_gir_INCLUDES = Gio-2.0 DBusGLib-1.0
 NMClient_1_0_gir_PACKAGES = gio-2.0 dbus-glib-1 gudev-1.0
 NMClient_1_0_gir_EXPORT_PACKAGES = libnm-glib libnm-glib-vpn
-NMClient_1_0_gir_CFLAGS = $(INCLUDES) -I$(top_srcdir)/libnm-glib -I$(top_srcdir)/libnm-util
+NMClient_1_0_gir_CFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/libnm-glib -I$(top_srcdir)/libnm-util
 NMClient_1_0_gir_LIBS = libnm-glib.la $(top_builddir)/libnm-util/libnm-util.la
 NMClient_1_0_gir_FILES = $(introspection_sources)
 NMClient_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NM --symbol-prefix=nm --include-uninstalled=$(top_builddir)/libnm-util/NetworkManager-1.0.gir
diff --git a/libnm-glib/Makefile.in b/libnm-glib/Makefile.in
index 4a94d03a..e726df56 100644
--- a/libnm-glib/Makefile.in
+++ b/libnm-glib/Makefile.in
@@ -388,6 +388,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -410,6 +411,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -595,7 +597,7 @@ with_dhcpcd = @with_dhcpcd@
 with_netconfig = @with_netconfig@
 with_resolvconf = @with_resolvconf@
 SUBDIRS = . tests
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libnm-util \
@@ -618,6 +620,7 @@ libdeprecated_nm_glib_la_SOURCES = \
 libdeprecated_nm_glib_la_CPPFLAGS = \
 	$(DBUS_CFLAGS) \
 	$(GLIB_CFLAGS) \
+	$(AM_CPPFLAGS) \
 	-Wno-deprecated-declarations \
 	-Wno-deprecated
 
@@ -781,7 +784,7 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(top_builddir)/libnm-util
 @HAVE_INTROSPECTION_TRUE@NMClient_1_0_gir_INCLUDES = Gio-2.0 DBusGLib-1.0
 @HAVE_INTROSPECTION_TRUE@NMClient_1_0_gir_PACKAGES = gio-2.0 dbus-glib-1 gudev-1.0
 @HAVE_INTROSPECTION_TRUE@NMClient_1_0_gir_EXPORT_PACKAGES = libnm-glib libnm-glib-vpn
-@HAVE_INTROSPECTION_TRUE@NMClient_1_0_gir_CFLAGS = $(INCLUDES) -I$(top_srcdir)/libnm-glib -I$(top_srcdir)/libnm-util
+@HAVE_INTROSPECTION_TRUE@NMClient_1_0_gir_CFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/libnm-glib -I$(top_srcdir)/libnm-util
 @HAVE_INTROSPECTION_TRUE@NMClient_1_0_gir_LIBS = libnm-glib.la $(top_builddir)/libnm-util/libnm-util.la
 @HAVE_INTROSPECTION_TRUE@NMClient_1_0_gir_FILES = $(introspection_sources)
 @HAVE_INTROSPECTION_TRUE@NMClient_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NM --symbol-prefix=nm --include-uninstalled=$(top_builddir)/libnm-util/NetworkManager-1.0.gir
diff --git a/libnm-glib/nm-access-point.c b/libnm-glib/nm-access-point.c
index 9326d3ab..d13a7d3c 100644
--- a/libnm-glib/nm-access-point.c
+++ b/libnm-glib/nm-access-point.c
@@ -354,7 +354,6 @@ nm_access_point_connection_valid (NMAccessPoint *ap, NMConnection *connection)
 
 	/* Band and Channel/Frequency */
 	ap_freq = nm_access_point_get_frequency (ap);
-	g_warn_if_fail (ap_freq > 0);
 	if (ap_freq) {
 		setting_band = nm_setting_wireless_get_band (s_wifi);
 		if (g_strcmp0 (setting_band, "a") == 0) {
diff --git a/libnm-glib/nm-client.c b/libnm-glib/nm-client.c
index 9226d350..658a3995 100644
--- a/libnm-glib/nm-client.c
+++ b/libnm-glib/nm-client.c
@@ -1404,9 +1404,11 @@ check_connectivity_cb (DBusGProxy *proxy,
 	CheckConnectivityData *ccd = g_simple_async_result_get_op_res_gpointer (simple);
 	GError *error = NULL;
 
-	if (!dbus_g_proxy_end_call (proxy, call, &error,
-	                            G_TYPE_UINT, &ccd->connectivity,
-	                            G_TYPE_INVALID))
+	if (g_cancellable_set_error_if_cancelled (ccd->cancellable, &error))
+		g_simple_async_result_take_error (simple, error);
+	else if (!dbus_g_proxy_end_call (proxy, call, &error,
+	                                 G_TYPE_UINT, &ccd->connectivity,
+	                                 G_TYPE_INVALID))
 		g_simple_async_result_take_error (simple, error);
 
 	g_simple_async_result_complete (simple);
@@ -1466,7 +1468,6 @@ nm_client_check_connectivity_async (NMClient *client,
 		ccd->cancelled_id = g_signal_connect (cancellable, "cancelled",
 		                                      G_CALLBACK (check_connectivity_cancelled_cb),
 		                                      simple);
-		g_simple_async_result_set_check_cancellable (simple, cancellable);
 	}
 
 	ccd->call = dbus_g_proxy_begin_call (priv->client_proxy, "CheckConnectivity",
diff --git a/libnm-glib/nm-ip4-config.c b/libnm-glib/nm-ip4-config.c
index 862e7a01..80751c31 100644
--- a/libnm-glib/nm-ip4-config.c
+++ b/libnm-glib/nm-ip4-config.c
@@ -104,7 +104,7 @@ demarshal_ip4_routes_array (NMObject *object, GParamSpec *pspec, GValue *value,
 {
 	NMIP4ConfigPrivate *priv = NM_IP4_CONFIG_GET_PRIVATE (object);
 
-	g_slist_foreach (priv->routes, (GFunc) g_free, NULL);
+	g_slist_foreach (priv->routes, (GFunc) nm_ip4_route_unref, NULL);
 	g_slist_free (priv->routes);
 	priv->routes = NULL;
 
@@ -156,10 +156,10 @@ finalize (GObject *object)
 {
 	NMIP4ConfigPrivate *priv = NM_IP4_CONFIG_GET_PRIVATE (object);
 
-	g_slist_foreach (priv->addresses, (GFunc) g_free, NULL);
+	g_slist_foreach (priv->addresses, (GFunc) nm_ip4_address_unref, NULL);
 	g_slist_free (priv->addresses);
 
-	g_slist_foreach (priv->routes, (GFunc) g_free, NULL);
+	g_slist_foreach (priv->routes, (GFunc) nm_ip4_route_unref, NULL);
 	g_slist_free (priv->routes);
 
 	if (priv->nameservers)
diff --git a/libnm-glib/nm-object.c b/libnm-glib/nm-object.c
index 7696673b..93919d61 100644
--- a/libnm-glib/nm-object.c
+++ b/libnm-glib/nm-object.c
@@ -23,6 +23,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include "NetworkManager.h"
 #include "nm-object.h"
@@ -33,7 +34,8 @@
 #include "nm-types.h"
 #include "nm-glib-marshal.h"
 
-#define DEBUG 0
+static gboolean debug = FALSE;
+#define dbgmsg(f,...) if (G_UNLIKELY (debug)) { g_message (f, ## __VA_ARGS__ ); }
 
 static void nm_object_initable_iface_init (GInitableIface *iface);
 static void nm_object_async_initable_iface_init (GAsyncInitableIface *iface);
@@ -139,7 +141,7 @@ constructor (GType type,
 	priv = NM_OBJECT_GET_PRIVATE (object);
 
 	if (priv->connection == NULL || priv->path == NULL) {
-		g_warning ("%s: bus connection and path required.", __func__);
+		g_warn_if_reached ();
 		g_object_unref (object);
 		return NULL;
 	}
@@ -433,10 +435,13 @@ deferred_notify_cb (gpointer data)
 	props = g_slist_reverse (priv->notify_props);
 	priv->notify_props = NULL;
 
+	g_object_ref (object);
 	for (iter = props; iter; iter = g_slist_next (iter)) {
 		g_object_notify (G_OBJECT (object), (const char *) iter->data);
 		g_free (iter->data);
 	}
+	g_object_unref (object);
+
 	g_slist_free (props);
 	return FALSE;
 }
@@ -490,7 +495,7 @@ _nm_object_create (GType type, DBusGConnection *connection, const char *path)
 		type = type_func (connection, path);
 
 	if (type == G_TYPE_INVALID) {
-		g_warning ("Could not create object for %s: unknown object type", path);
+		dbgmsg ("Could not create object for %s: unknown object type", path);
 		return NULL;
 	}
 
@@ -499,10 +504,9 @@ _nm_object_create (GType type, DBusGConnection *connection, const char *path)
 	                       NM_OBJECT_DBUS_PATH, path,
 	                       NULL);
 	if (!g_initable_init (G_INITABLE (object), NULL, &error)) {
-		g_object_unref (object);
-		object = NULL;
-		g_warning ("Could not create object for %s: %s", path, error->message);
+		dbgmsg ("Could not create object for %s: %s", path, error->message);
 		g_error_free (error);
+		g_clear_object (&object);
 	}
 
 	return object;
@@ -544,11 +548,11 @@ async_inited (GObject *source, GAsyncResult *result, gpointer user_data)
 	GError *error = NULL;
 
 	if (!g_async_initable_init_finish (G_ASYNC_INITABLE (object), result, &error)) {
-		g_warning ("Could not create object for %s: %s",
-		           nm_object_or_connection_get_path (object), error->message);
+		dbgmsg ("Could not create object for %s: %s",
+		        nm_object_or_connection_get_path (object),
+		        error->message);
 		g_error_free (error);
-		g_object_unref (object);
-		object = NULL;
+		g_clear_object (&object);
 	}
 
 	create_async_complete (object, async_data);
@@ -850,36 +854,33 @@ handle_property_changed (NMObject *self, const char *dbus_name, GValue *value, g
 	}
 
 	if (!found) {
-#if DEBUG
-		g_warning ("Property '%s' unhandled.", prop_name);
-#endif
+		dbgmsg ("Property '%s' unhandled.", prop_name);
 		goto out;
 	}
 
 	pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (G_OBJECT (self)), prop_name);
 	if (!pspec) {
-		g_warning ("%s: property '%s' changed but wasn't defined by object type %s.",
-		           __func__,
-		           prop_name,
-		           G_OBJECT_TYPE_NAME (self));
+		dbgmsg ("%s: property '%s' changed but wasn't defined by object type %s.",
+		        __func__,
+		        prop_name,
+		        G_OBJECT_TYPE_NAME (self));
 		goto out;
 	}
 
-#if DEBUG
-	{
+	if (G_UNLIKELY (debug)) {
 		char *s;
 		s = g_strdup_value_contents (value);
-		g_message ("PC: %p (%s) prop (%s) '%s' value (%s) %s",
-		           self, G_OBJECT_TYPE_NAME (self),
-		           g_type_name (pspec->value_type), prop_name,
-		           G_VALUE_TYPE_NAME (value), s);
+		dbgmsg ("PC: (%p) %s::%s => '%s' (%s%s%s)",
+		        self, G_OBJECT_TYPE_NAME (self),
+		        prop_name,
+		        s,
+		        G_VALUE_TYPE_NAME (value),
+		        pi->object_type ? " / " : "",
+		        pi->object_type ? g_type_name (pi->object_type) : "");
 		g_free (s);
 	}
-#endif
+
 	if (pi->object_type) {
-#if DEBUG
-		g_message ("   Value is object type %s", g_type_name (pi->object_type));
-#endif
 		if (G_VALUE_HOLDS (value, DBUS_TYPE_G_OBJECT_PATH))
 			success = handle_object_property (self, pspec->name, value, pi, synchronously);
 		else if (G_VALUE_HOLDS (value, DBUS_TYPE_G_ARRAY_OF_OBJECT_PATH))
@@ -892,10 +893,10 @@ handle_property_changed (NMObject *self, const char *dbus_name, GValue *value, g
 		success = (*(pi->func)) (self, pspec, value, pi->field);
 
 	if (!success) {
-		g_warning ("%s: failed to update property '%s' of object type %s.",
-		           __func__,
-		           prop_name,
-		           G_OBJECT_TYPE_NAME (self));
+		dbgmsg ("%s: failed to update property '%s' of object type %s.",
+		        __func__,
+		        prop_name,
+		        G_OBJECT_TYPE_NAME (self));
 	}
 
 out:
@@ -917,8 +918,8 @@ process_properties_changed (NMObject *self, GHashTable *properties, gboolean syn
 		if (value)
 			handle_property_changed (self, name, value, synchronously);
 		else {
-			g_warning ("%s:%d %s(): object %s property '%s' value is unexpectedly NULL",
-			           __FILE__, __LINE__, __func__, G_OBJECT_TYPE_NAME (self), (const char *) name);
+			dbgmsg ("%s:%d %s(): object %s property '%s' value is unexpectedly NULL",
+			        __FILE__, __LINE__, __func__, G_OBJECT_TYPE_NAME (self), (const char *) name);
 		}
 	}
 }
@@ -978,9 +979,11 @@ demarshal_generic (NMObject *object,
 	HANDLE_TYPE(LONG, long, long)
 	HANDLE_TYPE(ULONG, ulong, ulong)
 	} else {
-		g_warning ("%s: %s/%s unhandled type %s.",
-		           __func__, G_OBJECT_TYPE_NAME (object), pspec->name,
-		           g_type_name (pspec->value_type));
+		dbgmsg ("%s: %s/%s unhandled type %s.",
+		        __func__,
+		        G_OBJECT_TYPE_NAME (object),
+		        pspec->name,
+		        g_type_name (pspec->value_type));
 		success = FALSE;
 	}
 
@@ -988,9 +991,9 @@ done:
 	if (success) {
 		_nm_object_queue_notify (object, pspec->name);
 	} else {
-		g_warning ("%s: %s/%s (type %s) couldn't be set with type %s.",
-		           __func__, G_OBJECT_TYPE_NAME (object), pspec->name,
-		           g_type_name (pspec->value_type), G_VALUE_TYPE_NAME (value));
+		dbgmsg ("%s: %s/%s (type %s) couldn't be set with type %s.",
+		        __func__, G_OBJECT_TYPE_NAME (object), pspec->name,
+		        g_type_name (pspec->value_type), G_VALUE_TYPE_NAME (value));
 	}
 	return success;
 }
@@ -1001,6 +1004,8 @@ _nm_object_register_properties (NMObject *object,
                                 const NMPropertiesInfo *info)
 {
 	NMObjectPrivate *priv = NM_OBJECT_GET_PRIVATE (object);
+	static gsize dval = 0;
+	const char *debugstr;
 	NMPropertiesInfo *tmp;
 	GHashTable *instance;
 
@@ -1008,6 +1013,13 @@ _nm_object_register_properties (NMObject *object,
 	g_return_if_fail (proxy != NULL);
 	g_return_if_fail (info != NULL);
 
+	if (g_once_init_enter (&dval)) {
+		debugstr = getenv ("LIBNM_GLIB_DEBUG");
+		if (debugstr && strstr (debugstr, "properties-changed"))
+			debug = TRUE;
+		g_once_init_leave (&dval, 1);
+	}
+
 	priv->property_interfaces = g_slist_prepend (priv->property_interfaces,
 	                                             g_strdup (dbus_g_proxy_get_interface (proxy)));
 
@@ -1087,9 +1099,10 @@ _nm_object_ensure_inited (NMObject *object)
 
 	if (!priv->inited) {
 		if (!g_initable_init (G_INITABLE (object), NULL, &error)) {
-			g_warning ("Could not initialize %s %s: %s",
-			           G_OBJECT_TYPE_NAME (object), priv->path,
-			           error->message);
+			dbgmsg ("Could not initialize %s %s: %s",
+			        G_OBJECT_TYPE_NAME (object),
+			        priv->path,
+			        error->message);
 			g_error_free (error);
 
 			/* Only warn once */
@@ -1117,17 +1130,12 @@ _nm_object_reload_property (NMObject *object,
 							G_TYPE_INVALID,
 							G_TYPE_VALUE, &value,
 							G_TYPE_INVALID)) {
-		/* Don't warn about D-Bus no reply/timeout errors; it's mostly noise and
-		 * happens for example when NM quits and the applet is still running.
-		 */
-		if (!g_error_matches (err, DBUS_GERROR, DBUS_GERROR_NO_REPLY)) {
-			g_warning ("%s: Error getting '%s' for %s: (%d) %s\n",
-			           __func__,
-			           prop_name,
-			           nm_object_get_path (object),
-			           err->code,
-			           err->message);
-		}
+		dbgmsg ("%s: Error getting '%s' for %s: (%d) %s\n",
+		        __func__,
+		        prop_name,
+		        nm_object_get_path (object),
+		        err->code,
+		        err->message);
 		g_clear_error (&err);
 		return;
 	}
diff --git a/libnm-glib/nm-remote-connection.c b/libnm-glib/nm-remote-connection.c
index b5c2821f..9cadf2f7 100644
--- a/libnm-glib/nm-remote-connection.c
+++ b/libnm-glib/nm-remote-connection.c
@@ -102,6 +102,7 @@ update_cb (DBusGProxy *proxy, DBusGProxyCall *proxy_call, gpointer user_data)
 	RemoteCall *call = user_data;
 	NMRemoteConnectionCommitFunc func = (NMRemoteConnectionCommitFunc) call->callback;
 	GError *error = NULL;
+	NMRemoteConnection *self = g_object_ref (call->self);
 
 	dbus_g_proxy_end_call (proxy, proxy_call, &error,
 	                       G_TYPE_INVALID);
@@ -109,6 +110,7 @@ update_cb (DBusGProxy *proxy, DBusGProxyCall *proxy_call, gpointer user_data)
 		(*func)(call->self, error, call->user_data);
 	g_clear_error (&error);
 	remote_call_complete (call->self, call);
+	g_object_unref (self);
 }
 
 /**
@@ -206,13 +208,15 @@ get_secrets_cb (DBusGProxy *proxy, DBusGProxyCall *proxy_call, gpointer user_dat
 {
 	RemoteCall *call = user_data;
 	NMRemoteConnectionGetSecretsFunc func = (NMRemoteConnectionGetSecretsFunc) call->callback;
-	GHashTable *secrets;
+	GHashTable *secrets = NULL;
 	GError *error = NULL;
 
 	dbus_g_proxy_end_call (proxy, proxy_call, &error,
 	                       DBUS_TYPE_G_MAP_OF_MAP_OF_VARIANT, &secrets,
 	                       G_TYPE_INVALID);
 	(*func)(call->self, error ? NULL : secrets, error, call->user_data);
+	if (secrets)
+		g_hash_table_destroy (secrets);
 	g_clear_error (&error);
 	remote_call_complete (call->self, call);
 }
diff --git a/libnm-glib/nm-remote-settings.c b/libnm-glib/nm-remote-settings.c
index 989528cb..34817e2c 100644
--- a/libnm-glib/nm-remote-settings.c
+++ b/libnm-glib/nm-remote-settings.c
@@ -545,7 +545,7 @@ add_connection_done (DBusGProxy *proxy, DBusGProxyCall *call, gpointer user_data
  * Requests that the remote settings service add the given settings to a new
  * connection.
  *
- * Returns: TRUE if the request was successful, FALSE if it failed
+ * Returns: %TRUE if the request was successful, %FALSE if it failed
  **/
 gboolean
 nm_remote_settings_add_connection (NMRemoteSettings *settings,
@@ -652,7 +652,7 @@ save_hostname_cb (DBusGProxy *proxy,
  * Requests that the machine's persistent hostname be set to the specified value
  * or cleared.
  *
- * Returns: TRUE if the request was successful, FALSE if it failed
+ * Returns: %TRUE if the request was successful, %FALSE if it failed
  **/
 gboolean
 nm_remote_settings_save_hostname (NMRemoteSettings *settings,
diff --git a/libnm-glib/tests/Makefile.am b/libnm-glib/tests/Makefile.am
index 5fda5bd2..07994481 100644
--- a/libnm-glib/tests/Makefile.am
+++ b/libnm-glib/tests/Makefile.am
@@ -1,6 +1,6 @@
 if ENABLE_TESTS
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libnm-util \
@@ -16,7 +16,8 @@ test_remote_settings_client_SOURCES = \
 
 test_remote_settings_client_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS)
+	$(DBUS_CFLAGS) \
+	$(AM_CPPFLAGS)
 
 test_remote_settings_client_LDADD = \
 	$(top_builddir)/libnm-util/libnm-util.la \
diff --git a/libnm-glib/tests/Makefile.in b/libnm-glib/tests/Makefile.in
index ef9fb9b9..e9ea17b1 100644
--- a/libnm-glib/tests/Makefile.in
+++ b/libnm-glib/tests/Makefile.in
@@ -210,6 +210,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -232,6 +233,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -416,7 +418,7 @@ with_dhclient = @with_dhclient@
 with_dhcpcd = @with_dhcpcd@
 with_netconfig = @with_netconfig@
 with_resolvconf = @with_resolvconf@
-@ENABLE_TESTS_TRUE@INCLUDES = \
+@ENABLE_TESTS_TRUE@AM_CPPFLAGS = \
 @ENABLE_TESTS_TRUE@	-I$(top_srcdir)/include \
 @ENABLE_TESTS_TRUE@	-I$(top_builddir)/include \
 @ENABLE_TESTS_TRUE@	-I$(top_srcdir)/libnm-util \
@@ -430,7 +432,8 @@ with_resolvconf = @with_resolvconf@
 
 @ENABLE_TESTS_TRUE@test_remote_settings_client_CPPFLAGS = \
 @ENABLE_TESTS_TRUE@	$(GLIB_CFLAGS) \
-@ENABLE_TESTS_TRUE@	$(DBUS_CFLAGS)
+@ENABLE_TESTS_TRUE@	$(DBUS_CFLAGS) \
+@ENABLE_TESTS_TRUE@	$(AM_CPPFLAGS)
 
 @ENABLE_TESTS_TRUE@test_remote_settings_client_LDADD = \
 @ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
diff --git a/libnm-util/Makefile.am b/libnm-util/Makefile.am
index 2222ec2b..2d41164b 100644
--- a/libnm-util/Makefile.am
+++ b/libnm-util/Makefile.am
@@ -2,14 +2,18 @@ include $(GLIB_MAKEFILE)
 
 SUBDIRS = . tests
 
-INCLUDES = -I${top_srcdir} -I${top_srcdir}/include -I${top_builddir}/include
+AM_CPPFLAGS = \
+	-I${top_srcdir} \
+	-I${top_srcdir}/include \
+	-I${top_builddir}/include
 
 lib_LTLIBRARIES=libnm-util.la
 
 libnm_util_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(DBUS_CFLAGS) \
-	$(UUID_CFLAGS)
+	$(UUID_CFLAGS) \
+	$(AM_CPPFLAGS)
 
 libnm_util_include_HEADERS = 		\
 	nm-connection.h			\
@@ -116,7 +120,8 @@ noinst_LTLIBRARIES = libtest-crypto.la
 libtest_crypto_la_SOURCES = crypto.c
 
 libtest_crypto_la_CPPFLAGS = \
-	$(GLIB_CFLAGS)
+	$(GLIB_CFLAGS) \
+	$(AM_CPPFLAGS)
 
 libtest_crypto_la_LIBADD = \
 	$(GLIB_LIBS)
@@ -153,7 +158,7 @@ NetworkManager-1.0.gir: libnm-util.la
 NetworkManager_1_0_gir_INCLUDES = GObject-2.0 DBusGLib-1.0
 NetworkManager_1_0_gir_PACKAGES = gobject-2.0 dbus-glib-1
 NetworkManager_1_0_gir_EXPORT_PACKAGES = libnm-util
-NetworkManager_1_0_gir_CFLAGS = $(INCLUDES) -I$(top_srcdir)/libnm-util
+NetworkManager_1_0_gir_CFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/libnm-util
 NetworkManager_1_0_gir_LIBS = libnm-util.la
 NetworkManager_1_0_gir_FILES = $(introspection_sources)
 NetworkManager_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NM --symbol-prefix=nm
diff --git a/libnm-util/Makefile.in b/libnm-util/Makefile.in
index 7fac11bd..bde92403 100644
--- a/libnm-util/Makefile.in
+++ b/libnm-util/Makefile.in
@@ -353,6 +353,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -375,6 +376,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -560,10 +562,14 @@ with_dhcpcd = @with_dhcpcd@
 with_netconfig = @with_netconfig@
 with_resolvconf = @with_resolvconf@
 SUBDIRS = . tests
-INCLUDES = -I${top_srcdir} -I${top_srcdir}/include -I${top_builddir}/include
+AM_CPPFLAGS = \
+	-I${top_srcdir} \
+	-I${top_srcdir}/include \
+	-I${top_builddir}/include
+
 lib_LTLIBRARIES = libnm-util.la
 libnm_util_la_CPPFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(UUID_CFLAGS) \
-	$(am__append_2) $(am__append_5)
+	$(AM_CPPFLAGS) $(am__append_2) $(am__append_5)
 libnm_util_include_HEADERS = \
 	nm-connection.h			\
 	nm-setting.h			\
@@ -649,8 +655,8 @@ libnm_util_includedir = $(includedir)/NetworkManager
 ###########################################
 noinst_LTLIBRARIES = libtest-crypto.la
 libtest_crypto_la_SOURCES = crypto.c $(am__append_7) $(am__append_10)
-libtest_crypto_la_CPPFLAGS = $(GLIB_CFLAGS) $(am__append_8) \
-	$(am__append_11)
+libtest_crypto_la_CPPFLAGS = $(GLIB_CFLAGS) $(AM_CPPFLAGS) \
+	$(am__append_8) $(am__append_11)
 libtest_crypto_la_LIBADD = $(GLIB_LIBS) $(am__append_9) \
 	$(am__append_12)
 pkgconfigdir = $(libdir)/pkgconfig
@@ -665,7 +671,7 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
 @HAVE_INTROSPECTION_TRUE@NetworkManager_1_0_gir_INCLUDES = GObject-2.0 DBusGLib-1.0
 @HAVE_INTROSPECTION_TRUE@NetworkManager_1_0_gir_PACKAGES = gobject-2.0 dbus-glib-1
 @HAVE_INTROSPECTION_TRUE@NetworkManager_1_0_gir_EXPORT_PACKAGES = libnm-util
-@HAVE_INTROSPECTION_TRUE@NetworkManager_1_0_gir_CFLAGS = $(INCLUDES) -I$(top_srcdir)/libnm-util
+@HAVE_INTROSPECTION_TRUE@NetworkManager_1_0_gir_CFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/libnm-util
 @HAVE_INTROSPECTION_TRUE@NetworkManager_1_0_gir_LIBS = libnm-util.la
 @HAVE_INTROSPECTION_TRUE@NetworkManager_1_0_gir_FILES = $(introspection_sources)
 @HAVE_INTROSPECTION_TRUE@NetworkManager_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NM --symbol-prefix=nm
diff --git a/libnm-util/nm-connection.c b/libnm-util/nm-connection.c
index 15b1685f..390b2a3b 100644
--- a/libnm-util/nm-connection.c
+++ b/libnm-util/nm-connection.c
@@ -1006,9 +1006,8 @@ nm_connection_is_type (NMConnection *connection, const char *type)
 	g_assert (s_con);
 
 	type2 = nm_setting_connection_get_connection_type (s_con);
-	g_assert (type2);
 
-	return !strcmp (type2, type);
+	return (g_strcmp0 (type2, type) == 0);
 }
 
 /**
diff --git a/libnm-util/nm-setting-8021x.c b/libnm-util/nm-setting-8021x.c
index 0a9a2104..914c7ea3 100644
--- a/libnm-util/nm-setting-8021x.c
+++ b/libnm-util/nm-setting-8021x.c
@@ -227,7 +227,7 @@ nm_setting_802_1x_get_eap_method (NMSetting8021x *setting, guint32 i)
  * EAP method has been added.  See #NMSetting8021x:eap property for a list of
  * allowed EAP methods.
  *
- * Returns: TRUE if the EAP method was successfully added, FALSE if it was
+ * Returns: %TRUE if the EAP method was successfully added, %FALSE if it was
  *  not a valid method or if it was already allowed.
  **/
 gboolean
@@ -369,11 +369,11 @@ nm_setting_802_1x_get_ca_path (NMSetting8021x *setting)
  * Sets the #NMSetting8021x:system-ca-certs property. The
  * #NMSetting8021x:ca-path and #NMSetting8021x:phase2-ca-path
  * properties are ignored if the #NMSetting8021x:system-ca-certs property is
- * TRUE, in which case a system-wide CA certificate directory specified at
+ * %TRUE, in which case a system-wide CA certificate directory specified at
  * compile time (using the --system-ca-path configure option) is used in place
  * of these properties. 
  *
- * Returns: TRUE if a system CA certificate path should be used, FALSE if not
+ * Returns: %TRUE if a system CA certificate path should be used, %FALSE if not
  **/
 gboolean
 nm_setting_802_1x_get_system_ca_certs (NMSetting8021x *setting)
@@ -499,7 +499,7 @@ path_to_scheme_value (const char *path)
  * scheme, or with the path to the certificate file if using the
  * %NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
  *
- * Returns: TRUE if the operation succeeded, FALSE if it was unsuccessful
+ * Returns: %TRUE if the operation succeeded, %FALSE if it was unsuccessful
  **/
 gboolean
 nm_setting_802_1x_set_ca_cert (NMSetting8021x *self,
@@ -625,12 +625,12 @@ nm_setting_802_1x_get_altsubject_match (NMSetting8021x *setting, guint32 i)
  * match is added, the altSubjectName of the remote authentication
  * server is not verified.
  *
- * Returns: TRUE if the alternative subject name match was
- *  successfully added, FALSE if it was already allowed.
+ * Returns: %TRUE if the alternative subject name match was
+ *  successfully added, %FALSE if it was already allowed.
  **/
 gboolean
 nm_setting_802_1x_add_altsubject_match (NMSetting8021x *setting,
-										const char *altsubject_match)
+                                        const char *altsubject_match)
 {
 	NMSetting8021xPrivate *priv;
 	GSList *iter;
@@ -644,7 +644,8 @@ nm_setting_802_1x_add_altsubject_match (NMSetting8021x *setting,
 			return FALSE;
 	}
 
-	priv->altsubject_matches = g_slist_append (priv->altsubject_matches, g_strdup (altsubject_match));
+	priv->altsubject_matches = g_slist_append (priv->altsubject_matches,
+	                                           g_strdup (altsubject_match));
 	return TRUE;
 }
 
@@ -774,7 +775,7 @@ nm_setting_802_1x_get_client_cert_path (NMSetting8021x *setting)
  * when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
  * authentication method.
  *
- * Returns: TRUE if the operation succeeded, FALSE if it was unsuccessful
+ * Returns: %TRUE if the operation succeeded, %FALSE if it was unsuccessful
  **/
 gboolean
 nm_setting_802_1x_set_client_cert (NMSetting8021x *self,
@@ -1035,7 +1036,7 @@ nm_setting_802_1x_get_phase2_ca_cert_path (NMSetting8021x *setting)
  * %NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate
  * file if using the %NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
  *
- * Returns: TRUE if the operation succeeded, FALSE if it was unsuccessful
+ * Returns: %TRUE if the operation succeeded, %FALSE if it was unsuccessful
  **/
 gboolean
 nm_setting_802_1x_set_phase2_ca_cert (NMSetting8021x *self,
@@ -1162,12 +1163,12 @@ nm_setting_802_1x_get_phase2_altsubject_match (NMSetting8021x *setting, guint32
  * at least one match is added, the altSubjectName of the "phase 2"
  * remote authentication server is not verified.
  *
- * Returns: TRUE if the "phase 2" alternative subject name match was
- *  successfully added, FALSE if it was already allowed.
+ * Returns: %TRUE if the "phase 2" alternative subject name match was
+ *  successfully added, %FALSE if it was already allowed.
  **/
 gboolean
 nm_setting_802_1x_add_phase2_altsubject_match (NMSetting8021x *setting,
-											   const char *phase2_altsubject_match)
+                                               const char *phase2_altsubject_match)
 {
 	NMSetting8021xPrivate *priv;
 	GSList *iter;
@@ -1181,8 +1182,8 @@ nm_setting_802_1x_add_phase2_altsubject_match (NMSetting8021x *setting,
 			return FALSE;
 	}
 
-	priv->phase2_altsubject_matches = g_slist_append (priv->altsubject_matches,
-													  g_strdup (phase2_altsubject_match));
+	priv->phase2_altsubject_matches = g_slist_append (priv->phase2_altsubject_matches,
+	                                                  g_strdup (phase2_altsubject_match));
 	return TRUE;
 }
 
@@ -1314,7 +1315,7 @@ nm_setting_802_1x_get_phase2_client_cert_path (NMSetting8021x *setting)
  * when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
  * authentication method.
  *
- * Returns: TRUE if the operation succeeded, FALSE if it was unsuccessful
+ * Returns: %TRUE if the operation succeeded, %FALSE if it was unsuccessful
  **/
 gboolean
 nm_setting_802_1x_set_phase2_client_cert (NMSetting8021x *self,
@@ -1603,7 +1604,7 @@ file_to_byte_array (const char *filename)
  * unprivileged users.  Private keys should always be encrypted with a private
  * key password to prevent unauthorized access to unencrypted private key data.
  *
- * Returns: TRUE if the operation succeeded, FALSE if it was unsuccessful
+ * Returns: %TRUE if the operation succeeded, %FALSE if it was unsuccessful
  **/
 gboolean
 nm_setting_802_1x_set_private_key (NMSetting8021x *self,
@@ -1896,7 +1897,7 @@ nm_setting_802_1x_get_phase2_private_key_path (NMSetting8021x *setting)
  * unprivileged users.  Private keys should always be encrypted with a private
  * key password to prevent unauthorized access to unencrypted private key data.
  *
- * Returns: TRUE if the operation succeeded, FALSE if it was unsuccessful
+ * Returns: %TRUE if the operation succeeded, %FALSE if it was unsuccessful
  **/
 gboolean
 nm_setting_802_1x_set_phase2_private_key (NMSetting8021x *self,
@@ -2286,11 +2287,13 @@ verify_identity (NMSetting8021x *self, gboolean phase2, GError **error)
 		             NM_SETTING_802_1X_ERROR,
 		             NM_SETTING_802_1X_ERROR_MISSING_PROPERTY,
 		             NM_SETTING_802_1X_IDENTITY);
+		return FALSE;
 	} else if (!strlen (priv->identity)) {
 		g_set_error (error,
 		             NM_SETTING_802_1X_ERROR,
 		             NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
 		             NM_SETTING_802_1X_IDENTITY);
+		return FALSE;
 	}
 
 	return TRUE;
diff --git a/libnm-util/nm-setting-bridge.c b/libnm-util/nm-setting-bridge.c
index c6b3f299..a763206b 100644
--- a/libnm-util/nm-setting-bridge.c
+++ b/libnm-util/nm-setting-bridge.c
@@ -463,7 +463,7 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class)
 		                     "for this bridge.  Lower values are 'better'; the "
 		                     "lowest priority bridge will be elected the root "
 		                     "bridge.",
-		                     0, G_MAXUINT16, 0x80,
+		                     0, G_MAXUINT16, 0x8000,
 		                     G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE));
 
 	/**
diff --git a/libnm-util/nm-setting-connection.c b/libnm-util/nm-setting-connection.c
index 4d990643..9c3f2ce2 100644
--- a/libnm-util/nm-setting-connection.c
+++ b/libnm-util/nm-setting-connection.c
@@ -359,8 +359,8 @@ nm_setting_connection_permissions_user_allowed (NMSettingConnection *setting,
  * the "user" permission type is supported, and @pitem must be a username. See
  * #NMSettingConnection:permissions: for more details.
  *
- * Returns: TRUE if the permission was unique and was successfully added to the
- * list, FALSE if @ptype or @pitem was invalid or it the permission was already
+ * Returns: %TRUE if the permission was unique and was successfully added to the
+ * list, %FALSE if @ptype or @pitem was invalid or it the permission was already
  * present in the list
  */
 gboolean
@@ -525,7 +525,7 @@ nm_setting_connection_get_slave_type (NMSettingConnection *setting)
  * @type: the setting name (ie #NM_SETTING_BOND_SETTING_NAME) to be matched
  * against @setting's slave type
  *
- * Returns: TRUE if connection is of the given slave @type
+ * Returns: %TRUE if connection is of the given slave @type
  */
 gboolean
 nm_setting_connection_is_slave_type (NMSettingConnection *setting,
diff --git a/libnm-util/nm-setting-ip4-config.c b/libnm-util/nm-setting-ip4-config.c
index 90534c12..34f5c8fb 100644
--- a/libnm-util/nm-setting-ip4-config.c
+++ b/libnm-util/nm-setting-ip4-config.c
@@ -901,9 +901,6 @@ set_property (GObject *object, guint prop_id,
 	case PROP_DHCP_HOSTNAME:
 		g_free (priv->dhcp_hostname);
 		priv->dhcp_hostname = g_value_dup_string (value);
-		/* FIXME: Is this a good idea? */
-		if (priv->dhcp_hostname)
-			priv->dhcp_send_hostname = TRUE;
 		break;
 	case PROP_NEVER_DEFAULT:
 		priv->never_default = g_value_get_boolean (value);
diff --git a/libnm-util/nm-setting-ip6-config.c b/libnm-util/nm-setting-ip6-config.c
index b83e3dab..b9a0ea30 100644
--- a/libnm-util/nm-setting-ip6-config.c
+++ b/libnm-util/nm-setting-ip6-config.c
@@ -1292,7 +1292,8 @@ nm_ip6_address_compare (NMIP6Address *address, NMIP6Address *other)
  *
  * Gets the IPv6 address property of this address object.
  *
- * Returns: (transfer none): the IPv6 address
+ * Returns: (array fixed-size=16) (element-type guint8) (transfer none):
+ *          the IPv6 address
  **/
 const struct in6_addr *
 nm_ip6_address_get_address (NMIP6Address *address)
@@ -1361,7 +1362,8 @@ nm_ip6_address_set_prefix (NMIP6Address *address, guint32 prefix)
  *
  * Gets the IPv6 default gateway property of this address object.
  *
- * Returns: (transfer none): the IPv6 gateway address
+ * Returns: (array fixed-size=16) (element-type guint8) (transfer none):
+ *          the IPv6 gateway address
  **/
 const struct in6_addr *
 nm_ip6_address_get_gateway (NMIP6Address *address)
@@ -1509,7 +1511,8 @@ nm_ip6_route_compare (NMIP6Route *route, NMIP6Route *other)
  *
  * Gets the IPv6 destination address property of this route object.
  *
- * Returns: the IPv6 address
+ * Returns: (array fixed-size=16) (element-type guint8) (transfer none):
+ *          the IPv6 address of destination
  **/
 const struct in6_addr *
 nm_ip6_route_get_dest (NMIP6Route *route)
@@ -1578,7 +1581,8 @@ nm_ip6_route_set_prefix (NMIP6Route *route, guint32 prefix)
  *
  * Gets the IPv6 address of the next hop of this route.
  *
- * Returns: the IPv6 address
+ * Returns: (array fixed-size=16) (element-type guint8) (transfer none):
+ *          the IPv6 address of next hop
  **/
 const struct in6_addr *
 nm_ip6_route_get_next_hop (NMIP6Route *route)
diff --git a/libnm-util/nm-setting-vlan.c b/libnm-util/nm-setting-vlan.c
index da1cb7f8..da6dd628 100644
--- a/libnm-util/nm-setting-vlan.c
+++ b/libnm-util/nm-setting-vlan.c
@@ -239,8 +239,8 @@ set_map (NMSettingVlan *self, NMVlanPriorityMap map, GSList *list)
  * or the #NMSettingVlan:egress_priority_map properties.  The priority map maps
  * the Linux SKB priorities to 802.1p priorities.
  *
- * Returns: TRUE if the entry was successfully added to the list, or it
- * overwrote the old value, FALSE if error
+ * Returns: %TRUE if the entry was successfully added to the list, or it
+ * overwrote the old value, %FALSE if error
  */
 gboolean
 nm_setting_vlan_add_priority_str (NMSettingVlan *setting,
@@ -352,8 +352,8 @@ nm_setting_vlan_get_priority (NMSettingVlan *setting,
  * If @map is #NM_VLAN_EGRESS_MAP then @from is the Linux SKB priority value and
  * @to is the outgoing 802.1q VLAN Priority Code Point (PCP) value.
  *
- * Returns: TRUE if the new priority mapping was successfully added to the
- * list, FALSE if error
+ * Returns: %TRUE if the new priority mapping was successfully added to the
+ * list, %FALSE if error
  */
 gboolean
 nm_setting_vlan_add_priority (NMSettingVlan *setting,
diff --git a/libnm-util/nm-setting.c b/libnm-util/nm-setting.c
index f80c72b8..a3186284 100644
--- a/libnm-util/nm-setting.c
+++ b/libnm-util/nm-setting.c
@@ -842,8 +842,8 @@ get_secret_flags (NMSetting *setting,
  * For a given secret, retrieves the #NMSettingSecretFlags describing how to
  * handle that secret.
  *
- * Returns: TRUE on success (if the given secret name was a valid property of
- * this setting, and if that property is secret), FALSE if not
+ * Returns: %TRUE on success (if the given secret name was a valid property of
+ * this setting, and if that property is secret), %FALSE if not
  **/
 gboolean
 nm_setting_get_secret_flags (NMSetting *setting,
@@ -886,8 +886,8 @@ set_secret_flags (NMSetting *setting,
  * For a given secret, retrieves the #NMSettingSecretFlags describing how to
  * handle that secret.
  *
- * Returns: TRUE on success (if the given secret name was a valid property of
- * this setting, and if that property is secret), FALSE if not
+ * Returns: %TRUE on success (if the given secret name was a valid property of
+ * this setting, and if that property is secret), %FALSE if not
  **/
 gboolean
 nm_setting_set_secret_flags (NMSetting *setting,
diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c
index 16adb2ba..ef5b9781 100644
--- a/libnm-util/nm-utils.c
+++ b/libnm-util/nm-utils.c
@@ -228,7 +228,7 @@ static gboolean initialized = FALSE;
  * is performed, but calling nm_utils_deinit() to explicitly deinitialize
  * libnm-util can also be done.  This function can be called more than once.
  * 
- * Returns: TRUE if the initialization was successful, FALSE on failure.
+ * Returns: %TRUE if the initialization was successful, %FALSE on failure.
  **/
 gboolean
 nm_utils_init (GError **error)
@@ -343,7 +343,7 @@ nm_utils_ssid_to_utf8 (const GByteArray *ssid)
  * AP's SSID.  This function attempts to detect blank/empty SSIDs using a
  * number of known SSID-cloaking methods.
  *
- * Returns: TRUE if the SSID is "empty", FALSE if it is not
+ * Returns: %TRUE if the SSID is "empty", %FALSE if it is not
  **/
 gboolean
 nm_utils_is_empty_ssid (const guint8 * ssid, int len)
@@ -405,7 +405,7 @@ nm_utils_escape_ssid (const guint8 * ssid, guint32 len)
  * nm_utils_same_ssid:
  * @ssid1: first SSID data to compare
  * @ssid2: second SSID data to compare
- * @ignore_trailing_null: TRUE to ignore one trailing NULL byte
+ * @ignore_trailing_null: %TRUE to ignore one trailing NULL byte
  *
  * Earlier versions of the Linux kernel added a NULL byte to the end of the
  * SSID to enable easy printing of the SSID on the console or in a terminal,
@@ -414,7 +414,7 @@ nm_utils_escape_ssid (const guint8 * ssid, guint32 len)
  * cost of some compatibility with odd SSIDs that may legitimately have trailing
  * NULLs, even though that is functionally pointless.
  *
- * Returns: TRUE if the SSIDs are the same, FALSE if they are not
+ * Returns: %TRUE if the SSIDs are the same, %FALSE if they are not
  **/
 gboolean
 nm_utils_same_ssid (const GByteArray * ssid1,
@@ -1213,8 +1213,8 @@ device_supports_ap_ciphers (guint32 dev_caps,
  * against, determines whether the combination of device capabilities and
  * desired security type are valid for AP/Hotspot connections.
  *
- * Returns: TRUE if the device capabilities are compatible with the desired
- * @type, FALSE if they are not.
+ * Returns: %TRUE if the device capabilities are compatible with the desired
+ * @type, %FALSE if they are not.
  *
  * Since: 0.9.8
  **/
@@ -1261,8 +1261,8 @@ nm_utils_ap_mode_security_valid (NMUtilsSecurityType type,
  * NOTE: this function cannot handle checking security for AP/Hotspot mode;
  * use nm_utils_ap_mode_security_valid() instead.
  *
- * Returns: TRUE if the device capabilities and AP capabilties intersect and are
- * compatible with the desired @type, FALSE if they are not
+ * Returns: %TRUE if the device capabilities and AP capabilties intersect and are
+ * compatible with the desired @type, %FALSE if they are not
  **/
 gboolean
 nm_utils_security_valid (NMUtilsSecurityType type,
@@ -1667,24 +1667,27 @@ nm_utils_ip4_routes_to_gvalue (GSList *list, GValue *value)
 guint32
 nm_utils_ip4_netmask_to_prefix (guint32 netmask)
 {
-	guchar *p, *end;
-	guint32 prefix = 0;
-
-	p = (guchar *) &netmask;
-	end = p + sizeof (guint32);
-
-	while ((*p == 0xFF) && p < end) {
-		prefix += 8;
-		p++;
+	guint32 prefix;
+	guint8 v;
+	const guint8 *p = (guint8 *) &netmask;
+
+	if (p[3]) {
+		prefix = 24;
+		v = p[3];
+	} else if (p[2]) {
+		prefix = 16;
+		v = p[2];
+	} else if (p[1]) {
+		prefix = 8;
+		v = p[1];
+	} else {
+		prefix = 0;
+		v = p[0];
 	}
 
-	if (p < end) {
-		guchar v = *p;
-
-		while (v) {
-			prefix++;
-			v <<= 1;
-		}
+	while (v) {
+		prefix++;
+		v <<= 1;
 	}
 
 	return prefix;
@@ -1699,16 +1702,7 @@ nm_utils_ip4_netmask_to_prefix (guint32 netmask)
 guint32
 nm_utils_ip4_prefix_to_netmask (guint32 prefix)
 {
-	guint32 msk = 0x80000000;
-	guint32 netmask = 0;
-
-	while (prefix > 0) {
-		netmask |= msk;
-		msk >>= 1;
-		prefix--;
-	}
-
-	return (guint32) htonl (netmask);
+	return prefix < 32 ? ~htonl(0xFFFFFFFF >> prefix) : 0xFFFFFFFF;
 }
 
 
@@ -2004,8 +1998,6 @@ nm_utils_ip6_routes_to_gvalue (GSList *list, GValue *value)
 	g_value_take_boxed (value, routes);
 }
 
-/* FIXME: the Posix namespace does not exist, and thus neither does
-   the in6_addr struct. Marking (skip) for now */
 /**
  * nm_utils_ip6_dns_from_gvalue: (skip)
  * @value: a #GValue
@@ -2013,8 +2005,7 @@ nm_utils_ip6_routes_to_gvalue (GSList *list, GValue *value)
  * Converts a #GValue containing a #GPtrArray of IP6 DNS, represented as
  * #GByteArrays into a #GSList of #in6_addrs.
  *
- * Returns: (transfer full) (element-type Posix.in6_addr): a #GSList of IP6
- * addresses.
+ * Returns: a #GSList of IP6 addresses.
  */
 GSList *
 nm_utils_ip6_dns_from_gvalue (const GValue *value)
@@ -2341,7 +2332,7 @@ out:
  *
  * Utility function to find out if the @filename is in PKCS#12 format.
  *
- * Returns: TRUE if the file is PKCS#12, FALSE if it is not
+ * Returns: %TRUE if the file is PKCS#12, %FALSE if it is not
  **/
 gboolean
 nm_utils_file_is_pkcs12 (const char *filename)
@@ -2534,7 +2525,7 @@ nm_utils_wifi_find_next_channel (guint32 channel, int direction, char *band)
  *
  * Utility function to verify WiFi channel validity.
  *
- * Returns: TRUE or FALSE
+ * Returns: %TRUE or %FALSE
  **/
 gboolean
 nm_utils_wifi_is_channel_valid (guint32 channel, const char *band)
diff --git a/libnm-util/tests/Makefile.am b/libnm-util/tests/Makefile.am
index 98f8aad8..d49ef8c8 100644
--- a/libnm-util/tests/Makefile.am
+++ b/libnm-util/tests/Makefile.am
@@ -2,11 +2,13 @@ if ENABLE_TESTS
 
 SUBDIRS=certs
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libnm-util \
-	-I$(top_builddir)/libnm-util
+	-I$(top_builddir)/libnm-util \
+	$(GLIB_CFLAGS) \
+	$(DBUS_CFLAGS)
 
 noinst_PROGRAMS = \
 	test-settings-defaults \
@@ -18,10 +20,6 @@ noinst_PROGRAMS = \
 test_settings_defaults_SOURCES = \
 	test-settings-defaults.c
 
-test_settings_defaults_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS)
-
 test_settings_defaults_LDADD = \
 	$(top_builddir)/libnm-util/libnm-util.la \
 	$(GLIB_LIBS) \
@@ -30,9 +28,6 @@ test_settings_defaults_LDADD = \
 test_crypto_SOURCES = \
 	test-crypto.c
 
-test_crypto_CPPFLAGS = \
-	$(GLIB_CFLAGS)
-
 test_crypto_LDADD = \
 	$(top_builddir)/libnm-util/libtest-crypto.la \
 	$(top_builddir)/libnm-util/libnm-util.la \
@@ -43,8 +38,7 @@ test_secrets_SOURCES = \
 
 test_secrets_CPPFLAGS = \
 	-DTEST_CERT_DIR=\"$(top_srcdir)/libnm-util/tests/certs/\" \
-	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS)
+	$(AM_CPPFLAGS)
 
 test_secrets_LDADD = \
 	$(top_builddir)/libnm-util/libnm-util.la \
@@ -54,10 +48,6 @@ test_secrets_LDADD = \
 test_general_SOURCES = \
 	test-general.c
 
-test_general_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS)
-
 test_general_LDADD = \
 	$(top_builddir)/libnm-util/libnm-util.la \
 	$(GLIB_LIBS) \
@@ -66,10 +56,6 @@ test_general_LDADD = \
 test_setting_8021x_SOURCES = \
 	test-setting-8021x.c
 
-test_setting_8021x_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS)
-
 test_setting_8021x_LDADD = \
 	$(top_builddir)/libnm-util/libnm-util.la \
 	$(GLIB_LIBS) \
diff --git a/libnm-util/tests/Makefile.in b/libnm-util/tests/Makefile.in
index 622f3d21..662c3161 100644
--- a/libnm-util/tests/Makefile.in
+++ b/libnm-util/tests/Makefile.in
@@ -106,8 +106,7 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 PROGRAMS = $(noinst_PROGRAMS)
 am__test_crypto_SOURCES_DIST = test-crypto.c
-@ENABLE_TESTS_TRUE@am_test_crypto_OBJECTS =  \
-@ENABLE_TESTS_TRUE@	test_crypto-test-crypto.$(OBJEXT)
+@ENABLE_TESTS_TRUE@am_test_crypto_OBJECTS = test-crypto.$(OBJEXT)
 test_crypto_OBJECTS = $(am_test_crypto_OBJECTS)
 am__DEPENDENCIES_1 =
 @ENABLE_TESTS_TRUE@test_crypto_DEPENDENCIES = $(top_builddir)/libnm-util/libtest-crypto.la \
@@ -118,8 +117,7 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
 am__test_general_SOURCES_DIST = test-general.c
-@ENABLE_TESTS_TRUE@am_test_general_OBJECTS =  \
-@ENABLE_TESTS_TRUE@	test_general-test-general.$(OBJEXT)
+@ENABLE_TESTS_TRUE@am_test_general_OBJECTS = test-general.$(OBJEXT)
 test_general_OBJECTS = $(am_test_general_OBJECTS)
 @ENABLE_TESTS_TRUE@test_general_DEPENDENCIES =  \
 @ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
@@ -132,13 +130,15 @@ test_secrets_OBJECTS = $(am_test_secrets_OBJECTS)
 @ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
 @ENABLE_TESTS_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am__test_setting_8021x_SOURCES_DIST = test-setting-8021x.c
-@ENABLE_TESTS_TRUE@am_test_setting_8021x_OBJECTS = test_setting_8021x-test-setting-8021x.$(OBJEXT)
+@ENABLE_TESTS_TRUE@am_test_setting_8021x_OBJECTS =  \
+@ENABLE_TESTS_TRUE@	test-setting-8021x.$(OBJEXT)
 test_setting_8021x_OBJECTS = $(am_test_setting_8021x_OBJECTS)
 @ENABLE_TESTS_TRUE@test_setting_8021x_DEPENDENCIES =  \
 @ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
 @ENABLE_TESTS_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am__test_settings_defaults_SOURCES_DIST = test-settings-defaults.c
-@ENABLE_TESTS_TRUE@am_test_settings_defaults_OBJECTS = test_settings_defaults-test-settings-defaults.$(OBJEXT)
+@ENABLE_TESTS_TRUE@am_test_settings_defaults_OBJECTS =  \
+@ENABLE_TESTS_TRUE@	test-settings-defaults.$(OBJEXT)
 test_settings_defaults_OBJECTS = $(am_test_settings_defaults_OBJECTS)
 @ENABLE_TESTS_TRUE@test_settings_defaults_DEPENDENCIES =  \
 @ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
@@ -284,6 +284,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -306,6 +307,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -491,19 +493,17 @@ with_dhcpcd = @with_dhcpcd@
 with_netconfig = @with_netconfig@
 with_resolvconf = @with_resolvconf@
 @ENABLE_TESTS_TRUE@SUBDIRS = certs
-@ENABLE_TESTS_TRUE@INCLUDES = \
+@ENABLE_TESTS_TRUE@AM_CPPFLAGS = \
 @ENABLE_TESTS_TRUE@	-I$(top_srcdir)/include \
 @ENABLE_TESTS_TRUE@	-I$(top_builddir)/include \
 @ENABLE_TESTS_TRUE@	-I$(top_srcdir)/libnm-util \
-@ENABLE_TESTS_TRUE@	-I$(top_builddir)/libnm-util
+@ENABLE_TESTS_TRUE@	-I$(top_builddir)/libnm-util \
+@ENABLE_TESTS_TRUE@	$(GLIB_CFLAGS) \
+@ENABLE_TESTS_TRUE@	$(DBUS_CFLAGS)
 
 @ENABLE_TESTS_TRUE@test_settings_defaults_SOURCES = \
 @ENABLE_TESTS_TRUE@	test-settings-defaults.c
 
-@ENABLE_TESTS_TRUE@test_settings_defaults_CPPFLAGS = \
-@ENABLE_TESTS_TRUE@	$(GLIB_CFLAGS) \
-@ENABLE_TESTS_TRUE@	$(DBUS_CFLAGS)
-
 @ENABLE_TESTS_TRUE@test_settings_defaults_LDADD = \
 @ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
 @ENABLE_TESTS_TRUE@	$(GLIB_LIBS) \
@@ -512,9 +512,6 @@ with_resolvconf = @with_resolvconf@
 @ENABLE_TESTS_TRUE@test_crypto_SOURCES = \
 @ENABLE_TESTS_TRUE@	test-crypto.c
 
-@ENABLE_TESTS_TRUE@test_crypto_CPPFLAGS = \
-@ENABLE_TESTS_TRUE@	$(GLIB_CFLAGS)
-
 @ENABLE_TESTS_TRUE@test_crypto_LDADD = \
 @ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-util/libtest-crypto.la \
 @ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
@@ -525,8 +522,7 @@ with_resolvconf = @with_resolvconf@
 
 @ENABLE_TESTS_TRUE@test_secrets_CPPFLAGS = \
 @ENABLE_TESTS_TRUE@	-DTEST_CERT_DIR=\"$(top_srcdir)/libnm-util/tests/certs/\" \
-@ENABLE_TESTS_TRUE@	$(GLIB_CFLAGS) \
-@ENABLE_TESTS_TRUE@	$(DBUS_CFLAGS)
+@ENABLE_TESTS_TRUE@	$(AM_CPPFLAGS)
 
 @ENABLE_TESTS_TRUE@test_secrets_LDADD = \
 @ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
@@ -536,10 +532,6 @@ with_resolvconf = @with_resolvconf@
 @ENABLE_TESTS_TRUE@test_general_SOURCES = \
 @ENABLE_TESTS_TRUE@	test-general.c
 
-@ENABLE_TESTS_TRUE@test_general_CPPFLAGS = \
-@ENABLE_TESTS_TRUE@	$(GLIB_CFLAGS) \
-@ENABLE_TESTS_TRUE@	$(DBUS_CFLAGS)
-
 @ENABLE_TESTS_TRUE@test_general_LDADD = \
 @ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
 @ENABLE_TESTS_TRUE@	$(GLIB_LIBS) \
@@ -548,10 +540,6 @@ with_resolvconf = @with_resolvconf@
 @ENABLE_TESTS_TRUE@test_setting_8021x_SOURCES = \
 @ENABLE_TESTS_TRUE@	test-setting-8021x.c
 
-@ENABLE_TESTS_TRUE@test_setting_8021x_CPPFLAGS = \
-@ENABLE_TESTS_TRUE@	$(GLIB_CFLAGS) \
-@ENABLE_TESTS_TRUE@	$(DBUS_CFLAGS)
-
 @ENABLE_TESTS_TRUE@test_setting_8021x_LDADD = \
 @ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
 @ENABLE_TESTS_TRUE@	$(GLIB_LIBS) \
@@ -627,11 +615,11 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_crypto-test-crypto.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_general-test-general.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-crypto.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-general.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-setting-8021x.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-settings-defaults.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_secrets-test-secrets.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_setting_8021x-test-setting-8021x.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_settings_defaults-test-settings-defaults.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -654,34 +642,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
-test_crypto-test-crypto.o: test-crypto.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_crypto_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_crypto-test-crypto.o -MD -MP -MF $(DEPDIR)/test_crypto-test-crypto.Tpo -c -o test_crypto-test-crypto.o `test -f 'test-crypto.c' || echo '$(srcdir)/'`test-crypto.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_crypto-test-crypto.Tpo $(DEPDIR)/test_crypto-test-crypto.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test-crypto.c' object='test_crypto-test-crypto.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_crypto_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_crypto-test-crypto.o `test -f 'test-crypto.c' || echo '$(srcdir)/'`test-crypto.c
-
-test_crypto-test-crypto.obj: test-crypto.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_crypto_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_crypto-test-crypto.obj -MD -MP -MF $(DEPDIR)/test_crypto-test-crypto.Tpo -c -o test_crypto-test-crypto.obj `if test -f 'test-crypto.c'; then $(CYGPATH_W) 'test-crypto.c'; else $(CYGPATH_W) '$(srcdir)/test-crypto.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_crypto-test-crypto.Tpo $(DEPDIR)/test_crypto-test-crypto.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test-crypto.c' object='test_crypto-test-crypto.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_crypto_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_crypto-test-crypto.obj `if test -f 'test-crypto.c'; then $(CYGPATH_W) 'test-crypto.c'; else $(CYGPATH_W) '$(srcdir)/test-crypto.c'; fi`
-
-test_general-test-general.o: test-general.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_general-test-general.o -MD -MP -MF $(DEPDIR)/test_general-test-general.Tpo -c -o test_general-test-general.o `test -f 'test-general.c' || echo '$(srcdir)/'`test-general.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_general-test-general.Tpo $(DEPDIR)/test_general-test-general.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test-general.c' object='test_general-test-general.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_general-test-general.o `test -f 'test-general.c' || echo '$(srcdir)/'`test-general.c
-
-test_general-test-general.obj: test-general.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_general-test-general.obj -MD -MP -MF $(DEPDIR)/test_general-test-general.Tpo -c -o test_general-test-general.obj `if test -f 'test-general.c'; then $(CYGPATH_W) 'test-general.c'; else $(CYGPATH_W) '$(srcdir)/test-general.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_general-test-general.Tpo $(DEPDIR)/test_general-test-general.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test-general.c' object='test_general-test-general.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_general-test-general.obj `if test -f 'test-general.c'; then $(CYGPATH_W) 'test-general.c'; else $(CYGPATH_W) '$(srcdir)/test-general.c'; fi`
-
 test_secrets-test-secrets.o: test-secrets.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_secrets_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_secrets-test-secrets.o -MD -MP -MF $(DEPDIR)/test_secrets-test-secrets.Tpo -c -o test_secrets-test-secrets.o `test -f 'test-secrets.c' || echo '$(srcdir)/'`test-secrets.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_secrets-test-secrets.Tpo $(DEPDIR)/test_secrets-test-secrets.Po
@@ -696,34 +656,6 @@ test_secrets-test-secrets.obj: test-secrets.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_secrets_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_secrets-test-secrets.obj `if test -f 'test-secrets.c'; then $(CYGPATH_W) 'test-secrets.c'; else $(CYGPATH_W) '$(srcdir)/test-secrets.c'; fi`
 
-test_setting_8021x-test-setting-8021x.o: test-setting-8021x.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_setting_8021x_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_setting_8021x-test-setting-8021x.o -MD -MP -MF $(DEPDIR)/test_setting_8021x-test-setting-8021x.Tpo -c -o test_setting_8021x-test-setting-8021x.o `test -f 'test-setting-8021x.c' || echo '$(srcdir)/'`test-setting-8021x.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_setting_8021x-test-setting-8021x.Tpo $(DEPDIR)/test_setting_8021x-test-setting-8021x.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test-setting-8021x.c' object='test_setting_8021x-test-setting-8021x.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_setting_8021x_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_setting_8021x-test-setting-8021x.o `test -f 'test-setting-8021x.c' || echo '$(srcdir)/'`test-setting-8021x.c
-
-test_setting_8021x-test-setting-8021x.obj: test-setting-8021x.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_setting_8021x_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_setting_8021x-test-setting-8021x.obj -MD -MP -MF $(DEPDIR)/test_setting_8021x-test-setting-8021x.Tpo -c -o test_setting_8021x-test-setting-8021x.obj `if test -f 'test-setting-8021x.c'; then $(CYGPATH_W) 'test-setting-8021x.c'; else $(CYGPATH_W) '$(srcdir)/test-setting-8021x.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_setting_8021x-test-setting-8021x.Tpo $(DEPDIR)/test_setting_8021x-test-setting-8021x.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test-setting-8021x.c' object='test_setting_8021x-test-setting-8021x.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_setting_8021x_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_setting_8021x-test-setting-8021x.obj `if test -f 'test-setting-8021x.c'; then $(CYGPATH_W) 'test-setting-8021x.c'; else $(CYGPATH_W) '$(srcdir)/test-setting-8021x.c'; fi`
-
-test_settings_defaults-test-settings-defaults.o: test-settings-defaults.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_settings_defaults_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_settings_defaults-test-settings-defaults.o -MD -MP -MF $(DEPDIR)/test_settings_defaults-test-settings-defaults.Tpo -c -o test_settings_defaults-test-settings-defaults.o `test -f 'test-settings-defaults.c' || echo '$(srcdir)/'`test-settings-defaults.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_settings_defaults-test-settings-defaults.Tpo $(DEPDIR)/test_settings_defaults-test-settings-defaults.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test-settings-defaults.c' object='test_settings_defaults-test-settings-defaults.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_settings_defaults_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_settings_defaults-test-settings-defaults.o `test -f 'test-settings-defaults.c' || echo '$(srcdir)/'`test-settings-defaults.c
-
-test_settings_defaults-test-settings-defaults.obj: test-settings-defaults.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_settings_defaults_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_settings_defaults-test-settings-defaults.obj -MD -MP -MF $(DEPDIR)/test_settings_defaults-test-settings-defaults.Tpo -c -o test_settings_defaults-test-settings-defaults.obj `if test -f 'test-settings-defaults.c'; then $(CYGPATH_W) 'test-settings-defaults.c'; else $(CYGPATH_W) '$(srcdir)/test-settings-defaults.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_settings_defaults-test-settings-defaults.Tpo $(DEPDIR)/test_settings_defaults-test-settings-defaults.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test-settings-defaults.c' object='test_settings_defaults-test-settings-defaults.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_settings_defaults_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_settings_defaults-test-settings-defaults.obj `if test -f 'test-settings-defaults.c'; then $(CYGPATH_W) 'test-settings-defaults.c'; else $(CYGPATH_W) '$(srcdir)/test-settings-defaults.c'; fi`
-
 mostlyclean-libtool:
 	-rm -f *.lo
 
diff --git a/libnm-util/tests/certs/Makefile.in b/libnm-util/tests/certs/Makefile.in
index 0b70b59c..e570aafd 100644
--- a/libnm-util/tests/certs/Makefile.in
+++ b/libnm-util/tests/certs/Makefile.in
@@ -160,6 +160,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -182,6 +183,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
diff --git a/libnm-util/tests/test-general.c b/libnm-util/tests/test-general.c
index 9576f05a..20a99472 100644
--- a/libnm-util/tests/test-general.c
+++ b/libnm-util/tests/test-general.c
@@ -1362,6 +1362,66 @@ test_hwaddr_aton_malformed (void)
 	g_assert (nm_utils_hwaddr_aton ("0:1a:2B:3:a@%%", ARPHRD_ETHER, buf) == NULL);
 }
 
+static void
+test_ip4_prefix_to_netmask (void)
+{
+	int i;
+
+	for (i = 0; i<=32; i++) {
+		guint32 netmask = nm_utils_ip4_prefix_to_netmask (i);
+		int plen = nm_utils_ip4_netmask_to_prefix (netmask);
+
+		g_assert_cmpint (i, ==, plen);
+		{
+			guint32 msk = 0x80000000;
+			guint32 netmask2 = 0;
+			guint32 prefix = i;
+			while (prefix > 0) {
+				netmask2 |= msk;
+				msk >>= 1;
+				prefix--;
+			}
+			g_assert_cmpint (netmask, ==, (guint32) htonl (netmask2));
+		}
+	}
+}
+
+static void
+test_ip4_netmask_to_prefix (void)
+{
+	int i, j;
+
+	GRand *rand = g_rand_new ();
+
+	g_rand_set_seed (rand, 1);
+
+	for (i = 2; i<=32; i++) {
+		guint32 netmask = nm_utils_ip4_prefix_to_netmask (i);
+		guint32 netmask_lowest_bit = netmask & ~nm_utils_ip4_prefix_to_netmask (i-1);
+
+		g_assert_cmpint (i, ==, nm_utils_ip4_netmask_to_prefix (netmask));
+
+		for (j = 0; j < 2*i; j++) {
+			guint32 r = g_rand_int (rand);
+			guint32 netmask_holey;
+			guint32 prefix_holey;
+
+			netmask_holey = (netmask & r) | netmask_lowest_bit;
+
+			if (netmask_holey == netmask)
+				continue;
+
+			/* create an invalid netmask with holes and check that the function
+			 * returns the longest prefix. */
+			prefix_holey = nm_utils_ip4_netmask_to_prefix (netmask_holey);
+
+			g_assert_cmpint (i, ==, prefix_holey);
+		}
+	}
+
+	g_rand_free (rand);
+}
+
 static void
 test_setting_old_uuid (void)
 {
@@ -1432,6 +1492,8 @@ int main (int argc, char **argv)
 	test_hwaddr_aton_ib_normal ();
 	test_hwaddr_aton_no_leading_zeros ();
 	test_hwaddr_aton_malformed ();
+	test_ip4_prefix_to_netmask ();
+	test_ip4_netmask_to_prefix ();
 
 	base = g_path_get_basename (argv[0]);
 	fprintf (stdout, "%s: SUCCESS\n", base);
diff --git a/m4/gtk-doc.m4 b/m4/gtk-doc.m4
index ac2eccb4..36755432 100644
--- a/m4/gtk-doc.m4
+++ b/m4/gtk-doc.m4
@@ -1,6 +1,6 @@
 dnl -*- mode: autoconf -*-
 
-# serial 1
+# serial 2
 
 dnl Usage:
 dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
@@ -10,8 +10,24 @@ AC_DEFUN([GTK_DOC_CHECK],
   AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
   AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
 
+  ifelse([$1],[],[gtk_doc_requires="gtk-doc"],[gtk_doc_requires="gtk-doc >= $1"])
+  AC_MSG_CHECKING([for gtk-doc])
+  PKG_CHECK_EXISTS([$gtk_doc_requires],[have_gtk_doc=yes],[have_gtk_doc=no])
+  AC_MSG_RESULT($have_gtk_doc)
+
+  if test "$have_gtk_doc" = "no"; then
+      AC_MSG_WARN([
+  You will not be able to create source packages with 'make dist'
+  because $gtk_doc_requires is not found.])
+  fi
+
   dnl check for tools we added during development
-  AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
+  dnl Use AC_CHECK_PROG to avoid the check target using an absolute path that
+  dnl may not be writable by the user. Currently, automake requires that the
+  dnl test name must end in '.test'.
+  dnl https://bugzilla.gnome.org/show_bug.cgi?id=701638
+  AC_CHECK_PROG([GTKDOC_CHECK],[gtkdoc-check],[gtkdoc-check.test])
+  AC_PATH_PROG([GTKDOC_CHECK_PATH],[gtkdoc-check])
   AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
   AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
 
@@ -28,22 +44,22 @@ AC_DEFUN([GTK_DOC_CHECK],
                    [use gtk-doc to build documentation [[default=no]]]),,
     [enable_gtk_doc=no])
 
-  if test x$enable_gtk_doc = xyes; then
-    ifelse([$1],[],
-      [PKG_CHECK_EXISTS([gtk-doc],,
-                        AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
-      [PKG_CHECK_EXISTS([gtk-doc >= $1],,
-                        AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
-    dnl don't check for glib if we build glib
-    if test "x$PACKAGE_NAME" != "xglib"; then
-      dnl don't fail if someone does not have glib
-      PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0,,[:])
-    fi
-  fi
-
   AC_MSG_CHECKING([whether to build gtk-doc documentation])
   AC_MSG_RESULT($enable_gtk_doc)
 
+  if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then
+    AC_MSG_ERROR([
+  You must have $gtk_doc_requires installed to build documentation for
+  $PACKAGE_NAME. Please install gtk-doc or disable building the
+  documentation by adding '--disable-gtk-doc' to '[$]0'.])
+  fi
+
+  dnl don't check for glib if we build glib
+  if test "x$PACKAGE_NAME" != "xglib"; then
+    dnl don't fail if someone does not have glib
+    PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0,,[:])
+  fi
+
   dnl enable/disable output formats
   AC_ARG_ENABLE([gtk-doc-html],
     AS_HELP_STRING([--enable-gtk-doc-html],
@@ -63,6 +79,7 @@ AC_DEFUN([GTK_DOC_CHECK],
   fi
   AC_SUBST([AM_DEFAULT_VERBOSITY])
 
+  AM_CONDITIONAL([HAVE_GTK_DOC], [test x$have_gtk_doc = xyes])
   AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
   AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
   AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 56666f0e..f12cfdf0 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -1312,7 +1312,7 @@ ia64-*-hpux*)
   rm -rf conftest*
   ;;
 
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
@@ -1326,7 +1326,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
 	  x86_64-*linux*)
 	    LD="${LD-ld} -m elf_i386"
 	    ;;
-	  ppc64-*linux*|powerpc64-*linux*)
+	  powerpc64le-*linux*)
+	    LD="${LD-ld} -m elf32lppclinux"
+	    ;;
+	  powerpc64-*linux*)
 	    LD="${LD-ld} -m elf32ppclinux"
 	    ;;
 	  s390x-*linux*)
@@ -1345,7 +1348,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
 	  x86_64-*linux*)
 	    LD="${LD-ld} -m elf_x86_64"
 	    ;;
-	  ppc*-*linux*|powerpc*-*linux*)
+	  powerpcle-*linux*)
+	    LD="${LD-ld} -m elf64lppc"
+	    ;;
+	  powerpc-*linux*)
 	    LD="${LD-ld} -m elf64ppc"
 	    ;;
 	  s390*-*linux*|s390*-*tpf*)
diff --git a/man/Makefile.in b/man/Makefile.in
index 23f4ef2c..d32adcf9 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -192,6 +192,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -214,6 +215,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
diff --git a/policy/Makefile.in b/policy/Makefile.in
index 80668bdc..3e70edba 100644
--- a/policy/Makefile.in
+++ b/policy/Makefile.in
@@ -182,6 +182,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -204,6 +205,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
diff --git a/src/Makefile.am b/src/Makefile.am
index 3ca5a7da..3ea6241c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,7 +21,8 @@ endif
 
 SUBDIRS += . tests
 
-INCLUDES = -I${top_srcdir} \
+AM_CPPFLAGS = \
+           -I${top_srcdir} \
            -I${top_builddir}/include \
            -I${top_srcdir}/include \
            -I${top_builddir}/src/generated \
@@ -65,7 +66,8 @@ libtest_dhcp_la_SOURCES = \
 libtest_dhcp_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(DBUS_CFLAGS) \
-	$(LIBNL_CFLAGS)
+	$(LIBNL_CFLAGS) \
+	$(AM_CPPFLAGS)
 
 libtest_dhcp_la_LIBADD = \
 	$(top_builddir)/src/generated/libnm-generated.la \
@@ -84,7 +86,8 @@ libtest_policy_hosts_la_SOURCES = \
 
 libtest_policy_hosts_la_CPPFLAGS = \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	$(GLIB_CFLAGS)
+	$(GLIB_CFLAGS) \
+	$(AM_CPPFLAGS)
 
 libtest_policy_hosts_la_LIBADD = \
 	${top_builddir}/src/logging/libnm-logging.la \
@@ -100,7 +103,8 @@ libtest_wifi_ap_utils_la_SOURCES = \
 	nm-wifi-ap-utils.h
 
 libtest_wifi_ap_utils_la_CPPFLAGS = \
-	$(GLIB_CFLAGS)
+	$(GLIB_CFLAGS) \
+	$(AM_CPPFLAGS)
 
 libtest_wifi_ap_utils_la_LIBADD = \
 	${top_builddir}/libnm-util/libnm-util.la \
@@ -301,6 +305,7 @@ NetworkManager_CPPFLAGS = \
 	$(POLKIT_CFLAGS) \
 	$(SYSTEMD_LOGIN_CFLAGS) \
 	$(LIBSOUP_CFLAGS) \
+	$(AM_CPPFLAGS) \
 	-DBINDIR=\"$(bindir)\" \
 	-DSBINDIR=\"$(sbindir)\" \
 	-DLIBEXECDIR=\"$(libexecdir)\" \
@@ -361,5 +366,8 @@ install-data-hook:
 	$(mkinstalldirs) -m 0700 $(DESTDIR)$(statedir)
 	$(mkinstalldirs) -m 0755 $(DESTDIR)$(pkglibdir)
 
-CLEANFILES = $(BUILT_SOURCES)
+CLEANFILES = \
+	$(BUILT_SOURCES) \
+	nm-enum-types.c \
+	nm-enum-types.h
 
diff --git a/src/Makefile.in b/src/Makefile.in
index 22898dc8..474ceb38 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -416,6 +416,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -438,6 +439,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -626,7 +628,8 @@ SUBDIRS = generated logging posix-signals dns-manager vpn-manager \
 	dhcp-manager ip6-manager supplicant-manager ppp-manager \
 	dnsmasq-manager modem-manager bluez-manager firewall-manager \
 	wifi settings $(am__append_1) . tests
-INCLUDES = -I${top_srcdir} \
+AM_CPPFLAGS = \
+           -I${top_srcdir} \
            -I${top_builddir}/include \
            -I${top_srcdir}/include \
            -I${top_builddir}/src/generated \
@@ -670,7 +673,8 @@ libtest_dhcp_la_SOURCES = \
 libtest_dhcp_la_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(DBUS_CFLAGS) \
-	$(LIBNL_CFLAGS)
+	$(LIBNL_CFLAGS) \
+	$(AM_CPPFLAGS)
 
 libtest_dhcp_la_LIBADD = \
 	$(top_builddir)/src/generated/libnm-generated.la \
@@ -689,7 +693,8 @@ libtest_policy_hosts_la_SOURCES = \
 
 libtest_policy_hosts_la_CPPFLAGS = \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	$(GLIB_CFLAGS)
+	$(GLIB_CFLAGS) \
+	$(AM_CPPFLAGS)
 
 libtest_policy_hosts_la_LIBADD = \
 	${top_builddir}/src/logging/libnm-logging.la \
@@ -704,7 +709,8 @@ libtest_wifi_ap_utils_la_SOURCES = \
 	nm-wifi-ap-utils.h
 
 libtest_wifi_ap_utils_la_CPPFLAGS = \
-	$(GLIB_CFLAGS)
+	$(GLIB_CFLAGS) \
+	$(AM_CPPFLAGS)
 
 libtest_wifi_ap_utils_la_LIBADD = \
 	${top_builddir}/libnm-util/libnm-util.la \
@@ -763,7 +769,7 @@ BUILT_SOURCES = \
 
 NetworkManager_CPPFLAGS = $(DBUS_CFLAGS) $(GLIB_CFLAGS) \
 	$(GUDEV_CFLAGS) $(LIBNL_CFLAGS) $(POLKIT_CFLAGS) \
-	$(SYSTEMD_LOGIN_CFLAGS) $(LIBSOUP_CFLAGS) \
+	$(SYSTEMD_LOGIN_CFLAGS) $(LIBSOUP_CFLAGS) $(AM_CPPFLAGS) \
 	-DBINDIR=\"$(bindir)\" -DSBINDIR=\"$(sbindir)\" \
 	-DLIBEXECDIR=\"$(libexecdir)\" -DDATADIR=\"$(datadir)\" \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
@@ -808,7 +814,11 @@ EXTRA_DIST = \
 
 rundir = $(localstatedir)/run/NetworkManager
 statedir = $(localstatedir)/lib/NetworkManager
-CLEANFILES = $(BUILT_SOURCES)
+CLEANFILES = \
+	$(BUILT_SOURCES) \
+	nm-enum-types.c \
+	nm-enum-types.h
+
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
diff --git a/src/NetworkManagerUtils.c b/src/NetworkManagerUtils.c
index f2d72bd1..2f369d68 100644
--- a/src/NetworkManagerUtils.c
+++ b/src/NetworkManagerUtils.c
@@ -99,60 +99,6 @@ nm_spawn_process (const char *args)
 	return status;
 }
 
-/*
- * nm_utils_ip4_netmask_to_prefix
- *
- * Figure out the network prefix from a netmask.  Netmask
- * MUST be in network byte order.
- *
- */
-guint32
-nm_utils_ip4_netmask_to_prefix (guint32 netmask)
-{
-	guchar *p, *end;
-	guint32 prefix = 0;
-
-	p = (guchar *) &netmask;
-	end = p + sizeof (guint32);
-
-	while ((*p == 0xFF) && p < end) {
-		prefix += 8;
-		p++;
-	}
-
-	if (p < end) {
-		guchar v = *p;
-
-		while (v) {
-			prefix++;
-			v <<= 1;
-		}
-	}
-
-	return prefix;
-}
-
-/*
- * nm_utils_ip4_prefix_to_netmask
- *
- * Figure out the netmask from a prefix.
- *
- */
-guint32
-nm_utils_ip4_prefix_to_netmask (guint32 prefix)
-{
-	guint32 msk = 0x80000000;
-	guint32 netmask = 0;
-
-	while (prefix > 0) {
-		netmask |= msk;
-		msk >>= 1;
-		prefix--;
-	}
-
-	return (guint32) htonl (netmask);
-}
-
 void
 nm_utils_merge_ip4_config (NMIP4Config *ip4_config, NMSettingIP4Config *setting)
 {
diff --git a/src/bluez-manager/Makefile.am b/src/bluez-manager/Makefile.am
index aee27217..fb836abf 100644
--- a/src/bluez-manager/Makefile.am
+++ b/src/bluez-manager/Makefile.am
@@ -1,4 +1,6 @@
-INCLUDES = \
+noinst_LTLIBRARIES = libbluez-manager.la
+
+libbluez_manager_la_CPPFLAGS = \
 	-I${top_srcdir} \
 	-I${top_builddir}/include \
 	-I${top_srcdir}/include \
@@ -7,9 +9,15 @@ INCLUDES = \
 	-I${top_srcdir}/src \
 	-I${top_builddir}/src/generated \
 	-I${top_srcdir}/src/generated \
-	-I${top_srcdir}/src/logging
-
-noinst_LTLIBRARIES = libbluez-manager.la
+	-I${top_srcdir}/src/logging \
+	$(DBUS_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	$(BLUEZ_CFLAGS) \
+	-DBINDIR=\"$(bindir)\" \
+	-DDATADIR=\"$(datadir)\" \
+	-DSYSCONFDIR=\"$(sysconfdir)\" \
+	-DLIBEXECDIR=\"$(libexecdir)\" \
+	-DLOCALSTATEDIR=\"$(localstatedir)\"
 
 libbluez_manager_la_SOURCES = \
 	nm-bluez-common.h \
@@ -27,16 +35,6 @@ libbluez_manager_la_SOURCES += \
 	nm-bluez-manager.c
 endif
 
-libbluez_manager_la_CPPFLAGS = \
-	$(DBUS_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	$(BLUEZ_CFLAGS) \
-	-DBINDIR=\"$(bindir)\" \
-	-DDATADIR=\"$(datadir)\" \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DLIBEXECDIR=\"$(libexecdir)\" \
-	-DLOCALSTATEDIR=\"$(localstatedir)\"
-
 libbluez_manager_la_LIBADD = \
 	$(top_builddir)/src/generated/libnm-generated.la \
 	$(top_builddir)/src/logging/libnm-logging.la \
diff --git a/src/bluez-manager/Makefile.in b/src/bluez-manager/Makefile.in
index f4dd166f..f72768a6 100644
--- a/src/bluez-manager/Makefile.in
+++ b/src/bluez-manager/Makefile.in
@@ -224,6 +224,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -246,6 +247,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -430,7 +432,8 @@ with_dhclient = @with_dhclient@
 with_dhcpcd = @with_dhcpcd@
 with_netconfig = @with_netconfig@
 with_resolvconf = @with_resolvconf@
-INCLUDES = \
+noinst_LTLIBRARIES = libbluez-manager.la
+libbluez_manager_la_CPPFLAGS = \
 	-I${top_srcdir} \
 	-I${top_builddir}/include \
 	-I${top_srcdir}/include \
@@ -439,13 +442,7 @@ INCLUDES = \
 	-I${top_srcdir}/src \
 	-I${top_builddir}/src/generated \
 	-I${top_srcdir}/src/generated \
-	-I${top_srcdir}/src/logging
-
-noinst_LTLIBRARIES = libbluez-manager.la
-libbluez_manager_la_SOURCES = nm-bluez-common.h nm-bluez-device.c \
-	nm-bluez-device.h nm-bluez-manager.h $(am__append_1) \
-	$(am__append_2)
-libbluez_manager_la_CPPFLAGS = \
+	-I${top_srcdir}/src/logging \
 	$(DBUS_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(BLUEZ_CFLAGS) \
@@ -455,6 +452,9 @@ libbluez_manager_la_CPPFLAGS = \
 	-DLIBEXECDIR=\"$(libexecdir)\" \
 	-DLOCALSTATEDIR=\"$(localstatedir)\"
 
+libbluez_manager_la_SOURCES = nm-bluez-common.h nm-bluez-device.c \
+	nm-bluez-device.h nm-bluez-manager.h $(am__append_1) \
+	$(am__append_2)
 libbluez_manager_la_LIBADD = \
 	$(top_builddir)/src/generated/libnm-generated.la \
 	$(top_builddir)/src/logging/libnm-logging.la \
diff --git a/src/dhcp-manager/Makefile.am b/src/dhcp-manager/Makefile.am
index 40a05834..f32a2167 100644
--- a/src/dhcp-manager/Makefile.am
+++ b/src/dhcp-manager/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = . tests
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I${top_srcdir} \
 	-I${top_builddir}/include \
 	-I${top_srcdir}/include \
@@ -10,7 +10,8 @@ INCLUDES = \
 	-I${top_srcdir}/src/posix-signals \
 	-I${top_builddir}/libnm-util \
 	-I${top_srcdir}/libnm-util \
-	-I${top_srcdir}/src
+	-I${top_srcdir}/src \
+	-DRUNDIR=\"$(rundir)\"
 
 noinst_LTLIBRARIES = libdhcp-manager.la libdhcp-dhclient.la
 
@@ -25,6 +26,7 @@ libdhcp_dhclient_la_SOURCES = \
 libdhcp_dhclient_la_CPPFLAGS = \
 	$(DBUS_CFLAGS) \
 	$(GLIB_CFLAGS) \
+	$(AM_CPPFLAGS) \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
 	-DLIBEXECDIR=\"$(libexecdir)\" \
 	-DLOCALSTATEDIR=\"$(localstatedir)\" \
@@ -52,6 +54,7 @@ libdhcp_manager_la_SOURCES = \
 libdhcp_manager_la_CPPFLAGS = \
 	$(DBUS_CFLAGS) \
 	$(GLIB_CFLAGS) \
+	$(AM_CPPFLAGS) \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
 	-DLIBEXECDIR=\"$(libexecdir)\" \
 	-DLOCALSTATEDIR=\"$(localstatedir)\" \
diff --git a/src/dhcp-manager/Makefile.in b/src/dhcp-manager/Makefile.in
index 31920ec4..db4b0c91 100644
--- a/src/dhcp-manager/Makefile.in
+++ b/src/dhcp-manager/Makefile.in
@@ -260,6 +260,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -282,6 +283,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -467,7 +469,7 @@ with_dhcpcd = @with_dhcpcd@
 with_netconfig = @with_netconfig@
 with_resolvconf = @with_resolvconf@
 SUBDIRS = . tests
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I${top_srcdir} \
 	-I${top_builddir}/include \
 	-I${top_srcdir}/include \
@@ -477,7 +479,8 @@ INCLUDES = \
 	-I${top_srcdir}/src/posix-signals \
 	-I${top_builddir}/libnm-util \
 	-I${top_srcdir}/libnm-util \
-	-I${top_srcdir}/src
+	-I${top_srcdir}/src \
+	-DRUNDIR=\"$(rundir)\"
 
 noinst_LTLIBRARIES = libdhcp-manager.la libdhcp-dhclient.la
 
@@ -491,6 +494,7 @@ libdhcp_dhclient_la_SOURCES = \
 libdhcp_dhclient_la_CPPFLAGS = \
 	$(DBUS_CFLAGS) \
 	$(GLIB_CFLAGS) \
+	$(AM_CPPFLAGS) \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
 	-DLIBEXECDIR=\"$(libexecdir)\" \
 	-DLOCALSTATEDIR=\"$(localstatedir)\" \
@@ -518,6 +522,7 @@ libdhcp_manager_la_SOURCES = \
 libdhcp_manager_la_CPPFLAGS = \
 	$(DBUS_CFLAGS) \
 	$(GLIB_CFLAGS) \
+	$(AM_CPPFLAGS) \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
 	-DLIBEXECDIR=\"$(libexecdir)\" \
 	-DLOCALSTATEDIR=\"$(localstatedir)\" \
diff --git a/src/dhcp-manager/nm-dhcp-client.c b/src/dhcp-manager/nm-dhcp-client.c
index f4e94a6e..980fcab8 100644
--- a/src/dhcp-manager/nm-dhcp-client.c
+++ b/src/dhcp-manager/nm-dhcp-client.c
@@ -1533,16 +1533,26 @@ dispose (GObject *object)
 	 * the DHCP client.
 	 */
 
-	if (priv->remove_id)
+	if (priv->remove_id) {
 		g_source_remove (priv->remove_id);
+		priv->remove_id = 0;
+	}
+
+	if (priv->options) {
+		g_hash_table_destroy (priv->options);
+		priv->options = NULL;
+	}
+	g_clear_pointer (&priv->iface, g_free);
 
-	g_hash_table_destroy (priv->options);
-	g_free (priv->iface);
-	if (priv->hwaddr)
+	if (priv->hwaddr) {
 		g_byte_array_free (priv->hwaddr, TRUE);
+		priv->hwaddr = NULL;
+	}
 
-	if (priv->duid)
+	if (priv->duid) {
 		g_byte_array_free (priv->duid, TRUE);
+		priv->duid = NULL;
+	}
 
 	G_OBJECT_CLASS (nm_dhcp_client_parent_class)->dispose (object);
 }
diff --git a/src/dhcp-manager/nm-dhcp-dhclient-utils.c b/src/dhcp-manager/nm-dhcp-dhclient-utils.c
index 89fa51ee..db4bf7e8 100644
--- a/src/dhcp-manager/nm-dhcp-dhclient-utils.c
+++ b/src/dhcp-manager/nm-dhcp-dhclient-utils.c
@@ -168,6 +168,10 @@ nm_dhcp_dhclient_create_config (const char *interface,
 					continue;
 			}
 
+			/* Ignore 'script' since we pass our own */
+			if (g_str_has_prefix (p, "script "))
+				continue;
+
 			/* Check for "also require" */
 			if (!strncmp (p, ALSOREQ_TAG, strlen (ALSOREQ_TAG))) {
 				in_alsoreq = TRUE;
diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c
index 5b64b132..9a42f0e4 100644
--- a/src/dhcp-manager/nm-dhcp-dhclient.c
+++ b/src/dhcp-manager/nm-dhcp-dhclient.c
@@ -339,7 +339,7 @@ nm_dhcp_dhclient_get_lease_config (const char *iface, const char *uuid, gboolean
 	}
 
 out:
-	g_slist_foreach (parsed, (GFunc) g_hash_table_destroy, NULL);
+	g_slist_free_full (parsed, (GDestroyNotify) g_hash_table_destroy);
 	g_free (leasefile);
 	return leases;
 }
diff --git a/src/dhcp-manager/nm-dhcp-dhcpcd.c b/src/dhcp-manager/nm-dhcp-dhcpcd.c
index f3245ee5..f978cccc 100644
--- a/src/dhcp-manager/nm-dhcp-dhcpcd.c
+++ b/src/dhcp-manager/nm-dhcp-dhcpcd.c
@@ -21,6 +21,7 @@
  */
 
 
+#include 
 #include 
 #include 
 #include 
@@ -110,7 +111,10 @@ ip4_start (NMDHCPClient *client,
 	iface = nm_dhcp_client_get_iface (client);
 	uuid = nm_dhcp_client_get_uuid (client);
 
-	priv->pid_file = g_strdup_printf (NMSTATEDIR "/dhcpcd-%s.pid", iface);
+	/* dhcpcd does not allow custom pidfiles; the pidfile is always
+	 * RUNDIR "dhcpcd-.pid".
+	 */
+	priv->pid_file = g_strdup_printf (RUNDIR "/dhcpcd-%s.pid", iface);
 	if (!priv->pid_file) {
 		nm_log_warn (LOGD_DHCP4, "(%s): not enough memory for dhcpcd options.", iface);
 		return -1;
@@ -140,6 +144,14 @@ ip4_start (NMDHCPClient *client,
 	g_ptr_array_add (argv, (gpointer) "-c");	/* Set script file */
 	g_ptr_array_add (argv, (gpointer) ACTION_SCRIPT_PATH );
 
+#ifdef DHCPCD_SUPPORTS_IPV6
+	/* IPv4-only for now.  NetworkManager knows better than dhcpcd when to
+	 * run IPv6, and dhcpcd's automatic Router Solicitations cause problems
+	 * with devices that don't expect them.
+	 */
+	g_ptr_array_add (argv, (gpointer) "-4");
+#endif
+
 	if (hostname && strlen (hostname)) {
 		g_ptr_array_add (argv, (gpointer) "-h");	/* Send hostname to DHCP server */
 		g_ptr_array_add (argv, (gpointer) hostname );
diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c
index 7088839a..d40eb48d 100644
--- a/src/dhcp-manager/nm-dhcp-manager.c
+++ b/src/dhcp-manager/nm-dhcp-manager.c
@@ -554,13 +554,18 @@ nm_dhcp_manager_get_lease_config (NMDHCPManager *self,
                                   const char *uuid,
                                   gboolean ipv6)
 {
-	NMDHCPManagerPrivate *priv = NM_DHCP_MANAGER_GET_PRIVATE (self);
+	NMDHCPManagerPrivate *priv;
 
+	g_return_val_if_fail (NM_IS_DHCP_MANAGER (self), NULL);
 	g_return_val_if_fail (iface != NULL, NULL);
 	g_return_val_if_fail (uuid != NULL, NULL);
 
+	priv = NM_DHCP_MANAGER_GET_PRIVATE (self);
+
 	if (priv->get_lease_config_func)
 		return priv->get_lease_config_func (iface, uuid, ipv6);
+
+	nm_log_warn (LOGD_DHCP, "Cannot get a DHCP lease config (no usable DHCP client was found!)");
 	return NULL;
 }
 
diff --git a/src/dhcp-manager/tests/Makefile.am b/src/dhcp-manager/tests/Makefile.am
index 8c9d06c1..bf859fe7 100644
--- a/src/dhcp-manager/tests/Makefile.am
+++ b/src/dhcp-manager/tests/Makefile.am
@@ -1,11 +1,12 @@
 if ENABLE_TESTS
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
 	-I${top_srcdir}/libnm-util \
 	-I${top_builddir}/libnm-util \
-	-I$(top_srcdir)/src/dhcp-manager
+	-I$(top_srcdir)/src/dhcp-manager \
+	$(GLIB_CFLAGS)
 
 noinst_PROGRAMS = test-dhcp-dhclient
 
@@ -15,7 +16,7 @@ test_dhcp_dhclient_SOURCES = \
 	test-dhcp-dhclient.c
 
 test_dhcp_dhclient_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
+	$(AM_CPPFLAGS) \
 	-DTESTDIR="\"$(abs_srcdir)\""
 
 test_dhcp_dhclient_LDADD = \
diff --git a/src/dhcp-manager/tests/Makefile.in b/src/dhcp-manager/tests/Makefile.in
index bb28cb9e..afcee2c0 100644
--- a/src/dhcp-manager/tests/Makefile.in
+++ b/src/dhcp-manager/tests/Makefile.in
@@ -206,6 +206,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -228,6 +229,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -412,12 +414,13 @@ with_dhclient = @with_dhclient@
 with_dhcpcd = @with_dhcpcd@
 with_netconfig = @with_netconfig@
 with_resolvconf = @with_resolvconf@
-@ENABLE_TESTS_TRUE@INCLUDES = \
+@ENABLE_TESTS_TRUE@AM_CPPFLAGS = \
 @ENABLE_TESTS_TRUE@	-I$(top_srcdir)/include \
 @ENABLE_TESTS_TRUE@	-I$(top_builddir)/include \
 @ENABLE_TESTS_TRUE@	-I${top_srcdir}/libnm-util \
 @ENABLE_TESTS_TRUE@	-I${top_builddir}/libnm-util \
-@ENABLE_TESTS_TRUE@	-I$(top_srcdir)/src/dhcp-manager
+@ENABLE_TESTS_TRUE@	-I$(top_srcdir)/src/dhcp-manager \
+@ENABLE_TESTS_TRUE@	$(GLIB_CFLAGS)
 
 
 ####### policy /etc/hosts test #######
@@ -425,7 +428,7 @@ with_resolvconf = @with_resolvconf@
 @ENABLE_TESTS_TRUE@	test-dhcp-dhclient.c
 
 @ENABLE_TESTS_TRUE@test_dhcp_dhclient_CPPFLAGS = \
-@ENABLE_TESTS_TRUE@	$(GLIB_CFLAGS) \
+@ENABLE_TESTS_TRUE@	$(AM_CPPFLAGS) \
 @ENABLE_TESTS_TRUE@	-DTESTDIR="\"$(abs_srcdir)\""
 
 @ENABLE_TESTS_TRUE@test_dhcp_dhclient_LDADD = \
diff --git a/src/dns-manager/Makefile.am b/src/dns-manager/Makefile.am
index e6c2ff22..4aa20c72 100644
--- a/src/dns-manager/Makefile.am
+++ b/src/dns-manager/Makefile.am
@@ -1,13 +1,20 @@
-INCLUDES = \
+noinst_LTLIBRARIES = libdns-manager.la
+
+libdns_manager_la_CPPFLAGS = \
 	-I${top_srcdir}/src/logging \
 	-I${top_srcdir}/src/posix-signals \
 	-I${top_srcdir}/libnm-util \
 	-I${top_builddir}/libnm-util \
 	-I${top_srcdir}/src \
 	-I${top_srcdir}/include \
-	-I${top_builddir}/include
-
-noinst_LTLIBRARIES = libdns-manager.la
+	-I${top_builddir}/include \
+	$(LIBNL_CFLAGS) \
+	$(DBUS_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	-DLOCALSTATEDIR=\"$(localstatedir)\" \
+	-DSYSCONFDIR=\"$(sysconfdir)\" \
+	-DNMCONFDIR=\"$(nmconfdir)\" \
+	-DNMRUNDIR=\"$(nmrundir)\"
 
 libdns_manager_la_SOURCES = \
 	nm-dns-manager.h \
@@ -19,15 +26,6 @@ libdns_manager_la_SOURCES = \
 	nm-dns-utils.h \
 	nm-dns-utils.c
 
-libdns_manager_la_CPPFLAGS = \
-	$(LIBNL_CFLAGS) \
-	$(DBUS_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	-DLOCALSTATEDIR=\"$(localstatedir)\" \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DNMCONFDIR=\"$(nmconfdir)\" \
-	-DNMRUNDIR=\"$(nmrundir)\"
-
 libdns_manager_la_LIBADD = \
 	$(top_builddir)/src/logging/libnm-logging.la \
 	$(top_builddir)/src/posix-signals/libnm-posix-signals.la \
diff --git a/src/dns-manager/Makefile.in b/src/dns-manager/Makefile.in
index 63742c2a..a6116fb5 100644
--- a/src/dns-manager/Makefile.in
+++ b/src/dns-manager/Makefile.in
@@ -209,6 +209,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -231,6 +232,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -415,16 +417,23 @@ with_dhclient = @with_dhclient@
 with_dhcpcd = @with_dhcpcd@
 with_netconfig = @with_netconfig@
 with_resolvconf = @with_resolvconf@
-INCLUDES = \
+noinst_LTLIBRARIES = libdns-manager.la
+libdns_manager_la_CPPFLAGS = \
 	-I${top_srcdir}/src/logging \
 	-I${top_srcdir}/src/posix-signals \
 	-I${top_srcdir}/libnm-util \
 	-I${top_builddir}/libnm-util \
 	-I${top_srcdir}/src \
 	-I${top_srcdir}/include \
-	-I${top_builddir}/include
+	-I${top_builddir}/include \
+	$(LIBNL_CFLAGS) \
+	$(DBUS_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	-DLOCALSTATEDIR=\"$(localstatedir)\" \
+	-DSYSCONFDIR=\"$(sysconfdir)\" \
+	-DNMCONFDIR=\"$(nmconfdir)\" \
+	-DNMRUNDIR=\"$(nmrundir)\"
 
-noinst_LTLIBRARIES = libdns-manager.la
 libdns_manager_la_SOURCES = \
 	nm-dns-manager.h \
 	nm-dns-manager.c \
@@ -435,15 +444,6 @@ libdns_manager_la_SOURCES = \
 	nm-dns-utils.h \
 	nm-dns-utils.c
 
-libdns_manager_la_CPPFLAGS = \
-	$(LIBNL_CFLAGS) \
-	$(DBUS_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	-DLOCALSTATEDIR=\"$(localstatedir)\" \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DNMCONFDIR=\"$(nmconfdir)\" \
-	-DNMRUNDIR=\"$(nmrundir)\"
-
 libdns_manager_la_LIBADD = \
 	$(top_builddir)/src/logging/libnm-logging.la \
 	$(top_builddir)/src/posix-signals/libnm-posix-signals.la \
diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns-manager/nm-dns-dnsmasq.c
index a41f87b2..1f6e5868 100644
--- a/src/dns-manager/nm-dns-dnsmasq.c
+++ b/src/dns-manager/nm-dns-dnsmasq.c
@@ -53,6 +53,7 @@ static inline const char *
 find_dnsmasq (void)
 {
 	static const char *paths[] = {
+		DNSMASQ_PATH,
 		"/usr/local/sbin/dnsmasq",
 		"/usr/sbin/dnsmasq",
 		"/sbin/dnsmasq",
@@ -61,7 +62,7 @@ find_dnsmasq (void)
 	const char **binary = paths;
 
 	while (*binary != NULL) {
-		if (g_file_test (*binary, G_FILE_TEST_EXISTS))
+		if (**binary && g_file_test (*binary, G_FILE_TEST_EXISTS))
 			return *binary;
 		binary++;
 	}
diff --git a/src/dnsmasq-manager/Makefile.am b/src/dnsmasq-manager/Makefile.am
index 8b7dd683..42706cc2 100644
--- a/src/dnsmasq-manager/Makefile.am
+++ b/src/dnsmasq-manager/Makefile.am
@@ -1,20 +1,18 @@
-INCLUDES = \
+noinst_LTLIBRARIES = libdnsmasq-manager.la
+
+libdnsmasq_manager_la_CPPFLAGS = \
 	-I${top_srcdir}/libnm-util \
 	-I${top_srcdir}/src/logging \
 	-I${top_srcdir}/src/posix-signals \
 	-I${top_srcdir}/src \
-	-I${top_srcdir}/include
-
-noinst_LTLIBRARIES = libdnsmasq-manager.la
+	-I${top_srcdir}/include \
+	$(GLIB_CFLAGS) \
+	-DLOCALSTATEDIR=\"$(localstatedir)\"
 
 libdnsmasq_manager_la_SOURCES = \
 	nm-dnsmasq-manager.h \
 	nm-dnsmasq-manager.c
 
-libdnsmasq_manager_la_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	-DLOCALSTATEDIR=\"$(localstatedir)\"
-
 libdnsmasq_manager_la_LIBADD = \
 	$(top_builddir)/src/logging/libnm-logging.la \
 	$(top_builddir)/src/posix-signals/libnm-posix-signals.la \
diff --git a/src/dnsmasq-manager/Makefile.in b/src/dnsmasq-manager/Makefile.in
index 1877f88d..9b20331f 100644
--- a/src/dnsmasq-manager/Makefile.in
+++ b/src/dnsmasq-manager/Makefile.in
@@ -206,6 +206,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -228,6 +229,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -412,22 +414,20 @@ with_dhclient = @with_dhclient@
 with_dhcpcd = @with_dhcpcd@
 with_netconfig = @with_netconfig@
 with_resolvconf = @with_resolvconf@
-INCLUDES = \
+noinst_LTLIBRARIES = libdnsmasq-manager.la
+libdnsmasq_manager_la_CPPFLAGS = \
 	-I${top_srcdir}/libnm-util \
 	-I${top_srcdir}/src/logging \
 	-I${top_srcdir}/src/posix-signals \
 	-I${top_srcdir}/src \
-	-I${top_srcdir}/include
+	-I${top_srcdir}/include \
+	$(GLIB_CFLAGS) \
+	-DLOCALSTATEDIR=\"$(localstatedir)\"
 
-noinst_LTLIBRARIES = libdnsmasq-manager.la
 libdnsmasq_manager_la_SOURCES = \
 	nm-dnsmasq-manager.h \
 	nm-dnsmasq-manager.c
 
-libdnsmasq_manager_la_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	-DLOCALSTATEDIR=\"$(localstatedir)\"
-
 libdnsmasq_manager_la_LIBADD = \
 	$(top_builddir)/src/logging/libnm-logging.la \
 	$(top_builddir)/src/posix-signals/libnm-posix-signals.la \
diff --git a/src/dnsmasq-manager/nm-dnsmasq-manager.c b/src/dnsmasq-manager/nm-dnsmasq-manager.c
index f708f6f6..083fb533 100644
--- a/src/dnsmasq-manager/nm-dnsmasq-manager.c
+++ b/src/dnsmasq-manager/nm-dnsmasq-manager.c
@@ -171,16 +171,16 @@ static inline const char *
 nm_find_dnsmasq (void)
 {
 	static const char *dnsmasq_binary_paths[] = {
+		DNSMASQ_PATH,
 		"/usr/local/sbin/dnsmasq",
 		"/usr/sbin/dnsmasq",
 		"/sbin/dnsmasq",
 		NULL
 	};
-
 	const char **dnsmasq_binary = dnsmasq_binary_paths;
 
 	while (*dnsmasq_binary != NULL) {
-		if (g_file_test (*dnsmasq_binary, G_FILE_TEST_EXISTS))
+		if (**dnsmasq_binary && g_file_test (*dnsmasq_binary, G_FILE_TEST_EXISTS))
 			break;
 		dnsmasq_binary++;
 	}
diff --git a/src/firewall-manager/Makefile.am b/src/firewall-manager/Makefile.am
index 2cfe32d0..15bde51a 100644
--- a/src/firewall-manager/Makefile.am
+++ b/src/firewall-manager/Makefile.am
@@ -1,21 +1,19 @@
-INCLUDES = \
-	-I${top_srcdir}/src \
-	-I${top_srcdir}/src/logging \
-	-I${top_srcdir}/include \
-	-I${top_srcdir}/libnm-util
-
 noinst_LTLIBRARIES = libfirewall-manager.la
 
-libfirewall_manager_la_SOURCES = \
-	nm-firewall-manager.h \
-	nm-firewall-manager.c
-
 libfirewall_manager_la_CPPFLAGS = \
+	-I${top_srcdir}/src \
+	-I${top_srcdir}/src/logging \
+	-I${top_srcdir}/include \
+	-I${top_srcdir}/libnm-util \
 	$(DBUS_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	-DNM_PKGDATADIR=\"$(pkgdatadir)\" \
 	-DNM_LOCALSTATEDIR=\"$(localstatedir)\"
 
+libfirewall_manager_la_SOURCES = \
+	nm-firewall-manager.h \
+	nm-firewall-manager.c
+
 libfirewall_manager_la_LIBADD = \
 	$(top_builddir)/src/logging/libnm-logging.la \
 	$(DBUS_LIBS) \
diff --git a/src/firewall-manager/Makefile.in b/src/firewall-manager/Makefile.in
index 6820a3ac..690f0b3d 100644
--- a/src/firewall-manager/Makefile.in
+++ b/src/firewall-manager/Makefile.in
@@ -205,6 +205,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -227,6 +228,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -411,23 +413,21 @@ with_dhclient = @with_dhclient@
 with_dhcpcd = @with_dhcpcd@
 with_netconfig = @with_netconfig@
 with_resolvconf = @with_resolvconf@
-INCLUDES = \
+noinst_LTLIBRARIES = libfirewall-manager.la
+libfirewall_manager_la_CPPFLAGS = \
 	-I${top_srcdir}/src \
 	-I${top_srcdir}/src/logging \
 	-I${top_srcdir}/include \
-	-I${top_srcdir}/libnm-util
-
-noinst_LTLIBRARIES = libfirewall-manager.la
-libfirewall_manager_la_SOURCES = \
-	nm-firewall-manager.h \
-	nm-firewall-manager.c
-
-libfirewall_manager_la_CPPFLAGS = \
+	-I${top_srcdir}/libnm-util \
 	$(DBUS_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	-DNM_PKGDATADIR=\"$(pkgdatadir)\" \
 	-DNM_LOCALSTATEDIR=\"$(localstatedir)\"
 
+libfirewall_manager_la_SOURCES = \
+	nm-firewall-manager.h \
+	nm-firewall-manager.c
+
 libfirewall_manager_la_LIBADD = \
 	$(top_builddir)/src/logging/libnm-logging.la \
 	$(DBUS_LIBS) \
diff --git a/src/firewall-manager/nm-firewall-manager.c b/src/firewall-manager/nm-firewall-manager.c
index c19be5e8..cdb2f3fa 100644
--- a/src/firewall-manager/nm-firewall-manager.c
+++ b/src/firewall-manager/nm-firewall-manager.c
@@ -82,8 +82,13 @@ add_or_change_cb (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_data
 	                            G_TYPE_STRING, &zone,
 	                            G_TYPE_INVALID)) {
 		g_assert (error);
-		nm_log_warn (LOGD_FIREWALL, "(%s) firewall zone add/change failed: (%d) %s",
-		             info->iface, error->code, error->message);
+		if (g_strcmp0 (error->message, "ZONE_ALREADY_SET") != 0) {
+			nm_log_warn (LOGD_FIREWALL, "(%s) firewall zone add/change failed: (%d) %s",
+			             info->iface, error->code, error->message);
+		} else {
+			nm_log_dbg (LOGD_FIREWALL, "(%s) firewall zone add/change failed: (%d) %s",
+			            info->iface, error->code, error->message);
+		}
 	}
 
 	info->callback (error, info->user_data);
@@ -114,7 +119,8 @@ nm_firewall_manager_add_or_change_zone (NMFirewallManager *self,
 	info->callback = callback;
 	info->user_data = user_data;
 
-	nm_log_dbg (LOGD_FIREWALL, "(%s) firewall zone %s -> %s", iface, add ? "add" : "change", zone);
+	nm_log_dbg (LOGD_FIREWALL, "(%s) firewall zone %s -> %s%s%s", iface, add ? "add" : "change",
+	                           zone?"\"":"", zone ? zone : "default", zone?"\"":"");
 	return dbus_g_proxy_begin_call_with_timeout (priv->proxy,
 	                                             add ? "addInterface" : "changeZone",
 	                                             add_or_change_cb,
@@ -137,8 +143,11 @@ remove_cb (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_data)
 	                            G_TYPE_STRING, &zone,
 	                            G_TYPE_INVALID)) {
 		g_assert (error);
-		nm_log_warn (LOGD_FIREWALL, "(%s) firewall zone remove failed: (%d) %s",
-		             info->iface, error->code, error->message);
+		/* ignore UNKNOWN_INTERFACE errors */
+		if (error->message && !strstr (error->message, "UNKNOWN_INTERFACE")) {
+			nm_log_warn (LOGD_FIREWALL, "(%s) firewall zone remove failed: (%d) %s",
+			             info->iface, error->code, error->message);
+		}
 	}
 
 	g_free (zone);
diff --git a/src/generated/Makefile.am b/src/generated/Makefile.am
index 307766e1..b313e454 100644
--- a/src/generated/Makefile.am
+++ b/src/generated/Makefile.am
@@ -50,7 +50,7 @@ GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM
 GLIB_GENERATED += nm-marshal.h nm-marshal.c
 nm_marshal_sources = $(nm_daemon_sources)
 
-INCLUDES = \
+libnm_generated_la_CPPFLAGS = \
 	-I${top_srcdir}/include \
 	-I${top_builddir}/include \
 	-I${top_srcdir}/src \
@@ -67,13 +67,7 @@ INCLUDES = \
 	-I$(top_srcdir)/src/firewall-manager \
 	-I$(top_srcdir)/src/settings \
 	-I$(top_srcdir)/src/wifi \
-	-I$(top_srcdir)/libnm-util
-
-if WITH_WIMAX
-INCLUDES += -I$(top_srcdir)/src/wimax
-endif
-
-libnm_generated_la_CPPFLAGS = \
+	-I$(top_srcdir)/libnm-util \
 	$(DBUS_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(GUDEV_CFLAGS) \
@@ -82,8 +76,12 @@ libnm_generated_la_CPPFLAGS = \
 	$(SYSTEMD_LOGIN_CFLAGS) \
 	$(IWMX_SDK_CFLAGS)
 
+if WITH_WIMAX
+libnm_generated_la_CPPFLAGS += -I$(top_srcdir)/src/wimax
+endif
+
 if WITH_MODEM_MANAGER_1
-	libnm_generated_la_CPPFLAGS += $(MM_GLIB_CFLAGS)
+libnm_generated_la_CPPFLAGS += $(MM_GLIB_CFLAGS)
 endif
 
 libnm_generated_la_LIBADD = \
diff --git a/src/generated/Makefile.in b/src/generated/Makefile.in
index ba64a615..350bf7f7 100644
--- a/src/generated/Makefile.in
+++ b/src/generated/Makefile.in
@@ -80,6 +80,7 @@ build_triplet = @build@
 host_triplet = @host@
 @WITH_WIMAX_TRUE@am__append_1 = $(top_srcdir)/src/wimax/*.[ch]
 @WITH_WIMAX_TRUE@am__append_2 = -I$(top_srcdir)/src/wimax
+@WITH_MODEM_MANAGER_1_TRUE@am__append_3 = $(MM_GLIB_CFLAGS)
 subdir = src/generated
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/build-aux/depcomp
@@ -205,6 +206,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -227,6 +229,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -451,9 +454,9 @@ nm_enum_types_sources = $(nm_daemon_sources)
 GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM
 GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM
 nm_marshal_sources = $(nm_daemon_sources)
-INCLUDES = -I${top_srcdir}/include -I${top_builddir}/include \
-	-I${top_srcdir}/src -I${top_srcdir}/src/logging \
-	-I${top_srcdir}/src/dns-manager \
+libnm_generated_la_CPPFLAGS = -I${top_srcdir}/include \
+	-I${top_builddir}/include -I${top_srcdir}/src \
+	-I${top_srcdir}/src/logging -I${top_srcdir}/src/dns-manager \
 	-I${top_srcdir}/src/vpn-manager \
 	-I${top_srcdir}/src/dhcp-manager \
 	-I${top_srcdir}/src/ip6-manager \
@@ -464,16 +467,10 @@ INCLUDES = -I${top_srcdir}/include -I${top_builddir}/include \
 	-I$(top_srcdir)/src/bluez-manager \
 	-I$(top_srcdir)/src/firewall-manager \
 	-I$(top_srcdir)/src/settings -I$(top_srcdir)/src/wifi \
-	-I$(top_srcdir)/libnm-util $(am__append_2)
-libnm_generated_la_CPPFLAGS = \
-	$(DBUS_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	$(GUDEV_CFLAGS) \
-	$(LIBNL_CFLAGS) \
-	$(POLKIT_CFLAGS) \
-	$(SYSTEMD_LOGIN_CFLAGS) \
-	$(IWMX_SDK_CFLAGS)
-
+	-I$(top_srcdir)/libnm-util $(DBUS_CFLAGS) $(GLIB_CFLAGS) \
+	$(GUDEV_CFLAGS) $(LIBNL_CFLAGS) $(POLKIT_CFLAGS) \
+	$(SYSTEMD_LOGIN_CFLAGS) $(IWMX_SDK_CFLAGS) $(am__append_2) \
+	$(am__append_3)
 libnm_generated_la_LIBADD = \
 	$(GLIB_LIBS)
 
@@ -786,8 +783,6 @@ uninstall-am:
 
 include $(GLIB_MAKEFILE)
 
-@WITH_MODEM_MANAGER_1_TRUE@	libnm_generated_la_CPPFLAGS += $(MM_GLIB_CFLAGS)
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/src/generated/nm-enum-types.c b/src/generated/nm-enum-types.c
index 78fdee46..9bb95806 100644
--- a/src/generated/nm-enum-types.c
+++ b/src/generated/nm-enum-types.c
@@ -5,52 +5,52 @@
 
 #include "nm-enum-types.h"
 
-#include "nm-manager.h" 
-#include "nm-types.h" 
-#include "nm-system.h" 
-#include "nm-hostname-provider.h" 
-#include "nm-manager-auth.h" 
-#include "nm-netlink-utils.h" 
-#include "nm-netlink-monitor.h" 
-#include "nm-connectivity.h" 
-#include "nm-device-vlan.h" 
-#include "nm-ip4-config.h" 
-#include "nm-sleep-monitor.h" 
-#include "nm-device.h" 
-#include "nm-device-olpc-mesh.h" 
-#include "nm-device-bridge.h" 
-#include "nm-device-private.h" 
-#include "nm-dhcp6-config.h" 
-#include "nm-ip6-config.h" 
-#include "nm-device-bond.h" 
-#include "nm-wifi-ap-utils.h" 
-#include "nm-device-adsl.h" 
-#include "nm-policy.h" 
-#include "nm-device-modem.h" 
-#include "nm-activation-request.h" 
-#include "nm-policy-hostname.h" 
-#include "nm-properties-changed-signal.h" 
-#include "nm-wifi-ap.h" 
-#include "nm-config.h" 
-#include "nm-device-wired.h" 
-#include "nm-rfkill.h" 
-#include "NetworkManagerUtils.h" 
-#include "nm-device-factory.h" 
 #include "nm-active-connection.h" 
+#include "nm-wifi-ap.h" 
 #include "nm-device-bt.h" 
 #include "nm-device-infiniband.h" 
-#include "nm-device-wifi.h" 
-#include "nm-dbus-manager.h" 
-#include "nm-dhcp4-config.h" 
+#include "nm-device-bond.h" 
+#include "nm-device-wired.h" 
+#include "nm-dhcp6-config.h" 
 #include "nm-session-utils.h" 
 #include "nm-netlink-compat.h" 
 #include "nm-session-monitor.h" 
 #include "nm-connection-provider.h" 
 #include "nm-device-ethernet.h" 
 #include "nm-call-store.h" 
+#include "nm-config.h" 
 #include "nm-policy-hosts.h" 
+#include "nm-rfkill.h" 
 #include "nm-dispatcher.h" 
+#include "nm-ip4-config.h" 
+#include "nm-manager.h" 
+#include "nm-device-modem.h" 
+#include "nm-activation-request.h" 
+#include "nm-wifi-ap-utils.h" 
+#include "nm-dbus-manager.h" 
+#include "nm-policy-hostname.h" 
+#include "nm-device.h" 
+#include "nm-types.h" 
+#include "nm-ip6-config.h" 
+#include "nm-system.h" 
+#include "nm-policy.h" 
+#include "nm-manager-auth.h" 
+#include "nm-device-bridge.h" 
+#include "nm-device-wifi.h" 
+#include "nm-device-private.h" 
+#include "nm-netlink-utils.h" 
+#include "nm-dhcp4-config.h" 
 #include "nm-udev-manager.h" 
+#include "nm-connectivity.h" 
+#include "nm-device-vlan.h" 
+#include "nm-netlink-monitor.h" 
+#include "nm-device-olpc-mesh.h" 
+#include "nm-hostname-provider.h" 
+#include "nm-sleep-monitor.h" 
+#include "nm-device-factory.h" 
+#include "NetworkManagerUtils.h" 
+#include "nm-device-adsl.h" 
+#include "nm-properties-changed-signal.h" 
 #include "nm-logging.h" 
 #include "nm-dns-utils.h" 
 #include "nm-dns-plugin.h" 
@@ -86,10 +86,10 @@
 #include "nm-bluez4-adapter.h" 
 #include "nm-firewall-manager.h" 
 #include "nm-settings-connection.h" 
+#include "nm-settings.h" 
 #include "nm-default-wired-connection.h" 
 #include "nm-system-config-interface.h" 
 #include "nm-settings-utils.h" 
-#include "nm-settings.h" 
 #include "nm-settings-error.h" 
 #include "nm-agent-manager.h" 
 #include "nm-inotify-helper.h" 
@@ -101,464 +101,464 @@
 #include "nm-wimax-nsp.h"
 
 GType
-nm_manager_error_get_type (void)
+nm_bt_error_get_type (void)
 {
   static volatile gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {
       static const GEnumValue values[] = {
-        { NM_MANAGER_ERROR_UNKNOWN_CONNECTION, "NM_MANAGER_ERROR_UNKNOWN_CONNECTION", "UnknownConnection" },
-        { NM_MANAGER_ERROR_UNKNOWN_DEVICE, "NM_MANAGER_ERROR_UNKNOWN_DEVICE", "UnknownDevice" },
-        { NM_MANAGER_ERROR_UNMANAGED_DEVICE, "NM_MANAGER_ERROR_UNMANAGED_DEVICE", "UnmanagedDevice" },
-        { NM_MANAGER_ERROR_SYSTEM_CONNECTION, "NM_MANAGER_ERROR_SYSTEM_CONNECTION", "SystemConnection" },
-        { NM_MANAGER_ERROR_PERMISSION_DENIED, "NM_MANAGER_ERROR_PERMISSION_DENIED", "PermissionDenied" },
-        { NM_MANAGER_ERROR_CONNECTION_NOT_ACTIVE, "NM_MANAGER_ERROR_CONNECTION_NOT_ACTIVE", "ConnectionNotActive" },
-        { NM_MANAGER_ERROR_ALREADY_ASLEEP_OR_AWAKE, "NM_MANAGER_ERROR_ALREADY_ASLEEP_OR_AWAKE", "AlreadyAsleepOrAwake" },
-        { NM_MANAGER_ERROR_ALREADY_ENABLED_OR_DISABLED, "NM_MANAGER_ERROR_ALREADY_ENABLED_OR_DISABLED", "AlreadyEnabledOrDisabled" },
-        { NM_MANAGER_ERROR_UNSUPPORTED_CONNECTION_TYPE, "NM_MANAGER_ERROR_UNSUPPORTED_CONNECTION_TYPE", "UnsupportedConnectionType" },
-        { NM_MANAGER_ERROR_DEPENDENCY_FAILED, "NM_MANAGER_ERROR_DEPENDENCY_FAILED", "DependencyFailed" },
-        { NM_MANAGER_ERROR_AUTOCONNECT_NOT_ALLOWED, "NM_MANAGER_ERROR_AUTOCONNECT_NOT_ALLOWED", "AutoconnectNotAllowed" },
+        { NM_BT_ERROR_CONNECTION_NOT_BT, "NM_BT_ERROR_CONNECTION_NOT_BT", "ConnectionNotBt" },
+        { NM_BT_ERROR_CONNECTION_INVALID, "NM_BT_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
+        { NM_BT_ERROR_CONNECTION_INCOMPATIBLE, "NM_BT_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
         { 0, NULL, NULL }
       };
       GType g_define_type_id =
-        g_enum_register_static (g_intern_static_string ("NMManagerError"), values);
+        g_enum_register_static (g_intern_static_string ("NMBtError"), values);
       g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
     }
 
   return g_define_type_id__volatile;
 }
 GType
-nm_auth_call_result_get_type (void)
+nm_infiniband_error_get_type (void)
 {
   static volatile gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {
       static const GEnumValue values[] = {
-        { NM_AUTH_CALL_RESULT_UNKNOWN, "NM_AUTH_CALL_RESULT_UNKNOWN", "unknown" },
-        { NM_AUTH_CALL_RESULT_YES, "NM_AUTH_CALL_RESULT_YES", "yes" },
-        { NM_AUTH_CALL_RESULT_AUTH, "NM_AUTH_CALL_RESULT_AUTH", "auth" },
-        { NM_AUTH_CALL_RESULT_NO, "NM_AUTH_CALL_RESULT_NO", "no" },
+        { NM_INFINIBAND_ERROR_CONNECTION_NOT_INFINIBAND, "NM_INFINIBAND_ERROR_CONNECTION_NOT_INFINIBAND", "ConnectionNotInfiniband" },
+        { NM_INFINIBAND_ERROR_CONNECTION_INVALID, "NM_INFINIBAND_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
+        { NM_INFINIBAND_ERROR_CONNECTION_INCOMPATIBLE, "NM_INFINIBAND_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
         { 0, NULL, NULL }
       };
       GType g_define_type_id =
-        g_enum_register_static (g_intern_static_string ("NMAuthCallResult"), values);
+        g_enum_register_static (g_intern_static_string ("NMInfinibandError"), values);
       g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
     }
 
   return g_define_type_id__volatile;
 }
 GType
-nm_nm_nl_prop_get_type (void)
+nm_bond_error_get_type (void)
 {
   static volatile gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {
       static const GEnumValue values[] = {
-        { NMNL_PROP_INVALID, "NMNL_PROP_INVALID", "invalid" },
-        { NMNL_PROP_PROT, "NMNL_PROP_PROT", "prot" },
-        { NMNL_PROP_SCOPE, "NMNL_PROP_SCOPE", "scope" },
-        { NMNL_PROP_TABLE, "NMNL_PROP_TABLE", "table" },
-        { NMNL_PROP_PRIO, "NMNL_PROP_PRIO", "prio" },
+        { NM_BOND_ERROR_CONNECTION_NOT_BOND, "NM_BOND_ERROR_CONNECTION_NOT_BOND", "ConnectionNotBond" },
+        { NM_BOND_ERROR_CONNECTION_INVALID, "NM_BOND_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
+        { NM_BOND_ERROR_CONNECTION_INCOMPATIBLE, "NM_BOND_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
         { 0, NULL, NULL }
       };
       GType g_define_type_id =
-        g_enum_register_static (g_intern_static_string ("NmNlProp"), values);
+        g_enum_register_static (g_intern_static_string ("NMBondError"), values);
       g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
     }
 
   return g_define_type_id__volatile;
 }
 GType
-nm_netlink_monitor_error_get_type (void)
+nm_session_monitor_error_get_type (void)
 {
   static volatile gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {
       static const GEnumValue values[] = {
-        { NM_NETLINK_MONITOR_ERROR_GENERIC, "NM_NETLINK_MONITOR_ERROR_GENERIC", "generic" },
-        { NM_NETLINK_MONITOR_ERROR_NETLINK_ALLOC_HANDLE, "NM_NETLINK_MONITOR_ERROR_NETLINK_ALLOC_HANDLE", "netlink-alloc-handle" },
-        { NM_NETLINK_MONITOR_ERROR_NETLINK_CONNECT, "NM_NETLINK_MONITOR_ERROR_NETLINK_CONNECT", "netlink-connect" },
-        { NM_NETLINK_MONITOR_ERROR_NETLINK_JOIN_GROUP, "NM_NETLINK_MONITOR_ERROR_NETLINK_JOIN_GROUP", "netlink-join-group" },
-        { NM_NETLINK_MONITOR_ERROR_NETLINK_ALLOC_LINK_CACHE, "NM_NETLINK_MONITOR_ERROR_NETLINK_ALLOC_LINK_CACHE", "netlink-alloc-link-cache" },
-        { NM_NETLINK_MONITOR_ERROR_PROCESSING_MESSAGE, "NM_NETLINK_MONITOR_ERROR_PROCESSING_MESSAGE", "processing-message" },
-        { NM_NETLINK_MONITOR_ERROR_BAD_ALLOC, "NM_NETLINK_MONITOR_ERROR_BAD_ALLOC", "bad-alloc" },
-        { NM_NETLINK_MONITOR_ERROR_WAITING_FOR_SOCKET_DATA, "NM_NETLINK_MONITOR_ERROR_WAITING_FOR_SOCKET_DATA", "waiting-for-socket-data" },
-        { NM_NETLINK_MONITOR_ERROR_LINK_CACHE_UPDATE, "NM_NETLINK_MONITOR_ERROR_LINK_CACHE_UPDATE", "link-cache-update" },
+        { NM_SESSION_MONITOR_ERROR_IO_ERROR, "NM_SESSION_MONITOR_ERROR_IO_ERROR", "IOError" },
+        { NM_SESSION_MONITOR_ERROR_MALFORMED_DATABASE, "NM_SESSION_MONITOR_ERROR_MALFORMED_DATABASE", "MalformedDatabase" },
+        { NM_SESSION_MONITOR_ERROR_UNKNOWN_USER, "NM_SESSION_MONITOR_ERROR_UNKNOWN_USER", "UnknownUser" },
+        { NM_SESSION_MONITOR_ERROR_NO_DATABASE, "NM_SESSION_MONITOR_ERROR_NO_DATABASE", "NoDatabase" },
         { 0, NULL, NULL }
       };
       GType g_define_type_id =
-        g_enum_register_static (g_intern_static_string ("NMNetlinkMonitorError"), values);
+        g_enum_register_static (g_intern_static_string ("NMSessionMonitorError"), values);
       g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
     }
 
   return g_define_type_id__volatile;
 }
 GType
-nm_vlan_error_get_type (void)
+nm_ethernet_error_get_type (void)
 {
   static volatile gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {
       static const GEnumValue values[] = {
-        { NM_VLAN_ERROR_CONNECTION_NOT_VLAN, "NM_VLAN_ERROR_CONNECTION_NOT_VLAN", "ConnectionNotVlan" },
-        { NM_VLAN_ERROR_CONNECTION_INVALID, "NM_VLAN_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
-        { NM_VLAN_ERROR_CONNECTION_INCOMPATIBLE, "NM_VLAN_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
+        { NM_ETHERNET_ERROR_CONNECTION_NOT_WIRED, "NM_ETHERNET_ERROR_CONNECTION_NOT_WIRED", "ConnectionNotWired" },
+        { NM_ETHERNET_ERROR_CONNECTION_INVALID, "NM_ETHERNET_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
+        { NM_ETHERNET_ERROR_CONNECTION_INCOMPATIBLE, "NM_ETHERNET_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
         { 0, NULL, NULL }
       };
       GType g_define_type_id =
-        g_enum_register_static (g_intern_static_string ("NMVlanError"), values);
+        g_enum_register_static (g_intern_static_string ("NMEthernetError"), values);
       g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
     }
 
   return g_define_type_id__volatile;
 }
 GType
-nm_ip4_config_compare_flags_get_type (void)
+nm_config_error_get_type (void)
 {
   static volatile gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {
       static const GEnumValue values[] = {
-        { NM_IP4_COMPARE_FLAG_NONE, "NM_IP4_COMPARE_FLAG_NONE", "none" },
-        { NM_IP4_COMPARE_FLAG_ADDRESSES, "NM_IP4_COMPARE_FLAG_ADDRESSES", "addresses" },
-        { NM_IP4_COMPARE_FLAG_PTP_ADDRESS, "NM_IP4_COMPARE_FLAG_PTP_ADDRESS", "ptp-address" },
-        { NM_IP4_COMPARE_FLAG_NAMESERVERS, "NM_IP4_COMPARE_FLAG_NAMESERVERS", "nameservers" },
-        { NM_IP4_COMPARE_FLAG_ROUTES, "NM_IP4_COMPARE_FLAG_ROUTES", "routes" },
-        { NM_IP4_COMPARE_FLAG_DOMAINS, "NM_IP4_COMPARE_FLAG_DOMAINS", "domains" },
-        { NM_IP4_COMPARE_FLAG_SEARCHES, "NM_IP4_COMPARE_FLAG_SEARCHES", "searches" },
-        { NM_IP4_COMPARE_FLAG_MTU, "NM_IP4_COMPARE_FLAG_MTU", "mtu" },
-        { NM_IP4_COMPARE_FLAG_MSS, "NM_IP4_COMPARE_FLAG_MSS", "mss" },
-        { NM_IP4_COMPARE_FLAG_WINS_SERVERS, "NM_IP4_COMPARE_FLAG_WINS_SERVERS", "wins-servers" },
-        { NM_IP4_COMPARE_FLAG_NIS_SERVERS, "NM_IP4_COMPARE_FLAG_NIS_SERVERS", "nis-servers" },
-        { NM_IP4_COMPARE_FLAG_NIS_DOMAIN, "NM_IP4_COMPARE_FLAG_NIS_DOMAIN", "nis-domain" },
-        { NM_IP4_COMPARE_FLAG_ALL, "NM_IP4_COMPARE_FLAG_ALL", "all" },
+        { NM_CONFIG_ERROR_NO_MEMORY, "NM_CONFIG_ERROR_NO_MEMORY", "NoMemory" },
         { 0, NULL, NULL }
       };
       GType g_define_type_id =
-        g_enum_register_static (g_intern_static_string ("NMIP4ConfigCompareFlags"), values);
+        g_enum_register_static (g_intern_static_string ("NMConfigError"), values);
       g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
     }
 
   return g_define_type_id__volatile;
 }
 GType
-nm_device_error_get_type (void)
+nm_rf_kill_state_get_type (void)
 {
   static volatile gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {
       static const GEnumValue values[] = {
-        { NM_DEVICE_ERROR_CONNECTION_ACTIVATING, "NM_DEVICE_ERROR_CONNECTION_ACTIVATING", "ConnectionActivating" },
-        { NM_DEVICE_ERROR_CONNECTION_INVALID, "NM_DEVICE_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
-        { NM_DEVICE_ERROR_NOT_ACTIVE, "NM_DEVICE_ERROR_NOT_ACTIVE", "NotActive" },
+        { RFKILL_UNBLOCKED, "RFKILL_UNBLOCKED", "unblocked" },
+        { RFKILL_SOFT_BLOCKED, "RFKILL_SOFT_BLOCKED", "soft-blocked" },
+        { RFKILL_HARD_BLOCKED, "RFKILL_HARD_BLOCKED", "hard-blocked" },
         { 0, NULL, NULL }
       };
       GType g_define_type_id =
-        g_enum_register_static (g_intern_static_string ("NMDeviceError"), values);
+        g_enum_register_static (g_intern_static_string ("RfKillState"), values);
       g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
     }
 
   return g_define_type_id__volatile;
 }
 GType
-nm_olpc_mesh_error_get_type (void)
+nm_rf_kill_type_get_type (void)
 {
   static volatile gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {
       static const GEnumValue values[] = {
-        { NM_OLPC_MESH_ERROR_CONNECTION_NOT_MESH, "NM_OLPC_MESH_ERROR_CONNECTION_NOT_MESH", "ConnectionNotMesh" },
-        { NM_OLPC_MESH_ERROR_CONNECTION_INVALID, "NM_OLPC_MESH_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
-        { NM_OLPC_MESH_ERROR_CONNECTION_INCOMPATIBLE, "NM_OLPC_MESH_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
+        { RFKILL_TYPE_WLAN, "RFKILL_TYPE_WLAN", "wlan" },
+        { RFKILL_TYPE_WWAN, "RFKILL_TYPE_WWAN", "wwan" },
+        { RFKILL_TYPE_WIMAX, "RFKILL_TYPE_WIMAX", "wimax" },
+        { RFKILL_TYPE_UNKNOWN, "RFKILL_TYPE_UNKNOWN", "unknown" },
+        { RFKILL_TYPE_MAX, "RFKILL_TYPE_MAX", "max" },
         { 0, NULL, NULL }
       };
       GType g_define_type_id =
-        g_enum_register_static (g_intern_static_string ("NMOlpcMeshError"), values);
+        g_enum_register_static (g_intern_static_string ("RfKillType"), values);
       g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
     }
 
   return g_define_type_id__volatile;
 }
 GType
-nm_bridge_error_get_type (void)
+nm_dispatcher_action_get_type (void)
 {
   static volatile gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {
       static const GEnumValue values[] = {
-        { NM_BRIDGE_ERROR_CONNECTION_NOT_BRIDGE, "NM_BRIDGE_ERROR_CONNECTION_NOT_BRIDGE", "ConnectionNotBridge" },
-        { NM_BRIDGE_ERROR_CONNECTION_INVALID, "NM_BRIDGE_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
-        { NM_BRIDGE_ERROR_CONNECTION_INCOMPATIBLE, "NM_BRIDGE_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
+        { DISPATCHER_ACTION_HOSTNAME, "DISPATCHER_ACTION_HOSTNAME", "hostname" },
+        { DISPATCHER_ACTION_UP, "DISPATCHER_ACTION_UP", "up" },
+        { DISPATCHER_ACTION_PRE_DOWN, "DISPATCHER_ACTION_PRE_DOWN", "pre-down" },
+        { DISPATCHER_ACTION_DOWN, "DISPATCHER_ACTION_DOWN", "down" },
+        { DISPATCHER_ACTION_VPN_UP, "DISPATCHER_ACTION_VPN_UP", "vpn-up" },
+        { DISPATCHER_ACTION_VPN_PRE_DOWN, "DISPATCHER_ACTION_VPN_PRE_DOWN", "vpn-pre-down" },
+        { DISPATCHER_ACTION_VPN_DOWN, "DISPATCHER_ACTION_VPN_DOWN", "vpn-down" },
+        { DISPATCHER_ACTION_DHCP4_CHANGE, "DISPATCHER_ACTION_DHCP4_CHANGE", "dhcp4-change" },
+        { DISPATCHER_ACTION_DHCP6_CHANGE, "DISPATCHER_ACTION_DHCP6_CHANGE", "dhcp6-change" },
         { 0, NULL, NULL }
       };
       GType g_define_type_id =
-        g_enum_register_static (g_intern_static_string ("NMBridgeError"), values);
+        g_enum_register_static (g_intern_static_string ("DispatcherAction"), values);
       g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
     }
 
   return g_define_type_id__volatile;
 }
 GType
-nm_ip6_config_compare_flags_get_type (void)
+nm_ip4_config_compare_flags_get_type (void)
 {
   static volatile gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {
       static const GEnumValue values[] = {
-        { NM_IP6_COMPARE_FLAG_NONE, "NM_IP6_COMPARE_FLAG_NONE", "none" },
-        { NM_IP6_COMPARE_FLAG_ADDRESSES, "NM_IP6_COMPARE_FLAG_ADDRESSES", "addresses" },
-        { NM_IP6_COMPARE_FLAG_PTP_ADDRESS, "NM_IP6_COMPARE_FLAG_PTP_ADDRESS", "ptp-address" },
-        { NM_IP6_COMPARE_FLAG_NAMESERVERS, "NM_IP6_COMPARE_FLAG_NAMESERVERS", "nameservers" },
-        { NM_IP6_COMPARE_FLAG_ROUTES, "NM_IP6_COMPARE_FLAG_ROUTES", "routes" },
-        { NM_IP6_COMPARE_FLAG_DOMAINS, "NM_IP6_COMPARE_FLAG_DOMAINS", "domains" },
-        { NM_IP6_COMPARE_FLAG_SEARCHES, "NM_IP6_COMPARE_FLAG_SEARCHES", "searches" },
-        { NM_IP6_COMPARE_FLAG_MSS, "NM_IP6_COMPARE_FLAG_MSS", "mss" },
-        { NM_IP6_COMPARE_FLAG_ALL, "NM_IP6_COMPARE_FLAG_ALL", "all" },
+        { NM_IP4_COMPARE_FLAG_NONE, "NM_IP4_COMPARE_FLAG_NONE", "none" },
+        { NM_IP4_COMPARE_FLAG_ADDRESSES, "NM_IP4_COMPARE_FLAG_ADDRESSES", "addresses" },
+        { NM_IP4_COMPARE_FLAG_PTP_ADDRESS, "NM_IP4_COMPARE_FLAG_PTP_ADDRESS", "ptp-address" },
+        { NM_IP4_COMPARE_FLAG_NAMESERVERS, "NM_IP4_COMPARE_FLAG_NAMESERVERS", "nameservers" },
+        { NM_IP4_COMPARE_FLAG_ROUTES, "NM_IP4_COMPARE_FLAG_ROUTES", "routes" },
+        { NM_IP4_COMPARE_FLAG_DOMAINS, "NM_IP4_COMPARE_FLAG_DOMAINS", "domains" },
+        { NM_IP4_COMPARE_FLAG_SEARCHES, "NM_IP4_COMPARE_FLAG_SEARCHES", "searches" },
+        { NM_IP4_COMPARE_FLAG_MTU, "NM_IP4_COMPARE_FLAG_MTU", "mtu" },
+        { NM_IP4_COMPARE_FLAG_MSS, "NM_IP4_COMPARE_FLAG_MSS", "mss" },
+        { NM_IP4_COMPARE_FLAG_WINS_SERVERS, "NM_IP4_COMPARE_FLAG_WINS_SERVERS", "wins-servers" },
+        { NM_IP4_COMPARE_FLAG_NIS_SERVERS, "NM_IP4_COMPARE_FLAG_NIS_SERVERS", "nis-servers" },
+        { NM_IP4_COMPARE_FLAG_NIS_DOMAIN, "NM_IP4_COMPARE_FLAG_NIS_DOMAIN", "nis-domain" },
+        { NM_IP4_COMPARE_FLAG_ALL, "NM_IP4_COMPARE_FLAG_ALL", "all" },
         { 0, NULL, NULL }
       };
       GType g_define_type_id =
-        g_enum_register_static (g_intern_static_string ("NMIP6ConfigCompareFlags"), values);
+        g_enum_register_static (g_intern_static_string ("NMIP4ConfigCompareFlags"), values);
       g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
     }
 
   return g_define_type_id__volatile;
 }
 GType
-nm_bond_error_get_type (void)
+nm_manager_error_get_type (void)
 {
   static volatile gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {
       static const GEnumValue values[] = {
-        { NM_BOND_ERROR_CONNECTION_NOT_BOND, "NM_BOND_ERROR_CONNECTION_NOT_BOND", "ConnectionNotBond" },
-        { NM_BOND_ERROR_CONNECTION_INVALID, "NM_BOND_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
-        { NM_BOND_ERROR_CONNECTION_INCOMPATIBLE, "NM_BOND_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
+        { NM_MANAGER_ERROR_UNKNOWN_CONNECTION, "NM_MANAGER_ERROR_UNKNOWN_CONNECTION", "UnknownConnection" },
+        { NM_MANAGER_ERROR_UNKNOWN_DEVICE, "NM_MANAGER_ERROR_UNKNOWN_DEVICE", "UnknownDevice" },
+        { NM_MANAGER_ERROR_UNMANAGED_DEVICE, "NM_MANAGER_ERROR_UNMANAGED_DEVICE", "UnmanagedDevice" },
+        { NM_MANAGER_ERROR_SYSTEM_CONNECTION, "NM_MANAGER_ERROR_SYSTEM_CONNECTION", "SystemConnection" },
+        { NM_MANAGER_ERROR_PERMISSION_DENIED, "NM_MANAGER_ERROR_PERMISSION_DENIED", "PermissionDenied" },
+        { NM_MANAGER_ERROR_CONNECTION_NOT_ACTIVE, "NM_MANAGER_ERROR_CONNECTION_NOT_ACTIVE", "ConnectionNotActive" },
+        { NM_MANAGER_ERROR_ALREADY_ASLEEP_OR_AWAKE, "NM_MANAGER_ERROR_ALREADY_ASLEEP_OR_AWAKE", "AlreadyAsleepOrAwake" },
+        { NM_MANAGER_ERROR_ALREADY_ENABLED_OR_DISABLED, "NM_MANAGER_ERROR_ALREADY_ENABLED_OR_DISABLED", "AlreadyEnabledOrDisabled" },
+        { NM_MANAGER_ERROR_UNSUPPORTED_CONNECTION_TYPE, "NM_MANAGER_ERROR_UNSUPPORTED_CONNECTION_TYPE", "UnsupportedConnectionType" },
+        { NM_MANAGER_ERROR_DEPENDENCY_FAILED, "NM_MANAGER_ERROR_DEPENDENCY_FAILED", "DependencyFailed" },
+        { NM_MANAGER_ERROR_AUTOCONNECT_NOT_ALLOWED, "NM_MANAGER_ERROR_AUTOCONNECT_NOT_ALLOWED", "AutoconnectNotAllowed" },
         { 0, NULL, NULL }
       };
       GType g_define_type_id =
-        g_enum_register_static (g_intern_static_string ("NMBondError"), values);
+        g_enum_register_static (g_intern_static_string ("NMManagerError"), values);
       g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
     }
 
   return g_define_type_id__volatile;
 }
 GType
-nm_adsl_error_get_type (void)
+nm_device_error_get_type (void)
 {
   static volatile gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {
       static const GEnumValue values[] = {
-        { NM_ADSL_ERROR_CONNECTION_NOT_ADSL, "NM_ADSL_ERROR_CONNECTION_NOT_ADSL", "ConnectionNotAdsl" },
-        { NM_ADSL_ERROR_CONNECTION_INVALID, "NM_ADSL_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
-        { NM_ADSL_ERROR_CONNECTION_INCOMPATIBLE, "NM_ADSL_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
+        { NM_DEVICE_ERROR_CONNECTION_ACTIVATING, "NM_DEVICE_ERROR_CONNECTION_ACTIVATING", "ConnectionActivating" },
+        { NM_DEVICE_ERROR_CONNECTION_INVALID, "NM_DEVICE_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
+        { NM_DEVICE_ERROR_NOT_ACTIVE, "NM_DEVICE_ERROR_NOT_ACTIVE", "NotActive" },
         { 0, NULL, NULL }
       };
       GType g_define_type_id =
-        g_enum_register_static (g_intern_static_string ("NMAdslError"), values);
+        g_enum_register_static (g_intern_static_string ("NMDeviceError"), values);
       g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
     }
 
   return g_define_type_id__volatile;
 }
 GType
-nm_config_error_get_type (void)
+nm_ip6_config_compare_flags_get_type (void)
 {
   static volatile gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {
       static const GEnumValue values[] = {
-        { NM_CONFIG_ERROR_NO_MEMORY, "NM_CONFIG_ERROR_NO_MEMORY", "NoMemory" },
+        { NM_IP6_COMPARE_FLAG_NONE, "NM_IP6_COMPARE_FLAG_NONE", "none" },
+        { NM_IP6_COMPARE_FLAG_ADDRESSES, "NM_IP6_COMPARE_FLAG_ADDRESSES", "addresses" },
+        { NM_IP6_COMPARE_FLAG_PTP_ADDRESS, "NM_IP6_COMPARE_FLAG_PTP_ADDRESS", "ptp-address" },
+        { NM_IP6_COMPARE_FLAG_NAMESERVERS, "NM_IP6_COMPARE_FLAG_NAMESERVERS", "nameservers" },
+        { NM_IP6_COMPARE_FLAG_ROUTES, "NM_IP6_COMPARE_FLAG_ROUTES", "routes" },
+        { NM_IP6_COMPARE_FLAG_DOMAINS, "NM_IP6_COMPARE_FLAG_DOMAINS", "domains" },
+        { NM_IP6_COMPARE_FLAG_SEARCHES, "NM_IP6_COMPARE_FLAG_SEARCHES", "searches" },
+        { NM_IP6_COMPARE_FLAG_MSS, "NM_IP6_COMPARE_FLAG_MSS", "mss" },
+        { NM_IP6_COMPARE_FLAG_ALL, "NM_IP6_COMPARE_FLAG_ALL", "all" },
         { 0, NULL, NULL }
       };
       GType g_define_type_id =
-        g_enum_register_static (g_intern_static_string ("NMConfigError"), values);
+        g_enum_register_static (g_intern_static_string ("NMIP6ConfigCompareFlags"), values);
       g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
     }
 
   return g_define_type_id__volatile;
 }
 GType
-nm_rf_kill_state_get_type (void)
+nm_auth_call_result_get_type (void)
 {
   static volatile gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {
       static const GEnumValue values[] = {
-        { RFKILL_UNBLOCKED, "RFKILL_UNBLOCKED", "unblocked" },
-        { RFKILL_SOFT_BLOCKED, "RFKILL_SOFT_BLOCKED", "soft-blocked" },
-        { RFKILL_HARD_BLOCKED, "RFKILL_HARD_BLOCKED", "hard-blocked" },
+        { NM_AUTH_CALL_RESULT_UNKNOWN, "NM_AUTH_CALL_RESULT_UNKNOWN", "unknown" },
+        { NM_AUTH_CALL_RESULT_YES, "NM_AUTH_CALL_RESULT_YES", "yes" },
+        { NM_AUTH_CALL_RESULT_AUTH, "NM_AUTH_CALL_RESULT_AUTH", "auth" },
+        { NM_AUTH_CALL_RESULT_NO, "NM_AUTH_CALL_RESULT_NO", "no" },
         { 0, NULL, NULL }
       };
       GType g_define_type_id =
-        g_enum_register_static (g_intern_static_string ("RfKillState"), values);
+        g_enum_register_static (g_intern_static_string ("NMAuthCallResult"), values);
       g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
     }
 
   return g_define_type_id__volatile;
 }
 GType
-nm_rf_kill_type_get_type (void)
+nm_bridge_error_get_type (void)
 {
   static volatile gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {
       static const GEnumValue values[] = {
-        { RFKILL_TYPE_WLAN, "RFKILL_TYPE_WLAN", "wlan" },
-        { RFKILL_TYPE_WWAN, "RFKILL_TYPE_WWAN", "wwan" },
-        { RFKILL_TYPE_WIMAX, "RFKILL_TYPE_WIMAX", "wimax" },
-        { RFKILL_TYPE_UNKNOWN, "RFKILL_TYPE_UNKNOWN", "unknown" },
-        { RFKILL_TYPE_MAX, "RFKILL_TYPE_MAX", "max" },
+        { NM_BRIDGE_ERROR_CONNECTION_NOT_BRIDGE, "NM_BRIDGE_ERROR_CONNECTION_NOT_BRIDGE", "ConnectionNotBridge" },
+        { NM_BRIDGE_ERROR_CONNECTION_INVALID, "NM_BRIDGE_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
+        { NM_BRIDGE_ERROR_CONNECTION_INCOMPATIBLE, "NM_BRIDGE_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
         { 0, NULL, NULL }
       };
       GType g_define_type_id =
-        g_enum_register_static (g_intern_static_string ("RfKillType"), values);
+        g_enum_register_static (g_intern_static_string ("NMBridgeError"), values);
       g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
     }
 
   return g_define_type_id__volatile;
 }
 GType
-nm_bt_error_get_type (void)
+nm_wifi_error_get_type (void)
 {
   static volatile gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {
       static const GEnumValue values[] = {
-        { NM_BT_ERROR_CONNECTION_NOT_BT, "NM_BT_ERROR_CONNECTION_NOT_BT", "ConnectionNotBt" },
-        { NM_BT_ERROR_CONNECTION_INVALID, "NM_BT_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
-        { NM_BT_ERROR_CONNECTION_INCOMPATIBLE, "NM_BT_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
+        { NM_WIFI_ERROR_CONNECTION_NOT_WIRELESS, "NM_WIFI_ERROR_CONNECTION_NOT_WIRELESS", "ConnectionNotWireless" },
+        { NM_WIFI_ERROR_CONNECTION_INVALID, "NM_WIFI_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
+        { NM_WIFI_ERROR_CONNECTION_INCOMPATIBLE, "NM_WIFI_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
+        { NM_WIFI_ERROR_ACCESS_POINT_NOT_FOUND, "NM_WIFI_ERROR_ACCESS_POINT_NOT_FOUND", "AccessPointNotFound" },
+        { NM_WIFI_ERROR_SCAN_NOT_ALLOWED, "NM_WIFI_ERROR_SCAN_NOT_ALLOWED", "ScanNotAllowed" },
+        { NM_WIFI_ERROR_AP_MODE_UNSUPPORTED, "NM_WIFI_ERROR_AP_MODE_UNSUPPORTED", "ApModeUnsupported" },
+        { NM_WIFI_ERROR_ADHOC_MODE_UNSUPPORTED, "NM_WIFI_ERROR_ADHOC_MODE_UNSUPPORTED", "AdhocModeUnsupported" },
         { 0, NULL, NULL }
       };
       GType g_define_type_id =
-        g_enum_register_static (g_intern_static_string ("NMBtError"), values);
+        g_enum_register_static (g_intern_static_string ("NMWifiError"), values);
       g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
     }
 
   return g_define_type_id__volatile;
 }
 GType
-nm_infiniband_error_get_type (void)
+nm_nm_nl_prop_get_type (void)
 {
   static volatile gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {
       static const GEnumValue values[] = {
-        { NM_INFINIBAND_ERROR_CONNECTION_NOT_INFINIBAND, "NM_INFINIBAND_ERROR_CONNECTION_NOT_INFINIBAND", "ConnectionNotInfiniband" },
-        { NM_INFINIBAND_ERROR_CONNECTION_INVALID, "NM_INFINIBAND_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
-        { NM_INFINIBAND_ERROR_CONNECTION_INCOMPATIBLE, "NM_INFINIBAND_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
+        { NMNL_PROP_INVALID, "NMNL_PROP_INVALID", "invalid" },
+        { NMNL_PROP_PROT, "NMNL_PROP_PROT", "prot" },
+        { NMNL_PROP_SCOPE, "NMNL_PROP_SCOPE", "scope" },
+        { NMNL_PROP_TABLE, "NMNL_PROP_TABLE", "table" },
+        { NMNL_PROP_PRIO, "NMNL_PROP_PRIO", "prio" },
         { 0, NULL, NULL }
       };
       GType g_define_type_id =
-        g_enum_register_static (g_intern_static_string ("NMInfinibandError"), values);
+        g_enum_register_static (g_intern_static_string ("NmNlProp"), values);
       g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
     }
 
   return g_define_type_id__volatile;
 }
 GType
-nm_wifi_error_get_type (void)
+nm_vlan_error_get_type (void)
 {
   static volatile gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {
       static const GEnumValue values[] = {
-        { NM_WIFI_ERROR_CONNECTION_NOT_WIRELESS, "NM_WIFI_ERROR_CONNECTION_NOT_WIRELESS", "ConnectionNotWireless" },
-        { NM_WIFI_ERROR_CONNECTION_INVALID, "NM_WIFI_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
-        { NM_WIFI_ERROR_CONNECTION_INCOMPATIBLE, "NM_WIFI_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
-        { NM_WIFI_ERROR_ACCESS_POINT_NOT_FOUND, "NM_WIFI_ERROR_ACCESS_POINT_NOT_FOUND", "AccessPointNotFound" },
-        { NM_WIFI_ERROR_SCAN_NOT_ALLOWED, "NM_WIFI_ERROR_SCAN_NOT_ALLOWED", "ScanNotAllowed" },
-        { NM_WIFI_ERROR_AP_MODE_UNSUPPORTED, "NM_WIFI_ERROR_AP_MODE_UNSUPPORTED", "ApModeUnsupported" },
-        { NM_WIFI_ERROR_ADHOC_MODE_UNSUPPORTED, "NM_WIFI_ERROR_ADHOC_MODE_UNSUPPORTED", "AdhocModeUnsupported" },
+        { NM_VLAN_ERROR_CONNECTION_NOT_VLAN, "NM_VLAN_ERROR_CONNECTION_NOT_VLAN", "ConnectionNotVlan" },
+        { NM_VLAN_ERROR_CONNECTION_INVALID, "NM_VLAN_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
+        { NM_VLAN_ERROR_CONNECTION_INCOMPATIBLE, "NM_VLAN_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
         { 0, NULL, NULL }
       };
       GType g_define_type_id =
-        g_enum_register_static (g_intern_static_string ("NMWifiError"), values);
+        g_enum_register_static (g_intern_static_string ("NMVlanError"), values);
       g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
     }
 
   return g_define_type_id__volatile;
 }
 GType
-nm_session_monitor_error_get_type (void)
+nm_netlink_monitor_error_get_type (void)
 {
   static volatile gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {
       static const GEnumValue values[] = {
-        { NM_SESSION_MONITOR_ERROR_IO_ERROR, "NM_SESSION_MONITOR_ERROR_IO_ERROR", "IOError" },
-        { NM_SESSION_MONITOR_ERROR_MALFORMED_DATABASE, "NM_SESSION_MONITOR_ERROR_MALFORMED_DATABASE", "MalformedDatabase" },
-        { NM_SESSION_MONITOR_ERROR_UNKNOWN_USER, "NM_SESSION_MONITOR_ERROR_UNKNOWN_USER", "UnknownUser" },
-        { NM_SESSION_MONITOR_ERROR_NO_DATABASE, "NM_SESSION_MONITOR_ERROR_NO_DATABASE", "NoDatabase" },
+        { NM_NETLINK_MONITOR_ERROR_GENERIC, "NM_NETLINK_MONITOR_ERROR_GENERIC", "generic" },
+        { NM_NETLINK_MONITOR_ERROR_NETLINK_ALLOC_HANDLE, "NM_NETLINK_MONITOR_ERROR_NETLINK_ALLOC_HANDLE", "netlink-alloc-handle" },
+        { NM_NETLINK_MONITOR_ERROR_NETLINK_CONNECT, "NM_NETLINK_MONITOR_ERROR_NETLINK_CONNECT", "netlink-connect" },
+        { NM_NETLINK_MONITOR_ERROR_NETLINK_JOIN_GROUP, "NM_NETLINK_MONITOR_ERROR_NETLINK_JOIN_GROUP", "netlink-join-group" },
+        { NM_NETLINK_MONITOR_ERROR_NETLINK_ALLOC_LINK_CACHE, "NM_NETLINK_MONITOR_ERROR_NETLINK_ALLOC_LINK_CACHE", "netlink-alloc-link-cache" },
+        { NM_NETLINK_MONITOR_ERROR_PROCESSING_MESSAGE, "NM_NETLINK_MONITOR_ERROR_PROCESSING_MESSAGE", "processing-message" },
+        { NM_NETLINK_MONITOR_ERROR_BAD_ALLOC, "NM_NETLINK_MONITOR_ERROR_BAD_ALLOC", "bad-alloc" },
+        { NM_NETLINK_MONITOR_ERROR_WAITING_FOR_SOCKET_DATA, "NM_NETLINK_MONITOR_ERROR_WAITING_FOR_SOCKET_DATA", "waiting-for-socket-data" },
+        { NM_NETLINK_MONITOR_ERROR_LINK_CACHE_UPDATE, "NM_NETLINK_MONITOR_ERROR_LINK_CACHE_UPDATE", "link-cache-update" },
         { 0, NULL, NULL }
       };
       GType g_define_type_id =
-        g_enum_register_static (g_intern_static_string ("NMSessionMonitorError"), values);
+        g_enum_register_static (g_intern_static_string ("NMNetlinkMonitorError"), values);
       g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
     }
 
   return g_define_type_id__volatile;
 }
 GType
-nm_ethernet_error_get_type (void)
+nm_olpc_mesh_error_get_type (void)
 {
   static volatile gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {
       static const GEnumValue values[] = {
-        { NM_ETHERNET_ERROR_CONNECTION_NOT_WIRED, "NM_ETHERNET_ERROR_CONNECTION_NOT_WIRED", "ConnectionNotWired" },
-        { NM_ETHERNET_ERROR_CONNECTION_INVALID, "NM_ETHERNET_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
-        { NM_ETHERNET_ERROR_CONNECTION_INCOMPATIBLE, "NM_ETHERNET_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
+        { NM_OLPC_MESH_ERROR_CONNECTION_NOT_MESH, "NM_OLPC_MESH_ERROR_CONNECTION_NOT_MESH", "ConnectionNotMesh" },
+        { NM_OLPC_MESH_ERROR_CONNECTION_INVALID, "NM_OLPC_MESH_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
+        { NM_OLPC_MESH_ERROR_CONNECTION_INCOMPATIBLE, "NM_OLPC_MESH_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
         { 0, NULL, NULL }
       };
       GType g_define_type_id =
-        g_enum_register_static (g_intern_static_string ("NMEthernetError"), values);
+        g_enum_register_static (g_intern_static_string ("NMOlpcMeshError"), values);
       g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
     }
 
   return g_define_type_id__volatile;
 }
 GType
-nm_dispatcher_action_get_type (void)
+nm_adsl_error_get_type (void)
 {
   static volatile gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {
       static const GEnumValue values[] = {
-        { DISPATCHER_ACTION_HOSTNAME, "DISPATCHER_ACTION_HOSTNAME", "hostname" },
-        { DISPATCHER_ACTION_UP, "DISPATCHER_ACTION_UP", "up" },
-        { DISPATCHER_ACTION_PRE_DOWN, "DISPATCHER_ACTION_PRE_DOWN", "pre-down" },
-        { DISPATCHER_ACTION_DOWN, "DISPATCHER_ACTION_DOWN", "down" },
-        { DISPATCHER_ACTION_VPN_UP, "DISPATCHER_ACTION_VPN_UP", "vpn-up" },
-        { DISPATCHER_ACTION_VPN_PRE_DOWN, "DISPATCHER_ACTION_VPN_PRE_DOWN", "vpn-pre-down" },
-        { DISPATCHER_ACTION_VPN_DOWN, "DISPATCHER_ACTION_VPN_DOWN", "vpn-down" },
-        { DISPATCHER_ACTION_DHCP4_CHANGE, "DISPATCHER_ACTION_DHCP4_CHANGE", "dhcp4-change" },
-        { DISPATCHER_ACTION_DHCP6_CHANGE, "DISPATCHER_ACTION_DHCP6_CHANGE", "dhcp6-change" },
+        { NM_ADSL_ERROR_CONNECTION_NOT_ADSL, "NM_ADSL_ERROR_CONNECTION_NOT_ADSL", "ConnectionNotAdsl" },
+        { NM_ADSL_ERROR_CONNECTION_INVALID, "NM_ADSL_ERROR_CONNECTION_INVALID", "ConnectionInvalid" },
+        { NM_ADSL_ERROR_CONNECTION_INCOMPATIBLE, "NM_ADSL_ERROR_CONNECTION_INCOMPATIBLE", "ConnectionIncompatible" },
         { 0, NULL, NULL }
       };
       GType g_define_type_id =
-        g_enum_register_static (g_intern_static_string ("DispatcherAction"), values);
+        g_enum_register_static (g_intern_static_string ("NMAdslError"), values);
       g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
     }
 
@@ -954,6 +954,7 @@ nm_settings_error_get_type (void)
         { NM_SETTINGS_ERROR_ADD_FAILED, "NM_SETTINGS_ERROR_ADD_FAILED", "AddFailed" },
         { NM_SETTINGS_ERROR_SAVE_HOSTNAME_NOT_SUPPORTED, "NM_SETTINGS_ERROR_SAVE_HOSTNAME_NOT_SUPPORTED", "SaveHostnameNotSupported" },
         { NM_SETTINGS_ERROR_SAVE_HOSTNAME_FAILED, "NM_SETTINGS_ERROR_SAVE_HOSTNAME_FAILED", "SaveHostnameFailed" },
+        { NM_SETTINGS_ERROR_HOSTNAME_INVALID, "NM_SETTINGS_ERROR_HOSTNAME_INVALID", "HostnameInvalid" },
         { NM_SETTINGS_ERROR_UUID_EXISTS, "NM_SETTINGS_ERROR_UUID_EXISTS", "UuidExists" },
         { 0, NULL, NULL }
       };
diff --git a/src/generated/nm-enum-types.h b/src/generated/nm-enum-types.h
index 9c53b188..e0703b20 100644
--- a/src/generated/nm-enum-types.h
+++ b/src/generated/nm-enum-types.h
@@ -9,48 +9,48 @@
 #include 
 
 G_BEGIN_DECLS
+GType nm_bt_error_get_type (void) G_GNUC_CONST;
+#define NM_TYPE_BT_ERROR (nm_bt_error_get_type ())
+GType nm_infiniband_error_get_type (void) G_GNUC_CONST;
+#define NM_TYPE_INFINIBAND_ERROR (nm_infiniband_error_get_type ())
+GType nm_bond_error_get_type (void) G_GNUC_CONST;
+#define NM_TYPE_BOND_ERROR (nm_bond_error_get_type ())
+GType nm_session_monitor_error_get_type (void) G_GNUC_CONST;
+#define NM_TYPE_SESSION_MONITOR_ERROR (nm_session_monitor_error_get_type ())
+GType nm_ethernet_error_get_type (void) G_GNUC_CONST;
+#define NM_TYPE_ETHERNET_ERROR (nm_ethernet_error_get_type ())
+GType nm_config_error_get_type (void) G_GNUC_CONST;
+#define NM_TYPE_CONFIG_ERROR (nm_config_error_get_type ())
+GType nm_rf_kill_state_get_type (void) G_GNUC_CONST;
+#define NM_TYPE_RF_KILL_STATE (nm_rf_kill_state_get_type ())
+GType nm_rf_kill_type_get_type (void) G_GNUC_CONST;
+#define NM_TYPE_RF_KILL_TYPE (nm_rf_kill_type_get_type ())
+GType nm_dispatcher_action_get_type (void) G_GNUC_CONST;
+#define NM_TYPE_DISPATCHER_ACTION (nm_dispatcher_action_get_type ())
+GType nm_ip4_config_compare_flags_get_type (void) G_GNUC_CONST;
+#define NM_TYPE_IP4_CONFIG_COMPARE_FLAGS (nm_ip4_config_compare_flags_get_type ())
 GType nm_manager_error_get_type (void) G_GNUC_CONST;
 #define NM_TYPE_MANAGER_ERROR (nm_manager_error_get_type ())
+GType nm_device_error_get_type (void) G_GNUC_CONST;
+#define NM_TYPE_DEVICE_ERROR (nm_device_error_get_type ())
+GType nm_ip6_config_compare_flags_get_type (void) G_GNUC_CONST;
+#define NM_TYPE_IP6_CONFIG_COMPARE_FLAGS (nm_ip6_config_compare_flags_get_type ())
 GType nm_auth_call_result_get_type (void) G_GNUC_CONST;
 #define NM_TYPE_AUTH_CALL_RESULT (nm_auth_call_result_get_type ())
+GType nm_bridge_error_get_type (void) G_GNUC_CONST;
+#define NM_TYPE_BRIDGE_ERROR (nm_bridge_error_get_type ())
+GType nm_wifi_error_get_type (void) G_GNUC_CONST;
+#define NM_TYPE_WIFI_ERROR (nm_wifi_error_get_type ())
 GType nm_nm_nl_prop_get_type (void) G_GNUC_CONST;
 #define NM_TYPE_NM_NL_PROP (nm_nm_nl_prop_get_type ())
-GType nm_netlink_monitor_error_get_type (void) G_GNUC_CONST;
-#define NM_TYPE_NETLINK_MONITOR_ERROR (nm_netlink_monitor_error_get_type ())
 GType nm_vlan_error_get_type (void) G_GNUC_CONST;
 #define NM_TYPE_VLAN_ERROR (nm_vlan_error_get_type ())
-GType nm_ip4_config_compare_flags_get_type (void) G_GNUC_CONST;
-#define NM_TYPE_IP4_CONFIG_COMPARE_FLAGS (nm_ip4_config_compare_flags_get_type ())
-GType nm_device_error_get_type (void) G_GNUC_CONST;
-#define NM_TYPE_DEVICE_ERROR (nm_device_error_get_type ())
+GType nm_netlink_monitor_error_get_type (void) G_GNUC_CONST;
+#define NM_TYPE_NETLINK_MONITOR_ERROR (nm_netlink_monitor_error_get_type ())
 GType nm_olpc_mesh_error_get_type (void) G_GNUC_CONST;
 #define NM_TYPE_OLPC_MESH_ERROR (nm_olpc_mesh_error_get_type ())
-GType nm_bridge_error_get_type (void) G_GNUC_CONST;
-#define NM_TYPE_BRIDGE_ERROR (nm_bridge_error_get_type ())
-GType nm_ip6_config_compare_flags_get_type (void) G_GNUC_CONST;
-#define NM_TYPE_IP6_CONFIG_COMPARE_FLAGS (nm_ip6_config_compare_flags_get_type ())
-GType nm_bond_error_get_type (void) G_GNUC_CONST;
-#define NM_TYPE_BOND_ERROR (nm_bond_error_get_type ())
 GType nm_adsl_error_get_type (void) G_GNUC_CONST;
 #define NM_TYPE_ADSL_ERROR (nm_adsl_error_get_type ())
-GType nm_config_error_get_type (void) G_GNUC_CONST;
-#define NM_TYPE_CONFIG_ERROR (nm_config_error_get_type ())
-GType nm_rf_kill_state_get_type (void) G_GNUC_CONST;
-#define NM_TYPE_RF_KILL_STATE (nm_rf_kill_state_get_type ())
-GType nm_rf_kill_type_get_type (void) G_GNUC_CONST;
-#define NM_TYPE_RF_KILL_TYPE (nm_rf_kill_type_get_type ())
-GType nm_bt_error_get_type (void) G_GNUC_CONST;
-#define NM_TYPE_BT_ERROR (nm_bt_error_get_type ())
-GType nm_infiniband_error_get_type (void) G_GNUC_CONST;
-#define NM_TYPE_INFINIBAND_ERROR (nm_infiniband_error_get_type ())
-GType nm_wifi_error_get_type (void) G_GNUC_CONST;
-#define NM_TYPE_WIFI_ERROR (nm_wifi_error_get_type ())
-GType nm_session_monitor_error_get_type (void) G_GNUC_CONST;
-#define NM_TYPE_SESSION_MONITOR_ERROR (nm_session_monitor_error_get_type ())
-GType nm_ethernet_error_get_type (void) G_GNUC_CONST;
-#define NM_TYPE_ETHERNET_ERROR (nm_ethernet_error_get_type ())
-GType nm_dispatcher_action_get_type (void) G_GNUC_CONST;
-#define NM_TYPE_DISPATCHER_ACTION (nm_dispatcher_action_get_type ())
 GType nm_logging_error_get_type (void) G_GNUC_CONST;
 #define NM_TYPE_LOGGING_ERROR (nm_logging_error_get_type ())
 GType nm_dns_manager_error_get_type (void) G_GNUC_CONST;
diff --git a/src/generated/nm-marshal.c b/src/generated/nm-marshal.c
index f6ff4eca..c7180f1b 100644
--- a/src/generated/nm-marshal.c
+++ b/src/generated/nm-marshal.c
@@ -319,24 +319,28 @@ _nm_marshal_VOID__POINTER_POINTER_POINTER_POINTER_INT (GClosure     *closure,
             data2);
 }
 
-/* VOID:POINTER,STRING (nm-marshal.list:9) */
+/* VOID:POINTER,POINTER,STRING,BOOLEAN,POINTER,POINTER (nm-marshal.list:9) */
 void
-_nm_marshal_VOID__POINTER_STRING (GClosure     *closure,
-                                  GValue       *return_value G_GNUC_UNUSED,
-                                  guint         n_param_values,
-                                  const GValue *param_values,
-                                  gpointer      invocation_hint G_GNUC_UNUSED,
-                                  gpointer      marshal_data)
+_nm_marshal_VOID__POINTER_POINTER_STRING_BOOLEAN_POINTER_POINTER (GClosure     *closure,
+                                                                  GValue       *return_value G_GNUC_UNUSED,
+                                                                  guint         n_param_values,
+                                                                  const GValue *param_values,
+                                                                  gpointer      invocation_hint G_GNUC_UNUSED,
+                                                                  gpointer      marshal_data)
 {
-  typedef void (*GMarshalFunc_VOID__POINTER_STRING) (gpointer     data1,
-                                                     gpointer     arg_1,
-                                                     gpointer     arg_2,
-                                                     gpointer     data2);
-  register GMarshalFunc_VOID__POINTER_STRING callback;
+  typedef void (*GMarshalFunc_VOID__POINTER_POINTER_STRING_BOOLEAN_POINTER_POINTER) (gpointer     data1,
+                                                                                     gpointer     arg_1,
+                                                                                     gpointer     arg_2,
+                                                                                     gpointer     arg_3,
+                                                                                     gboolean     arg_4,
+                                                                                     gpointer     arg_5,
+                                                                                     gpointer     arg_6,
+                                                                                     gpointer     data2);
+  register GMarshalFunc_VOID__POINTER_POINTER_STRING_BOOLEAN_POINTER_POINTER callback;
   register GCClosure *cc = (GCClosure*) closure;
   register gpointer data1, data2;
 
-  g_return_if_fail (n_param_values == 3);
+  g_return_if_fail (n_param_values == 7);
 
   if (G_CCLOSURE_SWAP_DATA (closure))
     {
@@ -348,35 +352,36 @@ _nm_marshal_VOID__POINTER_STRING (GClosure     *closure,
       data1 = g_value_peek_pointer (param_values + 0);
       data2 = closure->data;
     }
-  callback = (GMarshalFunc_VOID__POINTER_STRING) (marshal_data ? marshal_data : cc->callback);
+  callback = (GMarshalFunc_VOID__POINTER_POINTER_STRING_BOOLEAN_POINTER_POINTER) (marshal_data ? marshal_data : cc->callback);
 
   callback (data1,
             g_marshal_value_peek_pointer (param_values + 1),
-            g_marshal_value_peek_string (param_values + 2),
+            g_marshal_value_peek_pointer (param_values + 2),
+            g_marshal_value_peek_string (param_values + 3),
+            g_marshal_value_peek_boolean (param_values + 4),
+            g_marshal_value_peek_pointer (param_values + 5),
+            g_marshal_value_peek_pointer (param_values + 6),
             data2);
 }
 
-/* VOID:POINTER,STRING,BOOLEAN,POINTER,POINTER (nm-marshal.list:10) */
+/* VOID:POINTER,STRING (nm-marshal.list:10) */
 void
-_nm_marshal_VOID__POINTER_STRING_BOOLEAN_POINTER_POINTER (GClosure     *closure,
-                                                          GValue       *return_value G_GNUC_UNUSED,
-                                                          guint         n_param_values,
-                                                          const GValue *param_values,
-                                                          gpointer      invocation_hint G_GNUC_UNUSED,
-                                                          gpointer      marshal_data)
+_nm_marshal_VOID__POINTER_STRING (GClosure     *closure,
+                                  GValue       *return_value G_GNUC_UNUSED,
+                                  guint         n_param_values,
+                                  const GValue *param_values,
+                                  gpointer      invocation_hint G_GNUC_UNUSED,
+                                  gpointer      marshal_data)
 {
-  typedef void (*GMarshalFunc_VOID__POINTER_STRING_BOOLEAN_POINTER_POINTER) (gpointer     data1,
-                                                                             gpointer     arg_1,
-                                                                             gpointer     arg_2,
-                                                                             gboolean     arg_3,
-                                                                             gpointer     arg_4,
-                                                                             gpointer     arg_5,
-                                                                             gpointer     data2);
-  register GMarshalFunc_VOID__POINTER_STRING_BOOLEAN_POINTER_POINTER callback;
+  typedef void (*GMarshalFunc_VOID__POINTER_STRING) (gpointer     data1,
+                                                     gpointer     arg_1,
+                                                     gpointer     arg_2,
+                                                     gpointer     data2);
+  register GMarshalFunc_VOID__POINTER_STRING callback;
   register GCClosure *cc = (GCClosure*) closure;
   register gpointer data1, data2;
 
-  g_return_if_fail (n_param_values == 6);
+  g_return_if_fail (n_param_values == 3);
 
   if (G_CCLOSURE_SWAP_DATA (closure))
     {
@@ -388,14 +393,11 @@ _nm_marshal_VOID__POINTER_STRING_BOOLEAN_POINTER_POINTER (GClosure     *closure,
       data1 = g_value_peek_pointer (param_values + 0);
       data2 = closure->data;
     }
-  callback = (GMarshalFunc_VOID__POINTER_STRING_BOOLEAN_POINTER_POINTER) (marshal_data ? marshal_data : cc->callback);
+  callback = (GMarshalFunc_VOID__POINTER_STRING) (marshal_data ? marshal_data : cc->callback);
 
   callback (data1,
             g_marshal_value_peek_pointer (param_values + 1),
             g_marshal_value_peek_string (param_values + 2),
-            g_marshal_value_peek_boolean (param_values + 3),
-            g_marshal_value_peek_pointer (param_values + 4),
-            g_marshal_value_peek_pointer (param_values + 5),
             data2);
 }
 
diff --git a/src/generated/nm-marshal.h b/src/generated/nm-marshal.h
index e93cee13..a940d9f1 100644
--- a/src/generated/nm-marshal.h
+++ b/src/generated/nm-marshal.h
@@ -65,7 +65,15 @@ extern void _nm_marshal_VOID__POINTER_POINTER_POINTER_POINTER_INT (GClosure
                                                                    gpointer      invocation_hint,
                                                                    gpointer      marshal_data);
 
-/* VOID:POINTER,STRING (nm-marshal.list:9) */
+/* VOID:POINTER,POINTER,STRING,BOOLEAN,POINTER,POINTER (nm-marshal.list:9) */
+extern void _nm_marshal_VOID__POINTER_POINTER_STRING_BOOLEAN_POINTER_POINTER (GClosure     *closure,
+                                                                              GValue       *return_value,
+                                                                              guint         n_param_values,
+                                                                              const GValue *param_values,
+                                                                              gpointer      invocation_hint,
+                                                                              gpointer      marshal_data);
+
+/* VOID:POINTER,STRING (nm-marshal.list:10) */
 extern void _nm_marshal_VOID__POINTER_STRING (GClosure     *closure,
                                               GValue       *return_value,
                                               guint         n_param_values,
@@ -73,14 +81,6 @@ extern void _nm_marshal_VOID__POINTER_STRING (GClosure     *closure,
                                               gpointer      invocation_hint,
                                               gpointer      marshal_data);
 
-/* VOID:POINTER,STRING,BOOLEAN,POINTER,POINTER (nm-marshal.list:10) */
-extern void _nm_marshal_VOID__POINTER_STRING_BOOLEAN_POINTER_POINTER (GClosure     *closure,
-                                                                      GValue       *return_value,
-                                                                      guint         n_param_values,
-                                                                      const GValue *param_values,
-                                                                      gpointer      invocation_hint,
-                                                                      gpointer      marshal_data);
-
 /* VOID:STRING,BOXED (nm-marshal.list:11) */
 extern void _nm_marshal_VOID__STRING_BOXED (GClosure     *closure,
                                             GValue       *return_value,
diff --git a/src/ip6-manager/Makefile.am b/src/ip6-manager/Makefile.am
index eb730394..25f57497 100644
--- a/src/ip6-manager/Makefile.am
+++ b/src/ip6-manager/Makefile.am
@@ -1,4 +1,6 @@
-INCLUDES = \
+noinst_LTLIBRARIES = libip6-manager.la
+
+libip6_manager_la_CPPFLAGS = \
 	-I${top_srcdir} \
 	-I${top_builddir}/include \
 	-I${top_srcdir}/include \
@@ -7,19 +9,15 @@ INCLUDES = \
 	-I${top_builddir}/src/generated \
 	-I${top_srcdir}/src/generated \
 	-I${top_srcdir}/src/logging \
-	-I${top_srcdir}/src
-
-noinst_LTLIBRARIES = libip6-manager.la
+	-I${top_srcdir}/src \
+	$(LIBNL_CFLAGS) \
+	$(DBUS_CFLAGS) \
+	$(GLIB_CFLAGS)
 
 libip6_manager_la_SOURCES = \
 	nm-ip6-manager.c \
 	nm-ip6-manager.h
 
-libip6_manager_la_CPPFLAGS = \
-	$(LIBNL_CFLAGS) \
-	$(DBUS_CFLAGS) \
-	$(GLIB_CFLAGS)
-
 libip6_manager_la_LIBADD = \
 	$(top_builddir)/src/generated/libnm-generated.la \
 	$(top_builddir)/src/logging/libnm-logging.la \
diff --git a/src/ip6-manager/Makefile.in b/src/ip6-manager/Makefile.in
index 26537810..61a75826 100644
--- a/src/ip6-manager/Makefile.in
+++ b/src/ip6-manager/Makefile.in
@@ -206,6 +206,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -228,6 +229,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -412,7 +414,8 @@ with_dhclient = @with_dhclient@
 with_dhcpcd = @with_dhcpcd@
 with_netconfig = @with_netconfig@
 with_resolvconf = @with_resolvconf@
-INCLUDES = \
+noinst_LTLIBRARIES = libip6-manager.la
+libip6_manager_la_CPPFLAGS = \
 	-I${top_srcdir} \
 	-I${top_builddir}/include \
 	-I${top_srcdir}/include \
@@ -421,18 +424,15 @@ INCLUDES = \
 	-I${top_builddir}/src/generated \
 	-I${top_srcdir}/src/generated \
 	-I${top_srcdir}/src/logging \
-	-I${top_srcdir}/src
+	-I${top_srcdir}/src \
+	$(LIBNL_CFLAGS) \
+	$(DBUS_CFLAGS) \
+	$(GLIB_CFLAGS)
 
-noinst_LTLIBRARIES = libip6-manager.la
 libip6_manager_la_SOURCES = \
 	nm-ip6-manager.c \
 	nm-ip6-manager.h
 
-libip6_manager_la_CPPFLAGS = \
-	$(LIBNL_CFLAGS) \
-	$(DBUS_CFLAGS) \
-	$(GLIB_CFLAGS)
-
 libip6_manager_la_LIBADD = \
 	$(top_builddir)/src/generated/libnm-generated.la \
 	$(top_builddir)/src/logging/libnm-logging.la \
diff --git a/src/logging/Makefile.in b/src/logging/Makefile.in
index 3d2db232..c5192bf0 100644
--- a/src/logging/Makefile.in
+++ b/src/logging/Makefile.in
@@ -202,6 +202,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -224,6 +225,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
diff --git a/src/main.c b/src/main.c
index ffa994c1..eb829a7b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -388,11 +388,13 @@ main (int argc, char *argv[])
 	g_option_context_set_summary (opt_ctx,
 		_("NetworkManager monitors all network connections and automatically\nchooses the best connection to use.  It also allows the user to\nspecify wireless access points which wireless cards in the computer\nshould associate with."));
 
-	success = g_option_context_parse (opt_ctx, &argc, &argv, NULL);
+	success = g_option_context_parse (opt_ctx, &argc, &argv, &error);
 	g_option_context_free (opt_ctx);
 
 	if (!success) {
-		fprintf (stderr, _("Invalid option.  Please use --help to see a list of valid options.\n"));
+		fprintf (stderr, _("%s.  Please use --help to see a list of valid options.\n"),
+		         error->message);
+		g_clear_error (&error);
 		exit (1);
 	}
 
diff --git a/src/modem-manager/Makefile.am b/src/modem-manager/Makefile.am
index aa5534fc..012d26ea 100644
--- a/src/modem-manager/Makefile.am
+++ b/src/modem-manager/Makefile.am
@@ -1,6 +1,8 @@
 include $(GLIB_MAKEFILE)
 
-INCLUDES = \
+noinst_LTLIBRARIES = libmodem-manager.la
+
+libmodem_manager_la_CPPFLAGS = \
 	-I${top_srcdir}/src \
 	-I${top_builddir}/src/generated \
 	-I${top_srcdir}/src/generated \
@@ -8,9 +10,9 @@ INCLUDES = \
 	-I${top_builddir}/include \
 	-I${top_srcdir}/include \
 	-I${top_builddir}/libnm-util \
-	-I${top_srcdir}/libnm-util
-
-noinst_LTLIBRARIES = libmodem-manager.la
+	-I${top_srcdir}/libnm-util \
+	$(LIBNL_CFLAGS) \
+	$(DBUS_CFLAGS)
 
 libmodem_manager_la_SOURCES = \
 	nm-modem.c \
@@ -25,10 +27,6 @@ libmodem_manager_la_SOURCES = \
 	nm-modem-manager.c \
 	nm-modem-types.h
 
-libmodem_manager_la_CPPFLAGS = \
-	$(LIBNL_CFLAGS) \
-	$(DBUS_CFLAGS)
-
 libmodem_manager_la_LIBADD = \
 	$(top_builddir)/src/generated/libnm-generated.la \
 	$(top_builddir)/src/logging/libnm-logging.la \
diff --git a/src/modem-manager/Makefile.in b/src/modem-manager/Makefile.in
index ea79607f..d945f9c9 100644
--- a/src/modem-manager/Makefile.in
+++ b/src/modem-manager/Makefile.in
@@ -225,6 +225,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -247,6 +248,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -431,23 +433,17 @@ with_dhclient = @with_dhclient@
 with_dhcpcd = @with_dhcpcd@
 with_netconfig = @with_netconfig@
 with_resolvconf = @with_resolvconf@
-INCLUDES = \
-	-I${top_srcdir}/src \
-	-I${top_builddir}/src/generated \
-	-I${top_srcdir}/src/generated \
-	-I${top_srcdir}/src/logging \
-	-I${top_builddir}/include \
-	-I${top_srcdir}/include \
-	-I${top_builddir}/libnm-util \
-	-I${top_srcdir}/libnm-util
-
 noinst_LTLIBRARIES = libmodem-manager.la
+libmodem_manager_la_CPPFLAGS = -I${top_srcdir}/src \
+	-I${top_builddir}/src/generated -I${top_srcdir}/src/generated \
+	-I${top_srcdir}/src/logging -I${top_builddir}/include \
+	-I${top_srcdir}/include -I${top_builddir}/libnm-util \
+	-I${top_srcdir}/libnm-util $(LIBNL_CFLAGS) $(DBUS_CFLAGS) \
+	$(am__append_2)
 libmodem_manager_la_SOURCES = nm-modem.c nm-modem.h nm-modem-generic.c \
 	nm-modem-generic.h nm-modem-cdma.c nm-modem-cdma.h \
 	nm-modem-gsm.c nm-modem-gsm.h nm-modem-manager.h \
 	nm-modem-manager.c nm-modem-types.h $(am__append_1)
-libmodem_manager_la_CPPFLAGS = $(LIBNL_CFLAGS) $(DBUS_CFLAGS) \
-	$(am__append_2)
 libmodem_manager_la_LIBADD =  \
 	$(top_builddir)/src/generated/libnm-generated.la \
 	$(top_builddir)/src/logging/libnm-logging.la $(LIBNL_LIBS) \
diff --git a/src/modem-manager/nm-modem-manager.c b/src/modem-manager/nm-modem-manager.c
index dd01646e..7b566ca4 100644
--- a/src/modem-manager/nm-modem-manager.c
+++ b/src/modem-manager/nm-modem-manager.c
@@ -51,7 +51,7 @@ struct _NMModemManagerPrivate {
 	/* ModemManager >= 0.7 */
 	GDBusConnection *dbus_connection;
 	MMManager *modem_manager_1;
-	guint modem_manager_1_poke_id;
+	guint modem_manager_1_launch_id;
 	gboolean old_modem_manager_found;
 	gboolean new_modem_manager_found;
 	guint modem_manager_1_name_owner_changed_id;
@@ -442,9 +442,9 @@ modem_manager_1_clear_signals (NMModemManager *self)
 static void
 clear_modem_manager_1_support (NMModemManager *self)
 {
-	if (self->priv->modem_manager_1_poke_id) {
-		g_source_remove (self->priv->modem_manager_1_poke_id);
-		self->priv->modem_manager_1_poke_id = 0;
+	if (self->priv->modem_manager_1_launch_id) {
+		g_source_remove (self->priv->modem_manager_1_launch_id);
+		self->priv->modem_manager_1_launch_id = 0;
 	}
 
 	modem_manager_1_clear_signals (self);
@@ -545,15 +545,20 @@ modem_manager_1_name_owner_changed (MMManager *modem_manager_1,
 	gchar *name_owner;
 
 	/* Quit poking, if any */
-	if (self->priv->modem_manager_1_poke_id) {
-		g_source_remove (self->priv->modem_manager_1_poke_id);
-		self->priv->modem_manager_1_poke_id = 0;
+	if (self->priv->modem_manager_1_launch_id) {
+		g_source_remove (self->priv->modem_manager_1_launch_id);
+		self->priv->modem_manager_1_launch_id = 0;
 	}
 
 	name_owner = g_dbus_object_manager_client_get_name_owner (G_DBUS_OBJECT_MANAGER_CLIENT (modem_manager_1));
 	if (!name_owner) {
 		nm_log_info (LOGD_MB, "ModemManager disappeared from bus");
+
+#if !HAVE_SYSTEMD
+		/* If not managed by systemd, schedule relaunch */
 		schedule_modem_manager_1_relaunch (self, 0);
+#endif
+
 		return;
 	}
 
@@ -573,6 +578,8 @@ modem_manager_1_name_owner_changed (MMManager *modem_manager_1,
 	 */
 }
 
+#if !HAVE_SYSTEMD
+
 static void
 modem_manager_1_poke_cb (GDBusConnection *connection,
                          GAsyncResult *res,
@@ -606,18 +613,7 @@ modem_manager_1_poke_cb (GDBusConnection *connection,
 static void
 modem_manager_1_poke (NMModemManager *self)
 {
-	gchar *name_owner;
-
 	/* If there is no current owner right away, ensure we poke to get one */
-	name_owner = g_dbus_object_manager_client_get_name_owner (G_DBUS_OBJECT_MANAGER_CLIENT (self->priv->modem_manager_1));
-	if (name_owner) {
-		/* Available! */
-		modem_manager_1_available (self);
-		g_free (name_owner);
-		return;
-	}
-
-	/* Poke! */
 	g_dbus_connection_call (self->priv->dbus_connection,
 	                        "org.freedesktop.ModemManager1",
 	                        "/org/freedesktop/ModemManager1",
@@ -632,6 +628,27 @@ modem_manager_1_poke (NMModemManager *self)
 	                        g_object_ref (self)); /* user_data */
 }
 
+#endif /* HAVE_SYSTEMD */
+
+static void
+modem_manager_1_check_name_owner (NMModemManager *self)
+{
+	gchar *name_owner;
+
+	name_owner = g_dbus_object_manager_client_get_name_owner (G_DBUS_OBJECT_MANAGER_CLIENT (self->priv->modem_manager_1));
+	if (name_owner) {
+		/* Available! */
+		modem_manager_1_available (self);
+		g_free (name_owner);
+		return;
+	}
+
+#if !HAVE_SYSTEMD
+	/* If the lifecycle is not managed by systemd, poke */
+	modem_manager_1_poke (self);
+#endif
+}
+
 static void
 manager_new_ready (GObject *source,
                    GAsyncResult *res,
@@ -671,8 +688,8 @@ manager_new_ready (GObject *source,
 			                  "object-removed",
 			                  G_CALLBACK (modem_object_removed),
 			                  self);
-		/* Poke the MMManager! */
-		modem_manager_1_poke (self);
+
+		modem_manager_1_check_name_owner (self);
 	}
 
 	/* Balance refcount */
@@ -696,8 +713,8 @@ ensure_client (NMModemManager *self)
 		return;
 	}
 
-	/* If already available, poke! */
-	modem_manager_1_poke (self);
+	/* If already available, recheck name owner! */
+	modem_manager_1_check_name_owner (self);
 }
 
 static void
@@ -719,7 +736,7 @@ bus_get_ready (GObject *source,
 		/* If we found the old MM, abort */
 		clear_modem_manager_1_support (self);
 	} else {
-		/* Got the bus, create new ModemManager client. */
+		/* Got the bus, ensure client */
 		ensure_client (self);
 	}
 
@@ -730,8 +747,8 @@ bus_get_ready (GObject *source,
 static gboolean
 ensure_bus (NMModemManager *self)
 {
-	/* Clear poke ID */
-	self->priv->modem_manager_1_poke_id = 0;
+	/* Clear launch ID */
+	self->priv->modem_manager_1_launch_id = 0;
 
 	if (!self->priv->dbus_connection)
 		g_bus_get (G_BUS_TYPE_SYSTEM,
@@ -753,9 +770,9 @@ schedule_modem_manager_1_relaunch (NMModemManager *self,
 	 * cancelled if the object gets disposed. */
 
 	if (n_seconds)
-		self->priv->modem_manager_1_poke_id = g_timeout_add_seconds (n_seconds, (GSourceFunc)ensure_bus, self);
+		self->priv->modem_manager_1_launch_id = g_timeout_add_seconds (n_seconds, (GSourceFunc)ensure_bus, self);
 	else
-		self->priv->modem_manager_1_poke_id = g_idle_add ((GSourceFunc)ensure_bus, self);
+		self->priv->modem_manager_1_launch_id = g_idle_add ((GSourceFunc)ensure_bus, self);
 }
 
 #endif /* WITH_MODEM_MANAGER_1 */
diff --git a/src/nm-device-wifi.c b/src/nm-device-wifi.c
index 3ac34e7f..8ca52780 100644
--- a/src/nm-device-wifi.c
+++ b/src/nm-device-wifi.c
@@ -2422,7 +2422,7 @@ supplicant_iface_state_cb (NMSupplicantInterface *iface,
 		 */
 		if (devstate == NM_DEVICE_STATE_CONFIG) {
 			NMAccessPoint *ap = nm_device_wifi_get_activation_ap (self);
-			const GByteArray *ssid = nm_ap_get_ssid (ap);
+			const GByteArray *ssid = ap ? nm_ap_get_ssid (ap) : NULL;
 
 			nm_log_info (LOGD_DEVICE | LOGD_WIFI,
 			             "Activation (%s/wireless) Stage 2 of 5 (Device Configure) "
@@ -2707,9 +2707,8 @@ supplicant_connection_timeout_cb (gpointer user_data)
 
 	g_assert (priv->mode == NM_802_11_MODE_INFRA);
 	ap = nm_device_wifi_get_activation_ap (self);
-	g_assert (ap);
 
-	if (priv->ssid_found && is_encrypted (ap, connection)) {
+	if (priv->ssid_found && ap && is_encrypted (ap, connection)) {
 		guint64 timestamp = 0;
 		gboolean new_secrets = TRUE;
 
@@ -3086,7 +3085,11 @@ act_stage2_config (NMDevice *dev, NMDeviceStateReason *reason)
 	g_assert (req);
 
 	ap = nm_device_wifi_get_activation_ap (self);
-	g_assert (ap);
+	if (!ap) {
+		nm_log_warn (LOGD_DEVICE | LOGD_WIFI, "act_stage2_config failed due to unexpected missing activation_ap. Abort");
+		*reason = NM_DEVICE_STATE_REASON_SUPPLICANT_DISCONNECT;
+		goto out;
+	}
 
 	connection = nm_act_request_get_connection (req);
 	g_assert (connection);
@@ -3240,6 +3243,8 @@ handle_ip_config_timeout (NMDeviceWifi *self,
 		return ret;
 	}
 
+	ap = nm_device_wifi_get_activation_ap (self);
+
 	/* If IP configuration times out and it's a static WEP connection, that
 	 * usually means the WEP key is wrong.  WEP's Open System auth mode has
 	 * no provision for figuring out if the WEP key is wrong, so you just have
@@ -3247,7 +3252,6 @@ handle_ip_config_timeout (NMDeviceWifi *self,
 	 * types (open, WPA, 802.1x, etc) if the secrets/certs were wrong the
 	 * connection would have failed before IP configuration.
 	 */
-	ap = nm_device_wifi_get_activation_ap (self);
 	if (ap && is_static_wep (ap, connection) && (may_fail == FALSE)) {
 		/* Activation failed, we must have bad encryption key */
 		nm_log_warn (LOGD_DEVICE | LOGD_WIFI,
@@ -3342,7 +3346,7 @@ activation_success_handler (NMDevice *dev)
 	/* If the AP isn't fake, it was found in the scan list and all its
 	 * details are known.
 	 */
-	if (!nm_ap_get_fake (ap))
+	if (!ap || !nm_ap_get_fake (ap))
 		goto done;
 
 	/* If the activate AP was fake, it probably won't have a BSSID at all.
diff --git a/src/nm-device.c b/src/nm-device.c
index 4de1bd9e..a07ef338 100644
--- a/src/nm-device.c
+++ b/src/nm-device.c
@@ -1952,21 +1952,23 @@ dhcp4_state_changed (NMDHCPClient *client,
 	case DHC_REBOOT:     /* have valid lease, but now obtained a different one */
 	case DHC_REBIND4:    /* new, different lease */
 		config = nm_dhcp_client_get_ip4_config (priv->dhcp4_client, FALSE);
-		if (priv->ip4_state == IP_CONF)
-			nm_device_activate_schedule_ip4_config_result (device, config);
-		else if (priv->ip4_state == IP_DONE)
-			dhcp4_lease_change (device, config);
 
+		/* Update the DHCP4 config object with new DHCP options */
+		nm_dhcp4_config_reset (priv->dhcp4_config);
 		if (config) {
-			/* Update the DHCP4 config object with new DHCP options */
-			nm_dhcp4_config_reset (priv->dhcp4_config);
 			nm_dhcp_client_foreach_option (priv->dhcp4_client,
 			                               dhcp4_add_option_cb,
 			                               priv->dhcp4_config);
-			g_object_notify (G_OBJECT (device), NM_DEVICE_DHCP4_CONFIG);
+		}
+		g_object_notify (G_OBJECT (device), NM_DEVICE_DHCP4_CONFIG);
 
+		if (priv->ip4_state == IP_CONF)
+			nm_device_activate_schedule_ip4_config_result (device, config);
+		else if (priv->ip4_state == IP_DONE)
+			dhcp4_lease_change (device, config);
+
+		if (config)
 			g_object_unref (config);
-		}
 		break;
 	case DHC_TIMEOUT: /* timed out contacting DHCP server */
 		dhcp4_fail (device, TRUE);
@@ -2395,19 +2397,20 @@ dhcp6_state_changed (NMDHCPClient *client,
 		if (priv->dhcp6_ip6_config)
 			g_object_unref (priv->dhcp6_ip6_config);
 		priv->dhcp6_ip6_config = nm_dhcp_client_get_ip6_config (priv->dhcp6_client, FALSE);
-		if (priv->ip6_state == IP_CONF)
-			nm_device_activate_schedule_ip6_config_result (device, priv->dhcp6_ip6_config);
-		else if (priv->ip6_state == IP_DONE)
-			dhcp6_lease_change (device);
 
+		/* Update the DHCP6 config object with new DHCP options */
+		nm_dhcp6_config_reset (priv->dhcp6_config);
 		if (priv->dhcp6_ip6_config) {
-			/* Update the DHCP6 config object with new DHCP options */
-			nm_dhcp6_config_reset (priv->dhcp6_config);
 			nm_dhcp_client_foreach_option (priv->dhcp6_client,
 			                               dhcp6_add_option_cb,
 			                               priv->dhcp6_config);
-			g_object_notify (G_OBJECT (device), NM_DEVICE_DHCP6_CONFIG);
 		}
+		g_object_notify (G_OBJECT (device), NM_DEVICE_DHCP6_CONFIG);
+
+		if (priv->ip6_state == IP_CONF)
+			nm_device_activate_schedule_ip6_config_result (device, priv->dhcp6_ip6_config);
+		else if (priv->ip6_state == IP_DONE)
+			dhcp6_lease_change (device);
 		break;
 	case DHC_TIMEOUT: /* timed out contacting DHCP server */
 		dhcp6_fail (device, TRUE);
@@ -3608,8 +3611,8 @@ clear_act_request (NMDevice *self)
 
 	nm_active_connection_set_default (NM_ACTIVE_CONNECTION (priv->act_request), FALSE);
 
-	g_object_unref (priv->act_request);
-	priv->act_request = NULL;
+	g_clear_object (&priv->act_request);
+	g_object_notify (G_OBJECT (self), NM_DEVICE_ACTIVE_CONNECTION);
 }
 
 static void
@@ -3858,6 +3861,7 @@ disconnect_cb (NMDevice *device,
 static void
 impl_device_disconnect (NMDevice *device, DBusGMethodInvocation *context)
 {
+	NMConnection *connection;
 	GError *error = NULL;
 
 	if (NM_DEVICE_GET_PRIVATE (device)->act_request == NULL) {
@@ -3869,9 +3873,13 @@ impl_device_disconnect (NMDevice *device, DBusGMethodInvocation *context)
 		return;
 	}
 
+	connection = nm_device_get_connection (device);
+	g_assert (connection);
+
 	/* Ask the manager to authenticate this request for us */
 	g_signal_emit (device, signals[AUTH_REQUEST], 0,
 	               context,
+	               connection,
 	               NM_AUTH_PERMISSION_NETWORK_CONTROL,
 	               TRUE,
 	               disconnect_cb,
@@ -4836,9 +4844,9 @@ nm_device_class_init (NMDeviceClass *klass)
 		              G_OBJECT_CLASS_TYPE (object_class),
 		              G_SIGNAL_RUN_FIRST,
 		              0, NULL, NULL,
-		              /* dbus-glib context, permission, allow_interaction, callback, user_data */
-		              _nm_marshal_VOID__POINTER_STRING_BOOLEAN_POINTER_POINTER,
-		              G_TYPE_NONE, 5, G_TYPE_POINTER, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_POINTER, G_TYPE_POINTER);
+		              /* dbus-glib context, connection, permission, allow_interaction, callback, user_data */
+		              _nm_marshal_VOID__POINTER_POINTER_STRING_BOOLEAN_POINTER_POINTER,
+		              G_TYPE_NONE, 6, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_POINTER, G_TYPE_POINTER);
 
 	signals[IP4_CONFIG_CHANGED] =
 		g_signal_new (NM_DEVICE_IP4_CONFIG_CHANGED,
diff --git a/src/nm-manager.c b/src/nm-manager.c
index 9c82d145..9037e649 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -222,6 +222,7 @@ typedef struct {
 	guint          dbus_connection_changed_id;
 	NMUdevManager *udev_mgr;
 	NMBluezManager *bluez_mgr;
+	NMSessionMonitor *session_monitor;
 
 	/* List of NMDeviceFactoryFunc pointers sorted in priority order */
 	GSList *factories;
@@ -583,6 +584,7 @@ checked_connectivity (GObject *object, GAsyncResult *result, gpointer user_data)
 		else if (   connectivity == NM_CONNECTIVITY_PORTAL
 		         || connectivity == NM_CONNECTIVITY_LIMITED)
 			set_state (manager, NM_STATE_CONNECTED_SITE);
+		g_object_notify (G_OBJECT (manager), NM_MANAGER_CONNECTIVITY);
 	}
 
 	g_object_unref (manager);
@@ -940,16 +942,18 @@ static void
 pending_activation_check_authorized (PendingActivation *pending,
                                      NMDBusManager *dbus_mgr)
 {
+	NMManagerPrivate *priv;
 	char *error_desc = NULL;
 	gulong sender_uid = G_MAXULONG;
 	GError *error;
 	const char *wifi_permission = NULL;
 	NMConnection *connection;
-	NMSettings *settings;
 
 	g_return_if_fail (pending != NULL);
 	g_return_if_fail (dbus_mgr != NULL);
 
+	priv = NM_MANAGER_GET_PRIVATE (pending->manager);
+
 	if (!nm_auth_get_caller_uid (pending->context, 
 	                             dbus_mgr,
 	                             &sender_uid,
@@ -973,10 +977,8 @@ pending_activation_check_authorized (PendingActivation *pending,
 	 * or an existing connection (for Activate).
 	 */
 	connection = pending->connection;
-	if (!connection) {
-		settings = NM_MANAGER_GET_PRIVATE (pending->manager)->settings;
-		connection = (NMConnection *) nm_settings_get_connection_by_path (settings, pending->connection_path);
-	}
+	if (!connection)
+		connection = (NMConnection *) nm_settings_get_connection_by_path (priv->settings, pending->connection_path);
 
 	if (!connection) {
 		error = g_error_new_literal (NM_MANAGER_ERROR,
@@ -987,6 +989,20 @@ pending_activation_check_authorized (PendingActivation *pending,
 		return;
 	}
 
+	/* Ensure the subject has permissions for this connection */
+	if (!nm_auth_uid_in_acl (connection,
+	                         priv->session_monitor,
+	                         sender_uid,
+	                         &error_desc)) {
+		error = g_error_new_literal (NM_MANAGER_ERROR,
+		                             NM_MANAGER_ERROR_PERMISSION_DENIED,
+		                             error_desc);
+		pending->callback (pending, error);
+		g_error_free (error);
+		g_free (error_desc);
+		return;
+	}
+
 	/* First check if the user is allowed to use networking at all, giving
 	 * the user a chance to authenticate to gain the permission.
 	 */
@@ -1304,8 +1320,8 @@ system_create_virtual_device (NMManager *self, NMConnection *connection)
 
 	iface = get_virtual_iface_name (self, connection, &parent);
 	if (!iface) {
-		nm_log_warn (LOGD_DEVICE, "(%s) failed to determine virtual interface name",
-		             nm_connection_get_id (connection));
+		nm_log_dbg (LOGD_DEVICE, "(%s) failed to determine virtual interface name",
+		            nm_connection_get_id (connection));
 		return NULL;
 	}
 
@@ -1833,6 +1849,7 @@ device_auth_done_cb (NMAuthChain *chain,
 static void
 device_auth_request_cb (NMDevice *device,
                         DBusGMethodInvocation *context,
+                        NMConnection *connection,
                         const char *permission,
                         gboolean allow_interaction,
                         NMDeviceAuthRequestFunc callback,
@@ -1856,6 +1873,20 @@ device_auth_request_cb (NMDevice *device,
 		return;
 	}
 
+	/* Ensure the subject has permissions for this connection */
+	if (!nm_auth_uid_in_acl (connection,
+	                         priv->session_monitor,
+	                         sender_uid,
+	                         &error_desc)) {
+		error = g_error_new_literal (NM_MANAGER_ERROR,
+		                             NM_MANAGER_ERROR_PERMISSION_DENIED,
+		                             error_desc);
+		callback (device, context, error, user_data);
+		g_error_free (error);
+		g_free (error_desc);
+		return;
+	}
+
 	/* Yay for root */
 	if (0 == sender_uid)
 		callback (device, context, NULL, user_data);
@@ -2007,9 +2038,7 @@ add_device (NMManager *self, NMDevice *device)
 		            nm_device_get_iface (device));
 
 		ac = internal_activate_device (self, device, existing, NULL, FALSE, 0, NULL, TRUE, NULL, &error);
-		if (ac)
-			active_connection_add (self, ac);
-		else {
+		if (!ac) {
 			nm_log_warn (LOGD_DEVICE, "assumed connection %s failed to activate: (%d) %s",
 			             nm_connection_get_path (existing),
 			             error ? error->code : -1,
@@ -2518,6 +2547,7 @@ internal_activate_device (NMManager *manager,
 	                          device,
 	                          master_device);
 	g_assert (req);
+	active_connection_add (manager, NM_ACTIVE_CONNECTION (req));
 	nm_device_activate (device, req);
 
 	return NM_ACTIVE_CONNECTION (req);
@@ -2795,7 +2825,7 @@ activate_vpn_connection (NMManager *self,
                          GError **error)
 {
 	NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
-	NMActiveConnection *parent = NULL;
+	NMActiveConnection *parent = NULL, *ac;
 	NMDevice *device = NULL;
 	GSList *iter;
 
@@ -2831,13 +2861,16 @@ activate_vpn_connection (NMManager *self,
 		return NULL;
 	}
 
-	return nm_vpn_manager_activate_connection (priv->vpn_manager,
-	                                           connection,
-	                                           device,
-	                                           nm_active_connection_get_path (parent),
-	                                           TRUE,
-	                                           sender_uid,
-	                                           error);
+	ac = nm_vpn_manager_activate_connection (priv->vpn_manager,
+	                                         connection,
+	                                         device,
+	                                         nm_active_connection_get_path (parent),
+	                                         TRUE,
+	                                         sender_uid,
+	                                         error);
+	if (ac)
+		active_connection_add (self, ac);
+	return ac;
 }
 
 NMActiveConnection *
@@ -2856,8 +2889,10 @@ nm_manager_activate_connection (NMManager *manager,
 	char *iface;
 	NMDevice *master_device = NULL;
 	NMConnection *master_connection = NULL;
-	NMActiveConnection *master_ac = NULL, *ac = NULL;
+	NMConnection *existing_connection = NULL;
+	NMActiveConnection *master_ac = NULL;
 	gboolean matched;
+	char *error_desc = NULL;
 
 	g_return_val_if_fail (manager != NULL, NULL);
 	g_return_val_if_fail (connection != NULL, NULL);
@@ -2879,13 +2914,24 @@ nm_manager_activate_connection (NMManager *manager,
 			dbus_error_free (&dbus_error);
 			return NULL;
 		}
+
+		/* Ensure the subject has permissions for this connection */
+		if (!nm_auth_uid_in_acl (connection,
+		                         priv->session_monitor,
+		                         sender_uid,
+		                         &error_desc)) {
+			g_set_error_literal (error,
+			                     NM_MANAGER_ERROR,
+			                     NM_MANAGER_ERROR_PERMISSION_DENIED,
+			                     error_desc);
+			g_free (error_desc);
+			return NULL;
+		}
 	}
 
 	/* VPN ? */
-	if (nm_connection_is_type (connection, NM_SETTING_VPN_SETTING_NAME)) {
-		ac = activate_vpn_connection (manager, connection, specific_object, sender_uid, error);
-		goto activated;
-	}
+	if (nm_connection_is_type (connection, NM_SETTING_VPN_SETTING_NAME))
+		return activate_vpn_connection (manager, connection, specific_object, sender_uid, error);
 
 	/* Device-based connection */
 	if (device_path) {
@@ -2975,6 +3021,28 @@ nm_manager_activate_connection (NMManager *manager,
 		return NULL;
 	}
 
+	if (dbus_sender) {
+		/* If the device is active and its connection is not visible to the
+		 * user that's requesting this new activation, fail, since other users
+		 * should not be allowed to implicitly deactivate private connections
+		 * by activating a connection of their own.
+		 */
+		existing_connection = nm_device_get_connection (device);
+		if (existing_connection &&
+		    !nm_auth_uid_in_acl (existing_connection,
+		                         priv->session_monitor,
+		                         sender_uid,
+		                         &error_desc)) {
+			g_set_error (error,
+			             NM_MANAGER_ERROR,
+			             NM_MANAGER_ERROR_PERMISSION_DENIED,
+			             "Private connection already active on the device: %s",
+			             error_desc);
+			g_free (error_desc);
+			return FALSE;
+		}
+	}
+
 	/* Try to find the master connection/device if the connection has a dependency */
 	if (!find_master (manager, connection, device, &master_connection, &master_device)) {
 		g_set_error_literal (error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_UNKNOWN_DEVICE,
@@ -3022,22 +3090,16 @@ nm_manager_activate_connection (NMManager *manager,
 		            nm_active_connection_get_path (master_ac));
 	}
 
-	ac = internal_activate_device (manager,
-	                               device,
-	                               connection,
-	                               specific_object,
-	                               dbus_sender ? TRUE : FALSE,
-	                               dbus_sender ? sender_uid : 0,
-	                               dbus_sender,
-	                               FALSE,
-	                               master_ac,
-	                               error);
-
-activated:
-	if (ac)
-		active_connection_add (manager, ac);
-
-	return ac;
+	return internal_activate_device (manager,
+	                                 device,
+	                                 connection,
+	                                 specific_object,
+	                                 dbus_sender ? TRUE : FALSE,
+	                                 dbus_sender ? sender_uid : 0,
+	                                 dbus_sender,
+	                                 FALSE,
+	                                 master_ac,
+	                                 error);
 }
 
 /* 
@@ -3329,6 +3391,20 @@ impl_manager_deactivate_connection (NMManager *self,
 		return;
 	}
 
+	/* Ensure the subject has permissions for this connection */
+	if (!nm_auth_uid_in_acl (connection,
+	                         priv->session_monitor,
+	                         sender_uid,
+	                         &error_desc)) {
+		error = g_error_new_literal (NM_MANAGER_ERROR,
+		                             NM_MANAGER_ERROR_PERMISSION_DENIED,
+		                             error_desc);
+		dbus_g_method_return_error (context, error);
+		g_error_free (error);
+		g_free (error_desc);
+		return;
+	}
+
 	/* Yay for root */
 	if (0 == sender_uid) {
 		if (!nm_manager_deactivate_connection (self,
@@ -3997,6 +4073,7 @@ connectivity_changed (NMConnectivity *connectivity,
 	            connectivity_states[state]);
 
 	nm_manager_update_state (self);
+	g_object_notify (G_OBJECT (self), NM_MANAGER_CONNECTIVITY);
 }
 
 static void
@@ -4396,6 +4473,8 @@ nm_manager_new (NMSettings *settings,
 	                  G_CALLBACK (bluez_manager_bdaddr_removed_cb),
 	                  singleton);
 
+	priv->session_monitor = nm_session_monitor_get ();
+
 	/* Force kernel WiFi rfkill state to follow NM saved wifi state in case
 	 * the BIOS doesn't save rfkill state, and to be consistent with user
 	 * changes to the WirelessEnabled property which toggles kernel rfkill.
@@ -4465,6 +4544,7 @@ dispose (GObject *object)
 
 	g_object_unref (priv->settings);
 	g_object_unref (priv->vpn_manager);
+	g_object_unref (priv->session_monitor);
 
 	if (priv->modem_added_id) {
 		g_source_remove (priv->modem_added_id);
diff --git a/src/nm-policy.c b/src/nm-policy.c
index e8e7c606..f95caf93 100644
--- a/src/nm-policy.c
+++ b/src/nm-policy.c
@@ -97,16 +97,14 @@ static void schedule_activate_all (NMPolicy *policy);
 
 
 static NMDevice *
-get_best_ip4_device (NMManager *manager, gboolean fully_activated)
+get_best_ip4_device (NMPolicy *self, gboolean fully_activated)
 {
+	NMPolicyPrivate *priv = NM_POLICY_GET_PRIVATE (self);
 	GSList *devices, *iter;
 	NMDevice *best = NULL;
 	int best_prio = G_MAXINT;
 
-	g_return_val_if_fail (manager != NULL, NULL);
-	g_return_val_if_fail (NM_IS_MANAGER (manager), NULL);
-
-	devices = nm_manager_get_devices (manager);
+	devices = nm_manager_get_devices (priv->manager);
 	for (iter = devices; iter; iter = g_slist_next (iter)) {
 		NMDevice *dev = NM_DEVICE (iter->data);
 		NMDeviceType devtype = nm_device_get_device_type (dev);
@@ -167,7 +165,9 @@ get_best_ip4_device (NMManager *manager, gboolean fully_activated)
 		}
 
 		prio = nm_device_get_priority (dev);
-		if (prio > 0 && prio < best_prio) {
+		if (   prio < best_prio
+		    || (priv->default_device4 == dev && prio == best_prio)
+		    || !best) {
 			best = dev;
 			best_prio = prio;
 		}
@@ -191,16 +191,14 @@ get_best_ip4_device (NMManager *manager, gboolean fully_activated)
 }
 
 static NMDevice *
-get_best_ip6_device (NMManager *manager, gboolean fully_activated)
+get_best_ip6_device (NMPolicy *self, gboolean fully_activated)
 {
+	NMPolicyPrivate *priv = NM_POLICY_GET_PRIVATE (self);
 	GSList *devices, *iter;
 	NMDevice *best = NULL;
 	int best_prio = G_MAXINT;
 
-	g_return_val_if_fail (manager != NULL, NULL);
-	g_return_val_if_fail (NM_IS_MANAGER (manager), NULL);
-
-	devices = nm_manager_get_devices (manager);
+	devices = nm_manager_get_devices (priv->manager);
 	for (iter = devices; iter; iter = g_slist_next (iter)) {
 		NMDevice *dev = NM_DEVICE (iter->data);
 		NMDeviceType devtype = nm_device_get_device_type (dev);
@@ -257,7 +255,9 @@ get_best_ip6_device (NMManager *manager, gboolean fully_activated)
 		}
 
 		prio = nm_device_get_priority (dev);
-		if (prio > 0 && prio < best_prio) {
+		if (   prio < best_prio
+		    || (priv->default_device6 == dev && prio == best_prio)
+		    || !best) {
 			best = dev;
 			best_prio = prio;
 		}
@@ -383,9 +383,9 @@ update_system_hostname (NMPolicy *policy, NMDevice *best4, NMDevice *best6)
 
 	/* Try automatically determined hostname from the best device's IP config */
 	if (!best4)
-		best4 = get_best_ip4_device (priv->manager, TRUE);
+		best4 = get_best_ip4_device (policy, TRUE);
 	if (!best6)
-		best6 = get_best_ip6_device (priv->manager, TRUE);
+		best6 = get_best_ip6_device (policy, TRUE);
 
 	if (!best4 && !best6) {
 		/* No best device; fall back to original hostname or if there wasn't
@@ -582,7 +582,7 @@ get_best_ip4_config (NMPolicy *policy,
 
 	/* If no VPN connections, we use the best device instead */
 	if (!ip4_config) {
-		device = get_best_ip4_device (priv->manager, TRUE);
+		device = get_best_ip4_device (policy, TRUE);
 		if (device) {
 			ip4_config = nm_device_get_ip4_config (device);
 			g_assert (ip4_config);
@@ -627,7 +627,7 @@ static void
 update_ip4_routing (NMPolicy *policy, gboolean force_update)
 {
 	NMPolicyPrivate *priv = NM_POLICY_GET_PRIVATE (policy);
-	NMDevice *best = NULL, *parent;
+	NMDevice *best = NULL, *parent, *default_device;
 	NMConnection *connection = NULL;
 	NMVPNConnection *vpn = NULL;
 	NMActiveConnection *best_ac = NULL;
@@ -680,15 +680,20 @@ update_ip4_routing (NMPolicy *policy, gboolean force_update)
 		                                         nm_ip4_config_get_mss (ip4_config),
 		                                         nm_device_get_ip_ifindex (parent),
 		                                         parent_mss);
+		default_device = parent;
 	} else {
 		nm_system_replace_default_ip4_route (ip_ifindex,
 		                                     gw_addr,
 		                                     nm_ip4_config_get_mss (ip4_config));
+		default_device = best;
 	}
 
 	update_default_ac (policy, best_ac, nm_active_connection_set_default);
-	priv->default_device4 = best;
 
+	if (default_device == priv->default_device4)
+		return;
+
+	priv->default_device4 = default_device;
 	connection = nm_active_connection_get_connection (best_ac);
 	nm_log_info (LOGD_CORE, "Policy set '%s' (%s) as default for IPv4 routing and DNS.",
 	             nm_connection_get_id (connection), ip_iface);
@@ -761,7 +766,7 @@ get_best_ip6_config (NMPolicy *policy,
 
 	/* If no VPN connections, we use the best device instead */
 	if (!ip6_config) {
-		device = get_best_ip6_device (priv->manager, TRUE);
+		device = get_best_ip6_device (policy, TRUE);
 		if (device) {
 			req = nm_device_get_act_request (device);
 			g_assert (req);
@@ -806,7 +811,7 @@ static void
 update_ip6_routing (NMPolicy *policy, gboolean force_update)
 {
 	NMPolicyPrivate *priv = NM_POLICY_GET_PRIVATE (policy);
-	NMDevice *best = NULL, *parent;
+	NMDevice *best = NULL, *parent, *default_device6;
 	NMConnection *connection = NULL;
 	NMVPNConnection *vpn = NULL;
 	NMActiveConnection *best_ac = NULL;
@@ -868,16 +873,21 @@ update_ip6_routing (NMPolicy *policy, gboolean force_update)
 		                                         nm_ip6_config_get_mss (ip6_config),
 		                                         nm_device_get_ip_ifindex (parent),
 		                                         parent_mss);
+		default_device6 = parent;
 	} else {
 		if (gw_addr)
 			nm_system_replace_default_ip6_route (ip_ifindex, gw_addr);
 		else
 			nm_log_dbg (LOGD_IP6, "missing default IPv6 gateway");
+		default_device6 = best;
 	}
 
 	update_default_ac (policy, best_ac, nm_active_connection_set_default6);
-	priv->default_device6 = best;
 
+	if (default_device6 == priv->default_device6)
+		return;
+
+	priv->default_device6 = default_device6;
 	connection = nm_active_connection_get_connection (best_ac);
 	nm_log_info (LOGD_CORE, "Policy set '%s' (%s) as default for IPv6 routing and DNS.",
 	             nm_connection_get_id (connection), ip_iface);
@@ -913,8 +923,8 @@ check_activating_devices (NMPolicy *policy)
 	GObject *object = G_OBJECT (policy);
 	NMDevice *best4, *best6 = NULL;
 
-	best4 = get_best_ip4_device (priv->manager, FALSE);
-	best6 = get_best_ip6_device (priv->manager, FALSE);
+	best4 = get_best_ip4_device (policy, FALSE);
+	best6 = get_best_ip6_device (policy, FALSE);
 
 	g_object_freeze_notify (object);
 
diff --git a/src/nm-system.c b/src/nm-system.c
index 7f6de912..39983424 100644
--- a/src/nm-system.c
+++ b/src/nm-system.c
@@ -1696,15 +1696,15 @@ nm_system_bond_enslave (gint master_ifindex,
 	g_assert (!nm_system_iface_is_up (slave_ifindex));
 
 	if (nm_system_iface_get_flags (slave_ifindex) & IFF_SLAVE) {
-		struct rtnl_link *link;
+		struct rtnl_link *lk;
 		int existing_master = -1;
 
 		/* Get the ifindex of the existing master device */
-		link = nm_netlink_index_to_rtnl_link (slave_ifindex);
-		g_warn_if_fail (link != NULL);
-		if (link) {
-			existing_master = rtnl_link_get_master (link);
-			rtnl_link_put (link);
+		lk = nm_netlink_index_to_rtnl_link (slave_ifindex);
+		g_warn_if_fail (lk != NULL);
+		if (lk) {
+			existing_master = rtnl_link_get_master (lk);
+			rtnl_link_put (lk);
 		}
 
 		if (existing_master > 0) {
diff --git a/src/org.freedesktop.NetworkManager.conf b/src/org.freedesktop.NetworkManager.conf
index 5e7bafa1..db68374c 100644
--- a/src/org.freedesktop.NetworkManager.conf
+++ b/src/org.freedesktop.NetworkManager.conf
@@ -24,6 +24,7 @@
                 
                 
                 
+                
         
         
                 
diff --git a/src/posix-signals/Makefile.in b/src/posix-signals/Makefile.in
index 524382af..e824a138 100644
--- a/src/posix-signals/Makefile.in
+++ b/src/posix-signals/Makefile.in
@@ -203,6 +203,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -225,6 +226,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
diff --git a/src/ppp-manager/Makefile.am b/src/ppp-manager/Makefile.am
index 7e8102a5..4ad4ff81 100644
--- a/src/ppp-manager/Makefile.am
+++ b/src/ppp-manager/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I${top_srcdir} \
 	-I${top_builddir}/include \
 	-I${top_srcdir}/include \
@@ -8,7 +8,9 @@ INCLUDES = \
 	-I${top_builddir}/src/generated \
 	-I${top_srcdir}/src/generated \
 	-I${top_srcdir}/src/logging \
-	-I${top_srcdir}/src/posix-signals
+	-I${top_srcdir}/src/posix-signals \
+	$(DBUS_CFLAGS) \
+	$(GLIB_CFLAGS)
 
 noinst_LTLIBRARIES = libppp-manager.la
 
@@ -25,7 +27,7 @@ built_sources = nm-ppp-manager-glue.h
 $(libppp_manager_la_OBJECTS): $(built_sources)
 
 libppp_manager_la_CPPFLAGS = \
-	$(DBUS_CFLAGS) \
+	$(AM_CPPFLAGS) \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
 	-DLIBDIR=\"$(libdir)\" \
 	-DPLUGINDIR=\"$(PPPD_PLUGIN_DIR)\"
@@ -47,10 +49,6 @@ nm_pppd_plugin_la_SOURCES = \
 	nm-pppd-plugin.h \
 	nm-ppp-status.h
 
-nm_pppd_plugin_la_CPPFLAGS = \
-	$(DBUS_CFLAGS) \
-	$(GLIB_CFLAGS)
-
 nm_pppd_plugin_la_LDFLAGS = -module -avoid-version
 
 nm_pppd_plugin_la_LIBADD = \
diff --git a/src/ppp-manager/Makefile.in b/src/ppp-manager/Makefile.in
index ac531413..97465f0c 100644
--- a/src/ppp-manager/Makefile.in
+++ b/src/ppp-manager/Makefile.in
@@ -146,8 +146,7 @@ am__v_lt_1 =
 @WITH_PPP_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am__nm_pppd_plugin_la_SOURCES_DIST = nm-pppd-plugin.c nm-pppd-plugin.h \
 	nm-ppp-status.h
-@WITH_PPP_TRUE@am_nm_pppd_plugin_la_OBJECTS =  \
-@WITH_PPP_TRUE@	nm_pppd_plugin_la-nm-pppd-plugin.lo
+@WITH_PPP_TRUE@am_nm_pppd_plugin_la_OBJECTS = nm-pppd-plugin.lo
 nm_pppd_plugin_la_OBJECTS = $(am_nm_pppd_plugin_la_OBJECTS)
 nm_pppd_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
@@ -248,6 +247,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -270,6 +270,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -454,7 +455,7 @@ with_dhclient = @with_dhclient@
 with_dhcpcd = @with_dhcpcd@
 with_netconfig = @with_netconfig@
 with_resolvconf = @with_resolvconf@
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I${top_srcdir} \
 	-I${top_builddir}/include \
 	-I${top_srcdir}/include \
@@ -464,7 +465,9 @@ INCLUDES = \
 	-I${top_builddir}/src/generated \
 	-I${top_srcdir}/src/generated \
 	-I${top_srcdir}/src/logging \
-	-I${top_srcdir}/src/posix-signals
+	-I${top_srcdir}/src/posix-signals \
+	$(DBUS_CFLAGS) \
+	$(GLIB_CFLAGS)
 
 noinst_LTLIBRARIES = libppp-manager.la
 libppp_manager_la_SOURCES = \
@@ -474,7 +477,7 @@ libppp_manager_la_SOURCES = \
 
 built_sources = nm-ppp-manager-glue.h
 libppp_manager_la_CPPFLAGS = \
-	$(DBUS_CFLAGS) \
+	$(AM_CPPFLAGS) \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
 	-DLIBDIR=\"$(libdir)\" \
 	-DPLUGINDIR=\"$(PPPD_PLUGIN_DIR)\"
@@ -493,10 +496,6 @@ libppp_manager_la_LIBADD = \
 @WITH_PPP_TRUE@	nm-pppd-plugin.h \
 @WITH_PPP_TRUE@	nm-ppp-status.h
 
-@WITH_PPP_TRUE@nm_pppd_plugin_la_CPPFLAGS = \
-@WITH_PPP_TRUE@	$(DBUS_CFLAGS) \
-@WITH_PPP_TRUE@	$(GLIB_CFLAGS)
-
 @WITH_PPP_TRUE@nm_pppd_plugin_la_LDFLAGS = -module -avoid-version
 @WITH_PPP_TRUE@nm_pppd_plugin_la_LIBADD = \
 @WITH_PPP_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
@@ -600,7 +599,7 @@ distclean-compile:
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libppp_manager_la-nm-ppp-manager.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm_pppd_plugin_la-nm-pppd-plugin.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-pppd-plugin.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -630,13 +629,6 @@ libppp_manager_la-nm-ppp-manager.lo: nm-ppp-manager.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libppp_manager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libppp_manager_la-nm-ppp-manager.lo `test -f 'nm-ppp-manager.c' || echo '$(srcdir)/'`nm-ppp-manager.c
 
-nm_pppd_plugin_la-nm-pppd-plugin.lo: nm-pppd-plugin.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(nm_pppd_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT nm_pppd_plugin_la-nm-pppd-plugin.lo -MD -MP -MF $(DEPDIR)/nm_pppd_plugin_la-nm-pppd-plugin.Tpo -c -o nm_pppd_plugin_la-nm-pppd-plugin.lo `test -f 'nm-pppd-plugin.c' || echo '$(srcdir)/'`nm-pppd-plugin.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/nm_pppd_plugin_la-nm-pppd-plugin.Tpo $(DEPDIR)/nm_pppd_plugin_la-nm-pppd-plugin.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='nm-pppd-plugin.c' object='nm_pppd_plugin_la-nm-pppd-plugin.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(nm_pppd_plugin_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nm_pppd_plugin_la-nm-pppd-plugin.lo `test -f 'nm-pppd-plugin.c' || echo '$(srcdir)/'`nm-pppd-plugin.c
-
 mostlyclean-libtool:
 	-rm -f *.lo
 
diff --git a/src/settings/Makefile.am b/src/settings/Makefile.am
index 6ca7633f..ea81a7c4 100644
--- a/src/settings/Makefile.am
+++ b/src/settings/Makefile.am
@@ -1,6 +1,7 @@
 SUBDIRS = plugins . tests
 
-INCLUDES = -I${top_srcdir} \
+AM_CPPFLAGS = \
+           -I${top_srcdir} \
            -I${top_builddir}/include \
            -I${top_srcdir}/include \
            -I${top_builddir}/libnm-util \
@@ -8,7 +9,9 @@ INCLUDES = -I${top_srcdir} \
            -I${top_builddir}/src/generated \
            -I${top_srcdir}/src/generated \
            -I${top_srcdir}/src/logging \
-           -I${top_srcdir}/src
+           -I${top_srcdir}/src \
+           $(DBUS_CFLAGS) \
+           $(GLIB_CFLAGS)
 
 noinst_LTLIBRARIES = libsettings.la libtest-settings-utils.la
 
@@ -16,10 +19,6 @@ libtest_settings_utils_la_SOURCES = \
 	nm-settings-utils.c \
 	nm-settings-utils.h
 
-libtest_settings_utils_la_CPPFLAGS = \
-	$(DBUS_CFLAGS) \
-	$(GLIB_CFLAGS)
-
 libtest_settings_utils_la_LIBADD = \
 	$(top_builddir)/libnm-util/libnm-util.la \
 	$(DBUS_LIBS) \
@@ -51,8 +50,7 @@ libsettings_la_SOURCES = \
 	nm-settings-utils.c
 
 libsettings_la_CPPFLAGS = \
-	$(DBUS_CFLAGS) \
-	$(GLIB_CFLAGS) \
+	$(AM_CPPFLAGS) \
 	$(POLKIT_CFLAGS) \
 	-DBINDIR=\"$(bindir)\" \
 	-DSBINDIR=\"$(sbindir)\" \
diff --git a/src/settings/Makefile.in b/src/settings/Makefile.in
index a7d67770..55269361 100644
--- a/src/settings/Makefile.in
+++ b/src/settings/Makefile.in
@@ -130,8 +130,7 @@ libsettings_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 libtest_settings_utils_la_DEPENDENCIES =  \
 	$(top_builddir)/libnm-util/libnm-util.la $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
-am_libtest_settings_utils_la_OBJECTS =  \
-	libtest_settings_utils_la-nm-settings-utils.lo
+am_libtest_settings_utils_la_OBJECTS = nm-settings-utils.lo
 libtest_settings_utils_la_OBJECTS =  \
 	$(am_libtest_settings_utils_la_OBJECTS)
 AM_V_P = $(am__v_P_@AM_V@)
@@ -271,6 +270,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -293,6 +293,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -478,7 +479,8 @@ with_dhcpcd = @with_dhcpcd@
 with_netconfig = @with_netconfig@
 with_resolvconf = @with_resolvconf@
 SUBDIRS = plugins . tests
-INCLUDES = -I${top_srcdir} \
+AM_CPPFLAGS = \
+           -I${top_srcdir} \
            -I${top_builddir}/include \
            -I${top_srcdir}/include \
            -I${top_builddir}/libnm-util \
@@ -486,17 +488,15 @@ INCLUDES = -I${top_srcdir} \
            -I${top_builddir}/src/generated \
            -I${top_srcdir}/src/generated \
            -I${top_srcdir}/src/logging \
-           -I${top_srcdir}/src
+           -I${top_srcdir}/src \
+           $(DBUS_CFLAGS) \
+           $(GLIB_CFLAGS)
 
 noinst_LTLIBRARIES = libsettings.la libtest-settings-utils.la
 libtest_settings_utils_la_SOURCES = \
 	nm-settings-utils.c \
 	nm-settings-utils.h
 
-libtest_settings_utils_la_CPPFLAGS = \
-	$(DBUS_CFLAGS) \
-	$(GLIB_CFLAGS)
-
 libtest_settings_utils_la_LIBADD = \
 	$(top_builddir)/libnm-util/libnm-util.la \
 	$(DBUS_LIBS) \
@@ -528,8 +528,7 @@ libsettings_la_SOURCES = \
 	nm-settings-utils.c
 
 libsettings_la_CPPFLAGS = \
-	$(DBUS_CFLAGS) \
-	$(GLIB_CFLAGS) \
+	$(AM_CPPFLAGS) \
 	$(POLKIT_CFLAGS) \
 	-DBINDIR=\"$(bindir)\" \
 	-DSBINDIR=\"$(sbindir)\" \
@@ -621,7 +620,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsettings_la-nm-settings-utils.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsettings_la-nm-settings.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsettings_la-nm-system-config-interface.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtest_settings_utils_la-nm-settings-utils.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-settings-utils.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -707,13 +706,6 @@ libsettings_la-nm-settings-utils.lo: nm-settings-utils.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsettings_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libsettings_la-nm-settings-utils.lo `test -f 'nm-settings-utils.c' || echo '$(srcdir)/'`nm-settings-utils.c
 
-libtest_settings_utils_la-nm-settings-utils.lo: nm-settings-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtest_settings_utils_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libtest_settings_utils_la-nm-settings-utils.lo -MD -MP -MF $(DEPDIR)/libtest_settings_utils_la-nm-settings-utils.Tpo -c -o libtest_settings_utils_la-nm-settings-utils.lo `test -f 'nm-settings-utils.c' || echo '$(srcdir)/'`nm-settings-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libtest_settings_utils_la-nm-settings-utils.Tpo $(DEPDIR)/libtest_settings_utils_la-nm-settings-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='nm-settings-utils.c' object='libtest_settings_utils_la-nm-settings-utils.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtest_settings_utils_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libtest_settings_utils_la-nm-settings-utils.lo `test -f 'nm-settings-utils.c' || echo '$(srcdir)/'`nm-settings-utils.c
-
 mostlyclean-libtool:
 	-rm -f *.lo
 
diff --git a/src/settings/nm-agent-manager.c b/src/settings/nm-agent-manager.c
index 531fabc5..d3635706 100644
--- a/src/settings/nm-agent-manager.c
+++ b/src/settings/nm-agent-manager.c
@@ -74,7 +74,7 @@ static void request_add_agent (Request *req,
                                NMSecretAgent *agent,
                                NMSessionMonitor *session_monitor);
 
-static void request_remove_agent (Request *req, NMSecretAgent *agent);
+static void request_remove_agent (gpointer key, gpointer value, gpointer user_data);
 
 static void impl_agent_manager_register (NMAgentManager *self,
                                          const char *identifier,
@@ -101,13 +101,60 @@ nm_agent_manager_error_quark (void)
 
 /*************************************************************/
 
+/*----------------------------------------------------------------------------*/
+/* GHashTable safe iterating function: x_g_hash_table_safe_for_each()
+ * GHashTable can't be modified while iterating, the common solution for that is
+ * to flatten the hash table first and iterate over list.
+ * Taken from https://github.com/linuxmint/nemo/blob/master/eel/eel-glib-extensions.c
+ */
+typedef struct {
+	GList *keys;
+	GList *values;
+} FlattenedHashTable;
+
+static void
+flatten_hash_table_element (gpointer key, gpointer value, gpointer callback_data)
+{
+	FlattenedHashTable *flattened_table;
+
+	flattened_table = callback_data;
+	flattened_table->keys = g_list_prepend
+	        (flattened_table->keys, key);
+	flattened_table->values = g_list_prepend
+	        (flattened_table->values, value);
+}
+
+static void
+x_g_hash_table_safe_for_each (GHashTable *hash_table,
+                              GHFunc callback,
+                              gpointer callback_data)
+{
+	FlattenedHashTable flattened;
+	GList *p, *q;
+
+	flattened.keys = NULL;
+	flattened.values = NULL;
+
+	g_hash_table_foreach (hash_table,
+	                      flatten_hash_table_element,
+	                      &flattened);
+
+	for (p = flattened.keys, q = flattened.values;
+	     p != NULL;
+	     p = p->next, q = q->next) {
+	        (* callback) (p->data, q->data, callback_data);
+	}
+
+	g_list_free (flattened.keys);
+	g_list_free (flattened.values);
+}
+/*----------------------------------------------------------------------------*/
+
 static gboolean
 remove_agent (NMAgentManager *self, const char *owner)
 {
 	NMAgentManagerPrivate *priv = NM_AGENT_MANAGER_GET_PRIVATE (self);
 	NMSecretAgent *agent;
-	GHashTableIter iter;
-	gpointer data;
 
 	g_return_val_if_fail (owner != NULL, FALSE);
 
@@ -119,10 +166,8 @@ remove_agent (NMAgentManager *self, const char *owner)
 	nm_log_dbg (LOGD_AGENTS, "(%s) agent unregistered",
 	            nm_secret_agent_get_description (agent));
 
-	/* Remove this agent to any in-progress secrets requests */
-	g_hash_table_iter_init (&iter, priv->requests);
-	while (g_hash_table_iter_next (&iter, NULL, &data))
-		request_remove_agent ((Request *) data, agent);
+	/* Remove this agent from any in-progress secrets requests */
+	x_g_hash_table_safe_for_each (priv->requests, request_remove_agent, agent);
 
 	/* And dispose of the agent */
 	g_hash_table_remove (priv->agents, owner);
@@ -471,7 +516,7 @@ request_free (Request *req)
 	if (req->cancel_callback)
 		req->cancel_callback (req);
 
-	g_slist_free (req->pending);
+	g_slist_free_full (req->pending, g_object_unref);
 	g_slist_free (req->asked);
 	g_object_unref (req->connection);
 	g_free (req->setting_name);
@@ -576,7 +621,7 @@ request_add_agent (Request *req,
 
 	/* Add this agent to the list, preferring active sessions */
 	req->pending = g_slist_insert_sorted_with_data (req->pending,
-	                                                agent,
+	                                                g_object_ref (agent),
 	                                                (GCompareDataFunc) agent_compare_func,
 	                                                session_monitor);
 }
@@ -594,17 +639,21 @@ request_add_agents (NMAgentManager *self, Request *req)
 }
 
 static void
-request_remove_agent (Request *req, NMSecretAgent *agent)
+request_remove_agent (gpointer key, gpointer value, gpointer user_data)
 {
+	Request *req = (Request *) value;
+	NMSecretAgent *agent = (NMSecretAgent *) user_data;
 	gboolean try_next = FALSE;
 	const char *detail = "";
+	GSList *found;
 
 	g_return_if_fail (req != NULL);
 	g_return_if_fail (agent != NULL);
 
 	/* If this agent is being asked right now, cancel the request */
 	if (agent == req->current) {
-		req->cancel_callback (req);
+		if (req->cancel_callback)
+			req->cancel_callback (req);
 		req->current_has_modify = FALSE;
 		req->current = NULL;
 		req->current_call_id = NULL;
@@ -616,7 +665,12 @@ request_remove_agent (Request *req, NMSecretAgent *agent)
 				nm_secret_agent_get_description (agent),
 				detail, req, req->setting_name);
 
-	req->pending = g_slist_remove (req->pending, agent);
+	found = g_slist_find (req->pending, agent);
+	if (found) {
+		req->pending = g_slist_remove_link (req->pending, found);
+		g_object_unref (found->data);
+		g_slist_free_1 (found);
+	}
 
 	if (try_next) {
 		/* If the agent serving the in-progress secrets request went away then
@@ -642,6 +696,8 @@ next_generic (Request *req, const char *detail)
 	} else {
 		/* Send a secrets request to the next agent */
 		req->current_has_modify = FALSE;
+		if (req->current)
+			g_object_unref (req->current);
 		req->current = req->pending->data;
 		req->pending = g_slist_remove (req->pending, req->current);
 
@@ -1452,7 +1508,7 @@ dispose (GObject *object)
 
 		nm_auth_changed_func_unregister (authority_changed_cb, NM_AGENT_MANAGER (object));
 
-		g_slist_foreach (priv->chains, (GFunc) nm_auth_chain_unref, NULL);
+		g_slist_free_full (priv->chains, (GDestroyNotify) nm_auth_chain_unref);
 
 		g_hash_table_destroy (priv->agents);
 		g_hash_table_destroy (priv->requests);
diff --git a/src/settings/nm-settings-connection.c b/src/settings/nm-settings-connection.c
index e2aa9845..7bd35cf8 100644
--- a/src/settings/nm-settings-connection.c
+++ b/src/settings/nm-settings-connection.c
@@ -1588,7 +1588,7 @@ nm_settings_connection_get_seen_bssids (NMSettingsConnection *connection)
  * @connection: the #NMSettingsConnection
  * @bssid: the BSSID to check the seen BSSID list for
  *
- * Returns: TRUE if the given @bssid is in the seen BSSIDs list
+ * Returns: %TRUE if the given @bssid is in the seen BSSIDs list
  **/
 gboolean
 nm_settings_connection_has_seen_bssid (NMSettingsConnection *connection,
diff --git a/src/settings/nm-settings-error.h b/src/settings/nm-settings-error.h
index 82132c6f..085ef955 100644
--- a/src/settings/nm-settings-error.h
+++ b/src/settings/nm-settings-error.h
@@ -41,6 +41,7 @@ typedef enum {
 	NM_SETTINGS_ERROR_ADD_FAILED,                  /*< nick=AddFailed >*/
 	NM_SETTINGS_ERROR_SAVE_HOSTNAME_NOT_SUPPORTED, /*< nick=SaveHostnameNotSupported >*/
 	NM_SETTINGS_ERROR_SAVE_HOSTNAME_FAILED,        /*< nick=SaveHostnameFailed >*/
+	NM_SETTINGS_ERROR_HOSTNAME_INVALID,            /*< nick=HostnameInvalid >*/
 	NM_SETTINGS_ERROR_UUID_EXISTS,                 /*< nick=UuidExists >*/
 } NMSettingsError;
 
diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c
index e200b83c..71009a0c 100644
--- a/src/settings/nm-settings.c
+++ b/src/settings/nm-settings.c
@@ -1286,6 +1286,33 @@ done:
 	nm_auth_chain_unref (chain);
 }
 
+static gboolean
+validate_hostname (const char *hostname)
+{
+	const char *p;
+	gboolean dot = TRUE;
+
+	if (!hostname || !hostname[0])
+		return FALSE;
+
+	for (p = hostname; *p; p++) {
+		if (*p == '.') {
+			if (dot)
+				return FALSE;
+			dot = TRUE;
+		} else {
+			if (!g_ascii_isalnum (*p) && (*p != '-') && (*p != '_'))
+				return FALSE;
+			dot = FALSE;
+		}
+	}
+
+	if (dot)
+		return FALSE;
+
+	return (p - hostname <= HOST_NAME_MAX);
+}
+
 static void
 impl_settings_save_hostname (NMSettings *self,
                              const char *hostname,
@@ -1295,6 +1322,16 @@ impl_settings_save_hostname (NMSettings *self,
 	NMAuthChain *chain;
 	GError *error = NULL;
 
+	/* Minimal validation of the hostname */
+	if (!validate_hostname (hostname)) {
+		error = g_error_new_literal (NM_SETTINGS_ERROR,
+		                             NM_SETTINGS_ERROR_HOSTNAME_INVALID,
+		                             "The hostname was too long or contained invalid characters.");
+		dbus_g_method_return_error (context, error);
+		g_error_free (error);
+		return;
+	}
+
 	/* Do any of the plugins support setting the hostname? */
 	if (!get_plugin (self, NM_SYSTEM_CONFIG_INTERFACE_CAP_MODIFY_HOSTNAME)) {
 		error = g_error_new_literal (NM_SETTINGS_ERROR,
diff --git a/src/settings/plugins/Makefile.in b/src/settings/plugins/Makefile.in
index 55d3cb70..4a8bc871 100644
--- a/src/settings/plugins/Makefile.in
+++ b/src/settings/plugins/Makefile.in
@@ -215,6 +215,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -237,6 +238,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
diff --git a/src/settings/plugins/example/Makefile.am b/src/settings/plugins/example/Makefile.am
index 95558b72..f3aa11b6 100644
--- a/src/settings/plugins/example/Makefile.am
+++ b/src/settings/plugins/example/Makefile.am
@@ -1,12 +1,15 @@
-INCLUDES = \
+# 'noinst' here because this is an example plugin we don't want to install
+noinst_LTLIBRARIES = libnm-settings-plugin-example.la
+
+libnm_settings_plugin_example_la_CPPFLAGS = \
 	-I$(top_srcdir)/src/settings \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libnm-util \
-	-I$(top_builddir)/libnm-util
-
-# 'noinst' here because this is an example plugin we don't want to install
-noinst_LTLIBRARIES = libnm-settings-plugin-example.la
+	-I$(top_builddir)/libnm-util \
+	$(GLIB_CFLAGS) \
+	$(DBUS_CFLAGS) \
+	-DNMCONFDIR=\"$(nmconfdir)\"
 
 # The actual plugins typically pull reader.c and writer.c out into
 # their own static library so that unit tests can use them without
@@ -23,11 +26,6 @@ libnm_settings_plugin_example_la_SOURCES = \
 	reader.c \
 	writer.c
 
-libnm_settings_plugin_example_la_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS) \
-	-DNMCONFDIR=\"$(nmconfdir)\"
-
 libnm_settings_plugin_example_la_LIBADD = \
 	$(top_builddir)/libnm-util/libnm-util.la \
 	$(GLIB_LIBS)
diff --git a/src/settings/plugins/example/Makefile.in b/src/settings/plugins/example/Makefile.in
index 1e6a78a8..d991bc44 100644
--- a/src/settings/plugins/example/Makefile.in
+++ b/src/settings/plugins/example/Makefile.in
@@ -213,6 +213,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -235,6 +236,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -419,17 +421,20 @@ with_dhclient = @with_dhclient@
 with_dhcpcd = @with_dhcpcd@
 with_netconfig = @with_netconfig@
 with_resolvconf = @with_resolvconf@
-INCLUDES = \
+
+# 'noinst' here because this is an example plugin we don't want to install
+noinst_LTLIBRARIES = libnm-settings-plugin-example.la
+libnm_settings_plugin_example_la_CPPFLAGS = \
 	-I$(top_srcdir)/src/settings \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libnm-util \
-	-I$(top_builddir)/libnm-util
+	-I$(top_builddir)/libnm-util \
+	$(GLIB_CFLAGS) \
+	$(DBUS_CFLAGS) \
+	-DNMCONFDIR=\"$(nmconfdir)\"
 
 
-# 'noinst' here because this is an example plugin we don't want to install
-noinst_LTLIBRARIES = libnm-settings-plugin-example.la
-
 # The actual plugins typically pull reader.c and writer.c out into
 # their own static library so that unit tests can use them without
 # having to build the entire plugin.  But since this is a simple
@@ -444,11 +449,6 @@ libnm_settings_plugin_example_la_SOURCES = \
 	reader.c \
 	writer.c
 
-libnm_settings_plugin_example_la_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS) \
-	-DNMCONFDIR=\"$(nmconfdir)\"
-
 libnm_settings_plugin_example_la_LIBADD = \
 	$(top_builddir)/libnm-util/libnm-util.la \
 	$(GLIB_LIBS)
diff --git a/src/settings/plugins/ifcfg-rh/Makefile.am b/src/settings/plugins/ifcfg-rh/Makefile.am
index a2c3f0f0..3faa60d4 100644
--- a/src/settings/plugins/ifcfg-rh/Makefile.am
+++ b/src/settings/plugins/ifcfg-rh/Makefile.am
@@ -22,7 +22,7 @@ libifcfg_rh_io_la_SOURCES = \
 	utils.c \
 	utils.h
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/wifi \
 	-I$(top_srcdir)/src/settings \
 	-I$(top_srcdir)/src/posix-signals \
@@ -30,9 +30,7 @@ INCLUDES = \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libnm-glib \
 	-I$(top_srcdir)/libnm-util \
-	-I$(top_builddir)/libnm-util
-
-libifcfg_rh_io_la_CPPFLAGS = \
+	-I$(top_builddir)/libnm-util \
 	$(GLIB_CFLAGS) \
 	$(DBUS_CFLAGS) \
 	$(NSS_CFLAGS) \
@@ -52,11 +50,6 @@ libnm_settings_plugin_ifcfg_rh_la_SOURCES = \
 	nm-ifcfg-connection.c \
 	nm-ifcfg-connection.h
 
-libnm_settings_plugin_ifcfg_rh_la_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS) \
-	-DSYSCONFDIR=\"$(sysconfdir)\"
-
 libnm_settings_plugin_ifcfg_rh_la_LDFLAGS = -module -avoid-version
 libnm_settings_plugin_ifcfg_rh_la_LIBADD = \
 	$(top_builddir)/libnm-util/libnm-util.la \
diff --git a/src/settings/plugins/ifcfg-rh/Makefile.in b/src/settings/plugins/ifcfg-rh/Makefile.in
index 1f706fb0..848d470c 100644
--- a/src/settings/plugins/ifcfg-rh/Makefile.in
+++ b/src/settings/plugins/ifcfg-rh/Makefile.in
@@ -137,9 +137,8 @@ libifcfg_rh_io_la_DEPENDENCIES =  \
 	$(top_builddir)/src/posix-signals/libnm-posix-signals.la \
 	$(top_builddir)/libnm-util/libnm-util.la $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
-am_libifcfg_rh_io_la_OBJECTS = libifcfg_rh_io_la-shvar.lo \
-	libifcfg_rh_io_la-reader.lo libifcfg_rh_io_la-writer.lo \
-	libifcfg_rh_io_la-errors.lo libifcfg_rh_io_la-utils.lo
+am_libifcfg_rh_io_la_OBJECTS = shvar.lo reader.lo writer.lo errors.lo \
+	utils.lo
 libifcfg_rh_io_la_OBJECTS = $(am_libifcfg_rh_io_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -149,9 +148,8 @@ libnm_settings_plugin_ifcfg_rh_la_DEPENDENCIES =  \
 	$(top_builddir)/libnm-util/libnm-util.la \
 	$(top_builddir)/libnm-glib/libnm-glib.la libifcfg-rh-io.la \
 	$(am__DEPENDENCIES_1)
-am_libnm_settings_plugin_ifcfg_rh_la_OBJECTS =  \
-	libnm_settings_plugin_ifcfg_rh_la-plugin.lo \
-	libnm_settings_plugin_ifcfg_rh_la-nm-ifcfg-connection.lo
+am_libnm_settings_plugin_ifcfg_rh_la_OBJECTS = plugin.lo \
+	nm-ifcfg-connection.lo
 libnm_settings_plugin_ifcfg_rh_la_OBJECTS =  \
 	$(am_libnm_settings_plugin_ifcfg_rh_la_OBJECTS)
 libnm_settings_plugin_ifcfg_rh_la_LINK = $(LIBTOOL) $(AM_V_lt) \
@@ -296,6 +294,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -318,6 +317,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -520,7 +520,7 @@ libifcfg_rh_io_la_SOURCES = \
 	utils.c \
 	utils.h
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/wifi \
 	-I$(top_srcdir)/src/settings \
 	-I$(top_srcdir)/src/posix-signals \
@@ -528,9 +528,7 @@ INCLUDES = \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libnm-glib \
 	-I$(top_srcdir)/libnm-util \
-	-I$(top_builddir)/libnm-util
-
-libifcfg_rh_io_la_CPPFLAGS = \
+	-I$(top_builddir)/libnm-util \
 	$(GLIB_CFLAGS) \
 	$(DBUS_CFLAGS) \
 	$(NSS_CFLAGS) \
@@ -550,11 +548,6 @@ libnm_settings_plugin_ifcfg_rh_la_SOURCES = \
 	nm-ifcfg-connection.c \
 	nm-ifcfg-connection.h
 
-libnm_settings_plugin_ifcfg_rh_la_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS) \
-	-DSYSCONFDIR=\"$(sysconfdir)\"
-
 libnm_settings_plugin_ifcfg_rh_la_LDFLAGS = -module -avoid-version
 libnm_settings_plugin_ifcfg_rh_la_LIBADD = \
 	$(top_builddir)/libnm-util/libnm-util.la \
@@ -663,13 +656,13 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libifcfg_rh_io_la-errors.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libifcfg_rh_io_la-reader.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libifcfg_rh_io_la-shvar.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libifcfg_rh_io_la-utils.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libifcfg_rh_io_la-writer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnm_settings_plugin_ifcfg_rh_la-nm-ifcfg-connection.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnm_settings_plugin_ifcfg_rh_la-plugin.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/errors.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-ifcfg-connection.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugin.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reader.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shvar.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/writer.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -692,55 +685,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
-libifcfg_rh_io_la-shvar.lo: shvar.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libifcfg_rh_io_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libifcfg_rh_io_la-shvar.lo -MD -MP -MF $(DEPDIR)/libifcfg_rh_io_la-shvar.Tpo -c -o libifcfg_rh_io_la-shvar.lo `test -f 'shvar.c' || echo '$(srcdir)/'`shvar.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libifcfg_rh_io_la-shvar.Tpo $(DEPDIR)/libifcfg_rh_io_la-shvar.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='shvar.c' object='libifcfg_rh_io_la-shvar.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libifcfg_rh_io_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libifcfg_rh_io_la-shvar.lo `test -f 'shvar.c' || echo '$(srcdir)/'`shvar.c
-
-libifcfg_rh_io_la-reader.lo: reader.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libifcfg_rh_io_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libifcfg_rh_io_la-reader.lo -MD -MP -MF $(DEPDIR)/libifcfg_rh_io_la-reader.Tpo -c -o libifcfg_rh_io_la-reader.lo `test -f 'reader.c' || echo '$(srcdir)/'`reader.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libifcfg_rh_io_la-reader.Tpo $(DEPDIR)/libifcfg_rh_io_la-reader.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='reader.c' object='libifcfg_rh_io_la-reader.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libifcfg_rh_io_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libifcfg_rh_io_la-reader.lo `test -f 'reader.c' || echo '$(srcdir)/'`reader.c
-
-libifcfg_rh_io_la-writer.lo: writer.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libifcfg_rh_io_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libifcfg_rh_io_la-writer.lo -MD -MP -MF $(DEPDIR)/libifcfg_rh_io_la-writer.Tpo -c -o libifcfg_rh_io_la-writer.lo `test -f 'writer.c' || echo '$(srcdir)/'`writer.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libifcfg_rh_io_la-writer.Tpo $(DEPDIR)/libifcfg_rh_io_la-writer.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='writer.c' object='libifcfg_rh_io_la-writer.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libifcfg_rh_io_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libifcfg_rh_io_la-writer.lo `test -f 'writer.c' || echo '$(srcdir)/'`writer.c
-
-libifcfg_rh_io_la-errors.lo: errors.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libifcfg_rh_io_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libifcfg_rh_io_la-errors.lo -MD -MP -MF $(DEPDIR)/libifcfg_rh_io_la-errors.Tpo -c -o libifcfg_rh_io_la-errors.lo `test -f 'errors.c' || echo '$(srcdir)/'`errors.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libifcfg_rh_io_la-errors.Tpo $(DEPDIR)/libifcfg_rh_io_la-errors.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='errors.c' object='libifcfg_rh_io_la-errors.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libifcfg_rh_io_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libifcfg_rh_io_la-errors.lo `test -f 'errors.c' || echo '$(srcdir)/'`errors.c
-
-libifcfg_rh_io_la-utils.lo: utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libifcfg_rh_io_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libifcfg_rh_io_la-utils.lo -MD -MP -MF $(DEPDIR)/libifcfg_rh_io_la-utils.Tpo -c -o libifcfg_rh_io_la-utils.lo `test -f 'utils.c' || echo '$(srcdir)/'`utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libifcfg_rh_io_la-utils.Tpo $(DEPDIR)/libifcfg_rh_io_la-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='utils.c' object='libifcfg_rh_io_la-utils.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libifcfg_rh_io_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libifcfg_rh_io_la-utils.lo `test -f 'utils.c' || echo '$(srcdir)/'`utils.c
-
-libnm_settings_plugin_ifcfg_rh_la-plugin.lo: plugin.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_settings_plugin_ifcfg_rh_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm_settings_plugin_ifcfg_rh_la-plugin.lo -MD -MP -MF $(DEPDIR)/libnm_settings_plugin_ifcfg_rh_la-plugin.Tpo -c -o libnm_settings_plugin_ifcfg_rh_la-plugin.lo `test -f 'plugin.c' || echo '$(srcdir)/'`plugin.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnm_settings_plugin_ifcfg_rh_la-plugin.Tpo $(DEPDIR)/libnm_settings_plugin_ifcfg_rh_la-plugin.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='plugin.c' object='libnm_settings_plugin_ifcfg_rh_la-plugin.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_settings_plugin_ifcfg_rh_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm_settings_plugin_ifcfg_rh_la-plugin.lo `test -f 'plugin.c' || echo '$(srcdir)/'`plugin.c
-
-libnm_settings_plugin_ifcfg_rh_la-nm-ifcfg-connection.lo: nm-ifcfg-connection.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_settings_plugin_ifcfg_rh_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm_settings_plugin_ifcfg_rh_la-nm-ifcfg-connection.lo -MD -MP -MF $(DEPDIR)/libnm_settings_plugin_ifcfg_rh_la-nm-ifcfg-connection.Tpo -c -o libnm_settings_plugin_ifcfg_rh_la-nm-ifcfg-connection.lo `test -f 'nm-ifcfg-connection.c' || echo '$(srcdir)/'`nm-ifcfg-connection.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnm_settings_plugin_ifcfg_rh_la-nm-ifcfg-connection.Tpo $(DEPDIR)/libnm_settings_plugin_ifcfg_rh_la-nm-ifcfg-connection.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='nm-ifcfg-connection.c' object='libnm_settings_plugin_ifcfg_rh_la-nm-ifcfg-connection.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_settings_plugin_ifcfg_rh_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm_settings_plugin_ifcfg_rh_la-nm-ifcfg-connection.lo `test -f 'nm-ifcfg-connection.c' || echo '$(srcdir)/'`nm-ifcfg-connection.c
-
 mostlyclean-libtool:
 	-rm -f *.lo
 
diff --git a/src/settings/plugins/ifcfg-rh/reader.c b/src/settings/plugins/ifcfg-rh/reader.c
index a8bfb044..a40bf21e 100644
--- a/src/settings/plugins/ifcfg-rh/reader.c
+++ b/src/settings/plugins/ifcfg-rh/reader.c
@@ -1360,6 +1360,11 @@ make_ip4_setting (shvarFile *ifcfg,
 			g_object_set (s_ip4, NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME, value, NULL);
 		g_free (value);
 
+		g_object_set (s_ip4,
+		              NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME,
+		              svTrueValue (ifcfg, "DHCP_SEND_HOSTNAME", TRUE),
+		              NULL);
+
 		value = svGetValue (ifcfg, "DHCP_CLIENT_ID", FALSE);
 		if (value && strlen (value))
 			g_object_set (s_ip4, NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID, value, NULL);
diff --git a/src/settings/plugins/ifcfg-rh/tests/Makefile.am b/src/settings/plugins/ifcfg-rh/tests/Makefile.am
index 9aec92fe..d1b75fc3 100644
--- a/src/settings/plugins/ifcfg-rh/tests/Makefile.am
+++ b/src/settings/plugins/ifcfg-rh/tests/Makefile.am
@@ -2,13 +2,14 @@ if ENABLE_TESTS
 
 SUBDIRS=network-scripts
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libnm-util \
 	-I$(top_builddir)/libnm-util \
 	-I$(top_srcdir)/libnm-glib \
-	-I$(srcdir)/../
+	-I$(srcdir)/../ \
+	$(GLIB_CFLAGS)
 
 noinst_PROGRAMS = test-ifcfg-rh test-ifcfg-rh-utils
 
@@ -16,7 +17,7 @@ test_ifcfg_rh_SOURCES = \
 	test-ifcfg-rh.c
 
 test_ifcfg_rh_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
+	$(AM_CPPFLAGS) \
 	$(DBUS_CFLAGS) \
 	-DTEST_IFCFG_DIR=\"$(abs_srcdir)\" \
 	-DTEST_SCRATCH_DIR=\"$(abs_builddir)/\"
@@ -32,9 +33,6 @@ test_ifcfg_rh_LDADD = \
 test_ifcfg_rh_utils_SOURCES = \
 	test-ifcfg-rh-utils.c
 
-test_ifcfg_rh_utils_CPPFLAGS = \
-	$(GLIB_CFLAGS)
-
 test_ifcfg_rh_utils_LDADD = \
 	$(builddir)/../libifcfg-rh-io.la
 
diff --git a/src/settings/plugins/ifcfg-rh/tests/Makefile.in b/src/settings/plugins/ifcfg-rh/tests/Makefile.in
index a22fc14c..94c0dc69 100644
--- a/src/settings/plugins/ifcfg-rh/tests/Makefile.in
+++ b/src/settings/plugins/ifcfg-rh/tests/Makefile.in
@@ -119,7 +119,8 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
 am__test_ifcfg_rh_utils_SOURCES_DIST = test-ifcfg-rh-utils.c
-@ENABLE_TESTS_TRUE@am_test_ifcfg_rh_utils_OBJECTS = test_ifcfg_rh_utils-test-ifcfg-rh-utils.$(OBJEXT)
+@ENABLE_TESTS_TRUE@am_test_ifcfg_rh_utils_OBJECTS =  \
+@ENABLE_TESTS_TRUE@	test-ifcfg-rh-utils.$(OBJEXT)
 test_ifcfg_rh_utils_OBJECTS = $(am_test_ifcfg_rh_utils_OBJECTS)
 @ENABLE_TESTS_TRUE@test_ifcfg_rh_utils_DEPENDENCIES =  \
 @ENABLE_TESTS_TRUE@	$(builddir)/../libifcfg-rh-io.la
@@ -259,6 +260,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -281,6 +283,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -466,19 +469,20 @@ with_dhcpcd = @with_dhcpcd@
 with_netconfig = @with_netconfig@
 with_resolvconf = @with_resolvconf@
 @ENABLE_TESTS_TRUE@SUBDIRS = network-scripts
-@ENABLE_TESTS_TRUE@INCLUDES = \
+@ENABLE_TESTS_TRUE@AM_CPPFLAGS = \
 @ENABLE_TESTS_TRUE@	-I$(top_srcdir)/include \
 @ENABLE_TESTS_TRUE@	-I$(top_builddir)/include \
 @ENABLE_TESTS_TRUE@	-I$(top_srcdir)/libnm-util \
 @ENABLE_TESTS_TRUE@	-I$(top_builddir)/libnm-util \
 @ENABLE_TESTS_TRUE@	-I$(top_srcdir)/libnm-glib \
-@ENABLE_TESTS_TRUE@	-I$(srcdir)/../
+@ENABLE_TESTS_TRUE@	-I$(srcdir)/../ \
+@ENABLE_TESTS_TRUE@	$(GLIB_CFLAGS)
 
 @ENABLE_TESTS_TRUE@test_ifcfg_rh_SOURCES = \
 @ENABLE_TESTS_TRUE@	test-ifcfg-rh.c
 
 @ENABLE_TESTS_TRUE@test_ifcfg_rh_CPPFLAGS = \
-@ENABLE_TESTS_TRUE@	$(GLIB_CFLAGS) \
+@ENABLE_TESTS_TRUE@	$(AM_CPPFLAGS) \
 @ENABLE_TESTS_TRUE@	$(DBUS_CFLAGS) \
 @ENABLE_TESTS_TRUE@	-DTEST_IFCFG_DIR=\"$(abs_srcdir)\" \
 @ENABLE_TESTS_TRUE@	-DTEST_SCRATCH_DIR=\"$(abs_builddir)/\"
@@ -493,9 +497,6 @@ with_resolvconf = @with_resolvconf@
 @ENABLE_TESTS_TRUE@test_ifcfg_rh_utils_SOURCES = \
 @ENABLE_TESTS_TRUE@	test-ifcfg-rh-utils.c
 
-@ENABLE_TESTS_TRUE@test_ifcfg_rh_utils_CPPFLAGS = \
-@ENABLE_TESTS_TRUE@	$(GLIB_CFLAGS)
-
 @ENABLE_TESTS_TRUE@test_ifcfg_rh_utils_LDADD = \
 @ENABLE_TESTS_TRUE@	$(builddir)/../libifcfg-rh-io.la
 
@@ -567,8 +568,8 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-ifcfg-rh-utils.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_ifcfg_rh-test-ifcfg-rh.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_ifcfg_rh_utils-test-ifcfg-rh-utils.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -605,20 +606,6 @@ test_ifcfg_rh-test-ifcfg-rh.obj: test-ifcfg-rh.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_ifcfg_rh_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_ifcfg_rh-test-ifcfg-rh.obj `if test -f 'test-ifcfg-rh.c'; then $(CYGPATH_W) 'test-ifcfg-rh.c'; else $(CYGPATH_W) '$(srcdir)/test-ifcfg-rh.c'; fi`
 
-test_ifcfg_rh_utils-test-ifcfg-rh-utils.o: test-ifcfg-rh-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_ifcfg_rh_utils_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_ifcfg_rh_utils-test-ifcfg-rh-utils.o -MD -MP -MF $(DEPDIR)/test_ifcfg_rh_utils-test-ifcfg-rh-utils.Tpo -c -o test_ifcfg_rh_utils-test-ifcfg-rh-utils.o `test -f 'test-ifcfg-rh-utils.c' || echo '$(srcdir)/'`test-ifcfg-rh-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_ifcfg_rh_utils-test-ifcfg-rh-utils.Tpo $(DEPDIR)/test_ifcfg_rh_utils-test-ifcfg-rh-utils.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test-ifcfg-rh-utils.c' object='test_ifcfg_rh_utils-test-ifcfg-rh-utils.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_ifcfg_rh_utils_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_ifcfg_rh_utils-test-ifcfg-rh-utils.o `test -f 'test-ifcfg-rh-utils.c' || echo '$(srcdir)/'`test-ifcfg-rh-utils.c
-
-test_ifcfg_rh_utils-test-ifcfg-rh-utils.obj: test-ifcfg-rh-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_ifcfg_rh_utils_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_ifcfg_rh_utils-test-ifcfg-rh-utils.obj -MD -MP -MF $(DEPDIR)/test_ifcfg_rh_utils-test-ifcfg-rh-utils.Tpo -c -o test_ifcfg_rh_utils-test-ifcfg-rh-utils.obj `if test -f 'test-ifcfg-rh-utils.c'; then $(CYGPATH_W) 'test-ifcfg-rh-utils.c'; else $(CYGPATH_W) '$(srcdir)/test-ifcfg-rh-utils.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_ifcfg_rh_utils-test-ifcfg-rh-utils.Tpo $(DEPDIR)/test_ifcfg_rh_utils-test-ifcfg-rh-utils.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test-ifcfg-rh-utils.c' object='test_ifcfg_rh_utils-test-ifcfg-rh-utils.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_ifcfg_rh_utils_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_ifcfg_rh_utils-test-ifcfg-rh-utils.obj `if test -f 'test-ifcfg-rh-utils.c'; then $(CYGPATH_W) 'test-ifcfg-rh-utils.c'; else $(CYGPATH_W) '$(srcdir)/test-ifcfg-rh-utils.c'; fi`
-
 mostlyclean-libtool:
 	-rm -f *.lo
 
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.in b/src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.in
index d858fa06..a8933e30 100644
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.in
+++ b/src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.in
@@ -151,6 +151,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -173,6 +174,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
diff --git a/src/settings/plugins/ifcfg-suse/Makefile.in b/src/settings/plugins/ifcfg-suse/Makefile.in
index b745b676..1bc5bd60 100644
--- a/src/settings/plugins/ifcfg-suse/Makefile.in
+++ b/src/settings/plugins/ifcfg-suse/Makefile.in
@@ -239,6 +239,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -261,6 +262,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
diff --git a/src/settings/plugins/ifnet/Makefile.am b/src/settings/plugins/ifnet/Makefile.am
index 9aaa06f8..66d706b6 100644
--- a/src/settings/plugins/ifnet/Makefile.am
+++ b/src/settings/plugins/ifnet/Makefile.am
@@ -1,17 +1,21 @@
 SUBDIRS = . tests
 
-INCLUDES = \
+pkglib_LTLIBRARIES = libnm-settings-plugin-ifnet.la
+
+noinst_LTLIBRARIES = lib-ifnet-io.la
+
+AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/wifi \
 	-I$(top_srcdir)/src/settings \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libnm-glib \
 	-I$(top_srcdir)/libnm-util \
-	-I$(top_builddir)/libnm-util
-
-pkglib_LTLIBRARIES = libnm-settings-plugin-ifnet.la
-
-noinst_LTLIBRARIES = lib-ifnet-io.la
+	-I$(top_builddir)/libnm-util \
+	$(GLIB_CFLAGS) \
+	$(DBUS_CFLAGS) \
+	-DSYSCONFDIR=\"$(sysconfdir)\" \
+	-DSBINDIR=\"$(sbindir)\"
 
 libnm_settings_plugin_ifnet_la_SOURCES = \
 	nm-ifnet-connection.c \
@@ -20,10 +24,8 @@ libnm_settings_plugin_ifnet_la_SOURCES = \
 	plugin.h 
 
 libnm_settings_plugin_ifnet_la_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS) \
 	$(GUDEV_CFLAGS) \
-	-DSYSCONFDIR=\"$(sysconfdir)\"
+	$(AM_CPPFLAGS)
 
 libnm_settings_plugin_ifnet_la_LDFLAGS = -module -avoid-version
 
@@ -44,12 +46,6 @@ lib_ifnet_io_la_SOURCES = \
 	wpa_parser.h\
 	wpa_parser.c
 
-lib_ifnet_io_la_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS) \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DSBINDIR=\"$(sbindir)\"
-
 lib_ifnet_io_la_LIBADD = \
 	 $(top_builddir)/src/wifi/libwifi-utils.la \
 	 $(top_builddir)/libnm-util/libnm-util.la \
diff --git a/src/settings/plugins/ifnet/Makefile.in b/src/settings/plugins/ifnet/Makefile.in
index 7c272ade..f12de4fa 100644
--- a/src/settings/plugins/ifnet/Makefile.in
+++ b/src/settings/plugins/ifnet/Makefile.in
@@ -133,9 +133,8 @@ am__DEPENDENCIES_1 =
 lib_ifnet_io_la_DEPENDENCIES =  \
 	$(top_builddir)/src/wifi/libwifi-utils.la \
 	$(top_builddir)/libnm-util/libnm-util.la $(am__DEPENDENCIES_1)
-am_lib_ifnet_io_la_OBJECTS = lib_ifnet_io_la-net_parser.lo \
-	lib_ifnet_io_la-connection_parser.lo \
-	lib_ifnet_io_la-net_utils.lo lib_ifnet_io_la-wpa_parser.lo
+am_lib_ifnet_io_la_OBJECTS = net_parser.lo connection_parser.lo \
+	net_utils.lo wpa_parser.lo
 lib_ifnet_io_la_OBJECTS = $(am_lib_ifnet_io_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -291,6 +290,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -313,6 +313,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -498,17 +499,21 @@ with_dhcpcd = @with_dhcpcd@
 with_netconfig = @with_netconfig@
 with_resolvconf = @with_resolvconf@
 SUBDIRS = . tests
-INCLUDES = \
+pkglib_LTLIBRARIES = libnm-settings-plugin-ifnet.la
+noinst_LTLIBRARIES = lib-ifnet-io.la
+AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/wifi \
 	-I$(top_srcdir)/src/settings \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libnm-glib \
 	-I$(top_srcdir)/libnm-util \
-	-I$(top_builddir)/libnm-util
+	-I$(top_builddir)/libnm-util \
+	$(GLIB_CFLAGS) \
+	$(DBUS_CFLAGS) \
+	-DSYSCONFDIR=\"$(sysconfdir)\" \
+	-DSBINDIR=\"$(sbindir)\"
 
-pkglib_LTLIBRARIES = libnm-settings-plugin-ifnet.la
-noinst_LTLIBRARIES = lib-ifnet-io.la
 libnm_settings_plugin_ifnet_la_SOURCES = \
 	nm-ifnet-connection.c \
 	nm-ifnet-connection.h \
@@ -516,10 +521,8 @@ libnm_settings_plugin_ifnet_la_SOURCES = \
 	plugin.h 
 
 libnm_settings_plugin_ifnet_la_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS) \
 	$(GUDEV_CFLAGS) \
-	-DSYSCONFDIR=\"$(sysconfdir)\"
+	$(AM_CPPFLAGS)
 
 libnm_settings_plugin_ifnet_la_LDFLAGS = -module -avoid-version
 libnm_settings_plugin_ifnet_la_LIBADD = \
@@ -539,12 +542,6 @@ lib_ifnet_io_la_SOURCES = \
 	wpa_parser.h\
 	wpa_parser.c
 
-lib_ifnet_io_la_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS) \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DSBINDIR=\"$(sbindir)\"
-
 lib_ifnet_io_la_LIBADD = \
 	 $(top_builddir)/src/wifi/libwifi-utils.la \
 	 $(top_builddir)/libnm-util/libnm-util.la \
@@ -643,12 +640,12 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_ifnet_io_la-connection_parser.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_ifnet_io_la-net_parser.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_ifnet_io_la-net_utils.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_ifnet_io_la-wpa_parser.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/connection_parser.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnm_settings_plugin_ifnet_la-nm-ifnet-connection.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnm_settings_plugin_ifnet_la-plugin.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/net_parser.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/net_utils.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wpa_parser.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -671,34 +668,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
-lib_ifnet_io_la-net_parser.lo: net_parser.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_ifnet_io_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib_ifnet_io_la-net_parser.lo -MD -MP -MF $(DEPDIR)/lib_ifnet_io_la-net_parser.Tpo -c -o lib_ifnet_io_la-net_parser.lo `test -f 'net_parser.c' || echo '$(srcdir)/'`net_parser.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_ifnet_io_la-net_parser.Tpo $(DEPDIR)/lib_ifnet_io_la-net_parser.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='net_parser.c' object='lib_ifnet_io_la-net_parser.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_ifnet_io_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib_ifnet_io_la-net_parser.lo `test -f 'net_parser.c' || echo '$(srcdir)/'`net_parser.c
-
-lib_ifnet_io_la-connection_parser.lo: connection_parser.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_ifnet_io_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib_ifnet_io_la-connection_parser.lo -MD -MP -MF $(DEPDIR)/lib_ifnet_io_la-connection_parser.Tpo -c -o lib_ifnet_io_la-connection_parser.lo `test -f 'connection_parser.c' || echo '$(srcdir)/'`connection_parser.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_ifnet_io_la-connection_parser.Tpo $(DEPDIR)/lib_ifnet_io_la-connection_parser.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='connection_parser.c' object='lib_ifnet_io_la-connection_parser.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_ifnet_io_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib_ifnet_io_la-connection_parser.lo `test -f 'connection_parser.c' || echo '$(srcdir)/'`connection_parser.c
-
-lib_ifnet_io_la-net_utils.lo: net_utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_ifnet_io_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib_ifnet_io_la-net_utils.lo -MD -MP -MF $(DEPDIR)/lib_ifnet_io_la-net_utils.Tpo -c -o lib_ifnet_io_la-net_utils.lo `test -f 'net_utils.c' || echo '$(srcdir)/'`net_utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_ifnet_io_la-net_utils.Tpo $(DEPDIR)/lib_ifnet_io_la-net_utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='net_utils.c' object='lib_ifnet_io_la-net_utils.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_ifnet_io_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib_ifnet_io_la-net_utils.lo `test -f 'net_utils.c' || echo '$(srcdir)/'`net_utils.c
-
-lib_ifnet_io_la-wpa_parser.lo: wpa_parser.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_ifnet_io_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib_ifnet_io_la-wpa_parser.lo -MD -MP -MF $(DEPDIR)/lib_ifnet_io_la-wpa_parser.Tpo -c -o lib_ifnet_io_la-wpa_parser.lo `test -f 'wpa_parser.c' || echo '$(srcdir)/'`wpa_parser.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lib_ifnet_io_la-wpa_parser.Tpo $(DEPDIR)/lib_ifnet_io_la-wpa_parser.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='wpa_parser.c' object='lib_ifnet_io_la-wpa_parser.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_ifnet_io_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib_ifnet_io_la-wpa_parser.lo `test -f 'wpa_parser.c' || echo '$(srcdir)/'`wpa_parser.c
-
 libnm_settings_plugin_ifnet_la-nm-ifnet-connection.lo: nm-ifnet-connection.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_settings_plugin_ifnet_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm_settings_plugin_ifnet_la-nm-ifnet-connection.lo -MD -MP -MF $(DEPDIR)/libnm_settings_plugin_ifnet_la-nm-ifnet-connection.Tpo -c -o libnm_settings_plugin_ifnet_la-nm-ifnet-connection.lo `test -f 'nm-ifnet-connection.c' || echo '$(srcdir)/'`nm-ifnet-connection.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnm_settings_plugin_ifnet_la-nm-ifnet-connection.Tpo $(DEPDIR)/libnm_settings_plugin_ifnet_la-nm-ifnet-connection.Plo
diff --git a/src/settings/plugins/ifnet/connection_parser.c b/src/settings/plugins/ifnet/connection_parser.c
index c85b5c4b..da3f913d 100644
--- a/src/settings/plugins/ifnet/connection_parser.c
+++ b/src/settings/plugins/ifnet/connection_parser.c
@@ -584,7 +584,7 @@ make_ip4_setting (NMConnection *connection,
 
 	NMSettingIP4Config *ip4_setting =
 	    NM_SETTING_IP4_CONFIG (nm_setting_ip4_config_new ());
-	const char *value, *method;
+	const char *value, *method = NULL;
 	gboolean is_static_block = is_static_ip4 (conn_name);
 	ip_block *iblock = NULL;
 
diff --git a/src/settings/plugins/ifnet/tests/Makefile.am b/src/settings/plugins/ifnet/tests/Makefile.am
index 23f96c81..8d80b730 100644
--- a/src/settings/plugins/ifnet/tests/Makefile.am
+++ b/src/settings/plugins/ifnet/tests/Makefile.am
@@ -1,21 +1,20 @@
 if ENABLE_TESTS
 
-INCLUDES=-I$(srcdir)/../ \
-	 -I$(top_srcdir)/libnm-glib \
-	 -I$(top_srcdir)/libnm-util \
-	 -I$(top_builddir)/libnm-util \
-	 -I$(top_srcdir)/include \
-	 -I$(top_builddir)/include \
-	 -I$(top_srcdir)/src/settings
-
-noinst_PROGRAMS = check_ifnet
-check_ifnet_SOURCES = test_all.c
-
-check_ifnet_CPPFLAGS = \
+AM_CPPFLAGS= \
+	-I$(srcdir)/../ \
+	-I$(top_srcdir)/libnm-glib \
+	-I$(top_srcdir)/libnm-util \
+	-I$(top_builddir)/libnm-util \
+	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include \
+	-I$(top_srcdir)/src/settings \
 	$(CHECK_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	-DTEST_WPA_SUPPLICANT_CONF='"$(srcdir)/wpa_supplicant.conf"'
 
+noinst_PROGRAMS = check_ifnet
+check_ifnet_SOURCES = test_all.c
+
 check_ifnet_LDADD = $(top_builddir)/libnm-util/libnm-util.la \
 		    $(builddir)/../lib-ifnet-io.la \
 		    $(CHECK_LIBS) \
diff --git a/src/settings/plugins/ifnet/tests/Makefile.in b/src/settings/plugins/ifnet/tests/Makefile.in
index 1b1330a1..17ec85d0 100644
--- a/src/settings/plugins/ifnet/tests/Makefile.in
+++ b/src/settings/plugins/ifnet/tests/Makefile.in
@@ -103,8 +103,7 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 PROGRAMS = $(noinst_PROGRAMS)
 am__check_ifnet_SOURCES_DIST = test_all.c
-@ENABLE_TESTS_TRUE@am_check_ifnet_OBJECTS =  \
-@ENABLE_TESTS_TRUE@	check_ifnet-test_all.$(OBJEXT)
+@ENABLE_TESTS_TRUE@am_check_ifnet_OBJECTS = test_all.$(OBJEXT)
 check_ifnet_OBJECTS = $(am_check_ifnet_OBJECTS)
 am__DEPENDENCIES_1 =
 @ENABLE_TESTS_TRUE@check_ifnet_DEPENDENCIES =  \
@@ -208,6 +207,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -230,6 +230,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -414,20 +415,19 @@ with_dhclient = @with_dhclient@
 with_dhcpcd = @with_dhcpcd@
 with_netconfig = @with_netconfig@
 with_resolvconf = @with_resolvconf@
-@ENABLE_TESTS_TRUE@INCLUDES = -I$(srcdir)/../ \
-@ENABLE_TESTS_TRUE@	 -I$(top_srcdir)/libnm-glib \
-@ENABLE_TESTS_TRUE@	 -I$(top_srcdir)/libnm-util \
-@ENABLE_TESTS_TRUE@	 -I$(top_builddir)/libnm-util \
-@ENABLE_TESTS_TRUE@	 -I$(top_srcdir)/include \
-@ENABLE_TESTS_TRUE@	 -I$(top_builddir)/include \
-@ENABLE_TESTS_TRUE@	 -I$(top_srcdir)/src/settings
-
-@ENABLE_TESTS_TRUE@check_ifnet_SOURCES = test_all.c
-@ENABLE_TESTS_TRUE@check_ifnet_CPPFLAGS = \
+@ENABLE_TESTS_TRUE@AM_CPPFLAGS = \
+@ENABLE_TESTS_TRUE@	-I$(srcdir)/../ \
+@ENABLE_TESTS_TRUE@	-I$(top_srcdir)/libnm-glib \
+@ENABLE_TESTS_TRUE@	-I$(top_srcdir)/libnm-util \
+@ENABLE_TESTS_TRUE@	-I$(top_builddir)/libnm-util \
+@ENABLE_TESTS_TRUE@	-I$(top_srcdir)/include \
+@ENABLE_TESTS_TRUE@	-I$(top_builddir)/include \
+@ENABLE_TESTS_TRUE@	-I$(top_srcdir)/src/settings \
 @ENABLE_TESTS_TRUE@	$(CHECK_CFLAGS) \
 @ENABLE_TESTS_TRUE@	$(GLIB_CFLAGS) \
 @ENABLE_TESTS_TRUE@	-DTEST_WPA_SUPPLICANT_CONF='"$(srcdir)/wpa_supplicant.conf"'
 
+@ENABLE_TESTS_TRUE@check_ifnet_SOURCES = test_all.c
 @ENABLE_TESTS_TRUE@check_ifnet_LDADD = $(top_builddir)/libnm-util/libnm-util.la \
 @ENABLE_TESTS_TRUE@		    $(builddir)/../lib-ifnet-io.la \
 @ENABLE_TESTS_TRUE@		    $(CHECK_LIBS) \
@@ -496,7 +496,7 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_ifnet-test_all.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_all.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -519,20 +519,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
-check_ifnet-test_all.o: test_all.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_ifnet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT check_ifnet-test_all.o -MD -MP -MF $(DEPDIR)/check_ifnet-test_all.Tpo -c -o check_ifnet-test_all.o `test -f 'test_all.c' || echo '$(srcdir)/'`test_all.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/check_ifnet-test_all.Tpo $(DEPDIR)/check_ifnet-test_all.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test_all.c' object='check_ifnet-test_all.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_ifnet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o check_ifnet-test_all.o `test -f 'test_all.c' || echo '$(srcdir)/'`test_all.c
-
-check_ifnet-test_all.obj: test_all.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_ifnet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT check_ifnet-test_all.obj -MD -MP -MF $(DEPDIR)/check_ifnet-test_all.Tpo -c -o check_ifnet-test_all.obj `if test -f 'test_all.c'; then $(CYGPATH_W) 'test_all.c'; else $(CYGPATH_W) '$(srcdir)/test_all.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/check_ifnet-test_all.Tpo $(DEPDIR)/check_ifnet-test_all.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test_all.c' object='check_ifnet-test_all.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_ifnet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o check_ifnet-test_all.obj `if test -f 'test_all.c'; then $(CYGPATH_W) 'test_all.c'; else $(CYGPATH_W) '$(srcdir)/test_all.c'; fi`
-
 mostlyclean-libtool:
 	-rm -f *.lo
 
diff --git a/src/settings/plugins/ifupdown/Makefile.am b/src/settings/plugins/ifupdown/Makefile.am
index 9d0ad259..ae07f7b0 100644
--- a/src/settings/plugins/ifupdown/Makefile.am
+++ b/src/settings/plugins/ifupdown/Makefile.am
@@ -1,13 +1,16 @@
 SUBDIRS = . tests
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/logging \
 	-I$(top_srcdir)/src/settings \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libnm-glib \
 	-I$(top_srcdir)/libnm-util \
-	-I$(top_builddir)/libnm-util
+	-I$(top_builddir)/libnm-util \
+	$(GLIB_CFLAGS) \
+	$(DBUS_CFLAGS) \
+	-DSYSCONFDIR=\"$(sysconfdir)\"
 
 noinst_LTLIBRARIES = libifupdown-io.la
 
@@ -17,11 +20,6 @@ libifupdown_io_la_SOURCES = \
 	parser.c \
 	parser.h
 
-libifupdown_io_la_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS) \
-	-DSYSCONFDIR=\"$(sysconfdir)\"
-
 libifupdown_io_la_LIBADD = \
 	$(top_builddir)/libnm-util/libnm-util.la \
 	$(GLIB_LIBS)
@@ -35,10 +33,8 @@ libnm_settings_plugin_ifupdown_la_SOURCES = \
 	plugin.h
 
 libnm_settings_plugin_ifupdown_la_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS) \
 	$(GUDEV_CFLAGS) \
-	-DSYSCONFDIR=\"$(sysconfdir)\"
+	$(AM_CPPFLAGS)
 
 libnm_settings_plugin_ifupdown_la_LDFLAGS = -module -avoid-version
 libnm_settings_plugin_ifupdown_la_LIBADD = \
diff --git a/src/settings/plugins/ifupdown/Makefile.in b/src/settings/plugins/ifupdown/Makefile.in
index b08b0d52..05629ea0 100644
--- a/src/settings/plugins/ifupdown/Makefile.in
+++ b/src/settings/plugins/ifupdown/Makefile.in
@@ -132,8 +132,7 @@ LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkglib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 libifupdown_io_la_DEPENDENCIES =  \
 	$(top_builddir)/libnm-util/libnm-util.la $(am__DEPENDENCIES_1)
-am_libifupdown_io_la_OBJECTS = libifupdown_io_la-interface_parser.lo \
-	libifupdown_io_la-parser.lo
+am_libifupdown_io_la_OBJECTS = interface_parser.lo parser.lo
 libifupdown_io_la_OBJECTS = $(am_libifupdown_io_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -289,6 +288,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -311,6 +311,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -496,14 +497,17 @@ with_dhcpcd = @with_dhcpcd@
 with_netconfig = @with_netconfig@
 with_resolvconf = @with_resolvconf@
 SUBDIRS = . tests
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/logging \
 	-I$(top_srcdir)/src/settings \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libnm-glib \
 	-I$(top_srcdir)/libnm-util \
-	-I$(top_builddir)/libnm-util
+	-I$(top_builddir)/libnm-util \
+	$(GLIB_CFLAGS) \
+	$(DBUS_CFLAGS) \
+	-DSYSCONFDIR=\"$(sysconfdir)\"
 
 noinst_LTLIBRARIES = libifupdown-io.la
 libifupdown_io_la_SOURCES = \
@@ -512,11 +516,6 @@ libifupdown_io_la_SOURCES = \
 	parser.c \
 	parser.h
 
-libifupdown_io_la_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS) \
-	-DSYSCONFDIR=\"$(sysconfdir)\"
-
 libifupdown_io_la_LIBADD = \
 	$(top_builddir)/libnm-util/libnm-util.la \
 	$(GLIB_LIBS)
@@ -529,10 +528,8 @@ libnm_settings_plugin_ifupdown_la_SOURCES = \
 	plugin.h
 
 libnm_settings_plugin_ifupdown_la_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS) \
 	$(GUDEV_CFLAGS) \
-	-DSYSCONFDIR=\"$(sysconfdir)\"
+	$(AM_CPPFLAGS)
 
 libnm_settings_plugin_ifupdown_la_LDFLAGS = -module -avoid-version
 libnm_settings_plugin_ifupdown_la_LIBADD = \
@@ -635,10 +632,10 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libifupdown_io_la-interface_parser.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libifupdown_io_la-parser.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/interface_parser.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnm_settings_plugin_ifupdown_la-nm-ifupdown-connection.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnm_settings_plugin_ifupdown_la-plugin.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parser.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -661,20 +658,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
-libifupdown_io_la-interface_parser.lo: interface_parser.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libifupdown_io_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libifupdown_io_la-interface_parser.lo -MD -MP -MF $(DEPDIR)/libifupdown_io_la-interface_parser.Tpo -c -o libifupdown_io_la-interface_parser.lo `test -f 'interface_parser.c' || echo '$(srcdir)/'`interface_parser.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libifupdown_io_la-interface_parser.Tpo $(DEPDIR)/libifupdown_io_la-interface_parser.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='interface_parser.c' object='libifupdown_io_la-interface_parser.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libifupdown_io_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libifupdown_io_la-interface_parser.lo `test -f 'interface_parser.c' || echo '$(srcdir)/'`interface_parser.c
-
-libifupdown_io_la-parser.lo: parser.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libifupdown_io_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libifupdown_io_la-parser.lo -MD -MP -MF $(DEPDIR)/libifupdown_io_la-parser.Tpo -c -o libifupdown_io_la-parser.lo `test -f 'parser.c' || echo '$(srcdir)/'`parser.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libifupdown_io_la-parser.Tpo $(DEPDIR)/libifupdown_io_la-parser.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='parser.c' object='libifupdown_io_la-parser.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libifupdown_io_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libifupdown_io_la-parser.lo `test -f 'parser.c' || echo '$(srcdir)/'`parser.c
-
 libnm_settings_plugin_ifupdown_la-nm-ifupdown-connection.lo: nm-ifupdown-connection.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_settings_plugin_ifupdown_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm_settings_plugin_ifupdown_la-nm-ifupdown-connection.lo -MD -MP -MF $(DEPDIR)/libnm_settings_plugin_ifupdown_la-nm-ifupdown-connection.Tpo -c -o libnm_settings_plugin_ifupdown_la-nm-ifupdown-connection.lo `test -f 'nm-ifupdown-connection.c' || echo '$(srcdir)/'`nm-ifupdown-connection.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnm_settings_plugin_ifupdown_la-nm-ifupdown-connection.Tpo $(DEPDIR)/libnm_settings_plugin_ifupdown_la-nm-ifupdown-connection.Plo
diff --git a/src/settings/plugins/ifupdown/tests/Makefile.am b/src/settings/plugins/ifupdown/tests/Makefile.am
index 6bde26fe..d8286867 100644
--- a/src/settings/plugins/ifupdown/tests/Makefile.am
+++ b/src/settings/plugins/ifupdown/tests/Makefile.am
@@ -1,23 +1,21 @@
 if ENABLE_TESTS
 
-INCLUDES = \
+noinst_PROGRAMS = test-ifupdown
+
+AM_CPPFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libnm-util \
 	-I$(top_builddir)/libnm-util \
 	-I$(top_srcdir)/libnm-glib \
-	-I$(srcdir)/../
-
-noinst_PROGRAMS = test-ifupdown
-
-test_ifupdown_SOURCES = \
-	test-ifupdown.c
-
-test_ifupdown_CPPFLAGS = \
+	-I$(srcdir)/../ \
 	$(GLIB_CFLAGS) \
 	$(DBUS_CFLAGS) \
 	-DTEST_ENI_DIR=\"$(abs_srcdir)\"
 
+test_ifupdown_SOURCES = \
+	test-ifupdown.c
+
 test_ifupdown_LDADD = \
 	$(top_builddir)/libnm-glib/libnm-glib.la \
 	$(top_builddir)/libnm-util/libnm-util.la \
diff --git a/src/settings/plugins/ifupdown/tests/Makefile.in b/src/settings/plugins/ifupdown/tests/Makefile.in
index ef308512..7fea5c87 100644
--- a/src/settings/plugins/ifupdown/tests/Makefile.in
+++ b/src/settings/plugins/ifupdown/tests/Makefile.in
@@ -103,8 +103,7 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 PROGRAMS = $(noinst_PROGRAMS)
 am__test_ifupdown_SOURCES_DIST = test-ifupdown.c
-@ENABLE_TESTS_TRUE@am_test_ifupdown_OBJECTS =  \
-@ENABLE_TESTS_TRUE@	test_ifupdown-test-ifupdown.$(OBJEXT)
+@ENABLE_TESTS_TRUE@am_test_ifupdown_OBJECTS = test-ifupdown.$(OBJEXT)
 test_ifupdown_OBJECTS = $(am_test_ifupdown_OBJECTS)
 am__DEPENDENCIES_1 =
 @ENABLE_TESTS_TRUE@test_ifupdown_DEPENDENCIES =  \
@@ -209,6 +208,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -231,6 +231,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -415,22 +416,20 @@ with_dhclient = @with_dhclient@
 with_dhcpcd = @with_dhcpcd@
 with_netconfig = @with_netconfig@
 with_resolvconf = @with_resolvconf@
-@ENABLE_TESTS_TRUE@INCLUDES = \
+@ENABLE_TESTS_TRUE@AM_CPPFLAGS = \
 @ENABLE_TESTS_TRUE@	-I$(top_srcdir)/include \
 @ENABLE_TESTS_TRUE@	-I$(top_builddir)/include \
 @ENABLE_TESTS_TRUE@	-I$(top_srcdir)/libnm-util \
 @ENABLE_TESTS_TRUE@	-I$(top_builddir)/libnm-util \
 @ENABLE_TESTS_TRUE@	-I$(top_srcdir)/libnm-glib \
-@ENABLE_TESTS_TRUE@	-I$(srcdir)/../
-
-@ENABLE_TESTS_TRUE@test_ifupdown_SOURCES = \
-@ENABLE_TESTS_TRUE@	test-ifupdown.c
-
-@ENABLE_TESTS_TRUE@test_ifupdown_CPPFLAGS = \
+@ENABLE_TESTS_TRUE@	-I$(srcdir)/../ \
 @ENABLE_TESTS_TRUE@	$(GLIB_CFLAGS) \
 @ENABLE_TESTS_TRUE@	$(DBUS_CFLAGS) \
 @ENABLE_TESTS_TRUE@	-DTEST_ENI_DIR=\"$(abs_srcdir)\"
 
+@ENABLE_TESTS_TRUE@test_ifupdown_SOURCES = \
+@ENABLE_TESTS_TRUE@	test-ifupdown.c
+
 @ENABLE_TESTS_TRUE@test_ifupdown_LDADD = \
 @ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-glib/libnm-glib.la \
 @ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
@@ -496,7 +495,7 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_ifupdown-test-ifupdown.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-ifupdown.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -519,20 +518,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
-test_ifupdown-test-ifupdown.o: test-ifupdown.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_ifupdown_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_ifupdown-test-ifupdown.o -MD -MP -MF $(DEPDIR)/test_ifupdown-test-ifupdown.Tpo -c -o test_ifupdown-test-ifupdown.o `test -f 'test-ifupdown.c' || echo '$(srcdir)/'`test-ifupdown.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_ifupdown-test-ifupdown.Tpo $(DEPDIR)/test_ifupdown-test-ifupdown.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test-ifupdown.c' object='test_ifupdown-test-ifupdown.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_ifupdown_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_ifupdown-test-ifupdown.o `test -f 'test-ifupdown.c' || echo '$(srcdir)/'`test-ifupdown.c
-
-test_ifupdown-test-ifupdown.obj: test-ifupdown.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_ifupdown_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_ifupdown-test-ifupdown.obj -MD -MP -MF $(DEPDIR)/test_ifupdown-test-ifupdown.Tpo -c -o test_ifupdown-test-ifupdown.obj `if test -f 'test-ifupdown.c'; then $(CYGPATH_W) 'test-ifupdown.c'; else $(CYGPATH_W) '$(srcdir)/test-ifupdown.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_ifupdown-test-ifupdown.Tpo $(DEPDIR)/test_ifupdown-test-ifupdown.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test-ifupdown.c' object='test_ifupdown-test-ifupdown.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_ifupdown_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_ifupdown-test-ifupdown.obj `if test -f 'test-ifupdown.c'; then $(CYGPATH_W) 'test-ifupdown.c'; else $(CYGPATH_W) '$(srcdir)/test-ifupdown.c'; fi`
-
 mostlyclean-libtool:
 	-rm -f *.lo
 
diff --git a/src/settings/plugins/keyfile/Makefile.am b/src/settings/plugins/keyfile/Makefile.am
index a9fbb663..b0cd688a 100644
--- a/src/settings/plugins/keyfile/Makefile.am
+++ b/src/settings/plugins/keyfile/Makefile.am
@@ -1,11 +1,14 @@
 SUBDIRS = . tests
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/settings \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libnm-util \
-	-I$(top_builddir)/libnm-util
+	-I$(top_builddir)/libnm-util \
+	$(GLIB_CFLAGS) \
+	$(DBUS_CFLAGS) \
+	-DNMCONFDIR=\"$(nmconfdir)\"
 
 noinst_LTLIBRARIES = \
 	libkeyfile-io.la \
@@ -23,11 +26,6 @@ libkeyfile_io_la_SOURCES = \
 	utils.h \
 	common.h
 
-libkeyfile_io_la_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS) \
-	-DNMCONFDIR=\"$(nmconfdir)\"
-
 libkeyfile_io_la_LIBADD = $(GLIB_LIBS)
 
 #####################################
@@ -38,11 +36,6 @@ libnm_settings_plugin_keyfile_la_SOURCES = \
 	plugin.c \
 	plugin.h
 
-libnm_settings_plugin_keyfile_la_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS) \
-	-DNMCONFDIR=\"$(nmconfdir)\"
-
 libnm_settings_plugin_keyfile_la_LIBADD = \
 	$(top_builddir)/libnm-util/libnm-util.la \
 	libkeyfile-io.la \
diff --git a/src/settings/plugins/keyfile/Makefile.in b/src/settings/plugins/keyfile/Makefile.in
index b1ff03c0..79dfcb42 100644
--- a/src/settings/plugins/keyfile/Makefile.in
+++ b/src/settings/plugins/keyfile/Makefile.in
@@ -103,9 +103,7 @@ CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 libkeyfile_io_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_libkeyfile_io_la_OBJECTS = libkeyfile_io_la-reader.lo \
-	libkeyfile_io_la-writer.lo libkeyfile_io_la-errors.lo \
-	libkeyfile_io_la-utils.lo
+am_libkeyfile_io_la_OBJECTS = reader.lo writer.lo errors.lo utils.lo
 libkeyfile_io_la_OBJECTS = $(am_libkeyfile_io_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -115,8 +113,7 @@ libnm_settings_plugin_keyfile_la_DEPENDENCIES =  \
 	$(top_builddir)/libnm-util/libnm-util.la libkeyfile-io.la \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_libnm_settings_plugin_keyfile_la_OBJECTS =  \
-	libnm_settings_plugin_keyfile_la-nm-keyfile-connection.lo \
-	libnm_settings_plugin_keyfile_la-plugin.lo
+	nm-keyfile-connection.lo plugin.lo
 libnm_settings_plugin_keyfile_la_OBJECTS =  \
 	$(am_libnm_settings_plugin_keyfile_la_OBJECTS)
 libnm_settings_plugin_keyfile_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
@@ -260,6 +257,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -282,6 +280,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -467,12 +466,15 @@ with_dhcpcd = @with_dhcpcd@
 with_netconfig = @with_netconfig@
 with_resolvconf = @with_resolvconf@
 SUBDIRS = . tests
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/settings \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libnm-util \
-	-I$(top_builddir)/libnm-util
+	-I$(top_builddir)/libnm-util \
+	$(GLIB_CFLAGS) \
+	$(DBUS_CFLAGS) \
+	-DNMCONFDIR=\"$(nmconfdir)\"
 
 noinst_LTLIBRARIES = \
 	libkeyfile-io.la \
@@ -490,11 +492,6 @@ libkeyfile_io_la_SOURCES = \
 	utils.h \
 	common.h
 
-libkeyfile_io_la_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS) \
-	-DNMCONFDIR=\"$(nmconfdir)\"
-
 libkeyfile_io_la_LIBADD = $(GLIB_LIBS)
 
 #####################################
@@ -504,11 +501,6 @@ libnm_settings_plugin_keyfile_la_SOURCES = \
 	plugin.c \
 	plugin.h
 
-libnm_settings_plugin_keyfile_la_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS) \
-	-DNMCONFDIR=\"$(nmconfdir)\"
-
 libnm_settings_plugin_keyfile_la_LIBADD = \
 	$(top_builddir)/libnm-util/libnm-util.la \
 	libkeyfile-io.la \
@@ -575,12 +567,12 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkeyfile_io_la-errors.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkeyfile_io_la-reader.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkeyfile_io_la-utils.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkeyfile_io_la-writer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnm_settings_plugin_keyfile_la-nm-keyfile-connection.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnm_settings_plugin_keyfile_la-plugin.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/errors.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-keyfile-connection.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugin.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reader.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/writer.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -603,48 +595,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
-libkeyfile_io_la-reader.lo: reader.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkeyfile_io_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libkeyfile_io_la-reader.lo -MD -MP -MF $(DEPDIR)/libkeyfile_io_la-reader.Tpo -c -o libkeyfile_io_la-reader.lo `test -f 'reader.c' || echo '$(srcdir)/'`reader.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libkeyfile_io_la-reader.Tpo $(DEPDIR)/libkeyfile_io_la-reader.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='reader.c' object='libkeyfile_io_la-reader.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkeyfile_io_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libkeyfile_io_la-reader.lo `test -f 'reader.c' || echo '$(srcdir)/'`reader.c
-
-libkeyfile_io_la-writer.lo: writer.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkeyfile_io_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libkeyfile_io_la-writer.lo -MD -MP -MF $(DEPDIR)/libkeyfile_io_la-writer.Tpo -c -o libkeyfile_io_la-writer.lo `test -f 'writer.c' || echo '$(srcdir)/'`writer.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libkeyfile_io_la-writer.Tpo $(DEPDIR)/libkeyfile_io_la-writer.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='writer.c' object='libkeyfile_io_la-writer.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkeyfile_io_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libkeyfile_io_la-writer.lo `test -f 'writer.c' || echo '$(srcdir)/'`writer.c
-
-libkeyfile_io_la-errors.lo: errors.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkeyfile_io_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libkeyfile_io_la-errors.lo -MD -MP -MF $(DEPDIR)/libkeyfile_io_la-errors.Tpo -c -o libkeyfile_io_la-errors.lo `test -f 'errors.c' || echo '$(srcdir)/'`errors.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libkeyfile_io_la-errors.Tpo $(DEPDIR)/libkeyfile_io_la-errors.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='errors.c' object='libkeyfile_io_la-errors.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkeyfile_io_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libkeyfile_io_la-errors.lo `test -f 'errors.c' || echo '$(srcdir)/'`errors.c
-
-libkeyfile_io_la-utils.lo: utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkeyfile_io_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libkeyfile_io_la-utils.lo -MD -MP -MF $(DEPDIR)/libkeyfile_io_la-utils.Tpo -c -o libkeyfile_io_la-utils.lo `test -f 'utils.c' || echo '$(srcdir)/'`utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libkeyfile_io_la-utils.Tpo $(DEPDIR)/libkeyfile_io_la-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='utils.c' object='libkeyfile_io_la-utils.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkeyfile_io_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libkeyfile_io_la-utils.lo `test -f 'utils.c' || echo '$(srcdir)/'`utils.c
-
-libnm_settings_plugin_keyfile_la-nm-keyfile-connection.lo: nm-keyfile-connection.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_settings_plugin_keyfile_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm_settings_plugin_keyfile_la-nm-keyfile-connection.lo -MD -MP -MF $(DEPDIR)/libnm_settings_plugin_keyfile_la-nm-keyfile-connection.Tpo -c -o libnm_settings_plugin_keyfile_la-nm-keyfile-connection.lo `test -f 'nm-keyfile-connection.c' || echo '$(srcdir)/'`nm-keyfile-connection.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnm_settings_plugin_keyfile_la-nm-keyfile-connection.Tpo $(DEPDIR)/libnm_settings_plugin_keyfile_la-nm-keyfile-connection.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='nm-keyfile-connection.c' object='libnm_settings_plugin_keyfile_la-nm-keyfile-connection.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_settings_plugin_keyfile_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm_settings_plugin_keyfile_la-nm-keyfile-connection.lo `test -f 'nm-keyfile-connection.c' || echo '$(srcdir)/'`nm-keyfile-connection.c
-
-libnm_settings_plugin_keyfile_la-plugin.lo: plugin.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_settings_plugin_keyfile_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm_settings_plugin_keyfile_la-plugin.lo -MD -MP -MF $(DEPDIR)/libnm_settings_plugin_keyfile_la-plugin.Tpo -c -o libnm_settings_plugin_keyfile_la-plugin.lo `test -f 'plugin.c' || echo '$(srcdir)/'`plugin.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libnm_settings_plugin_keyfile_la-plugin.Tpo $(DEPDIR)/libnm_settings_plugin_keyfile_la-plugin.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='plugin.c' object='libnm_settings_plugin_keyfile_la-plugin.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_settings_plugin_keyfile_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm_settings_plugin_keyfile_la-plugin.lo `test -f 'plugin.c' || echo '$(srcdir)/'`plugin.c
-
 mostlyclean-libtool:
 	-rm -f *.lo
 
diff --git a/src/settings/plugins/keyfile/plugin.c b/src/settings/plugins/keyfile/plugin.c
index 062eb082..ef6613e6 100644
--- a/src/settings/plugins/keyfile/plugin.c
+++ b/src/settings/plugins/keyfile/plugin.c
@@ -582,7 +582,7 @@ dispose (GObject *object)
 	SCPluginKeyfilePrivate *priv = SC_PLUGIN_KEYFILE_GET_PRIVATE (object);
 
 	if (priv->disposed)
-		return;
+		goto out;
 
 	priv->disposed = TRUE;
 
@@ -608,6 +608,7 @@ dispose (GObject *object)
 	if (priv->hash)
 		g_hash_table_destroy (priv->hash);
 
+out:
 	G_OBJECT_CLASS (sc_plugin_keyfile_parent_class)->dispose (object);
 }
 
diff --git a/src/settings/plugins/keyfile/tests/Makefile.am b/src/settings/plugins/keyfile/tests/Makefile.am
index 26e8eafd..c2f5fe3d 100644
--- a/src/settings/plugins/keyfile/tests/Makefile.am
+++ b/src/settings/plugins/keyfile/tests/Makefile.am
@@ -2,25 +2,23 @@ if ENABLE_TESTS
 
 SUBDIRS=keyfiles
 
-INCLUDES = \
+noinst_PROGRAMS = test-keyfile
+
+AM_CPPFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libnm-util \
 	-I$(top_builddir)/libnm-util \
 	-I$(top_srcdir)/libnm-glib \
-	-I$(srcdir)/../
-
-noinst_PROGRAMS = test-keyfile
-
-test_keyfile_SOURCES = \
-	test-keyfile.c
-
-test_keyfile_CPPFLAGS = \
+	-I$(srcdir)/../ \
 	$(GLIB_CFLAGS) \
 	$(DBUS_CFLAGS) \
 	-DTEST_KEYFILES_DIR=\"$(abs_srcdir)/keyfiles\" \
 	-DTEST_SCRATCH_DIR=\"$(abs_builddir)/keyfiles\"
 
+test_keyfile_SOURCES = \
+	test-keyfile.c
+
 test_keyfile_LDADD = \
 	$(builddir)/../libkeyfile-io.la \
 	$(top_builddir)/libnm-glib/libnm-glib.la \
diff --git a/src/settings/plugins/keyfile/tests/Makefile.in b/src/settings/plugins/keyfile/tests/Makefile.in
index 8ee20909..675a9fcf 100644
--- a/src/settings/plugins/keyfile/tests/Makefile.in
+++ b/src/settings/plugins/keyfile/tests/Makefile.in
@@ -103,8 +103,7 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 PROGRAMS = $(noinst_PROGRAMS)
 am__test_keyfile_SOURCES_DIST = test-keyfile.c
-@ENABLE_TESTS_TRUE@am_test_keyfile_OBJECTS =  \
-@ENABLE_TESTS_TRUE@	test_keyfile-test-keyfile.$(OBJEXT)
+@ENABLE_TESTS_TRUE@am_test_keyfile_OBJECTS = test-keyfile.$(OBJEXT)
 test_keyfile_OBJECTS = $(am_test_keyfile_OBJECTS)
 am__DEPENDENCIES_1 =
 @ENABLE_TESTS_TRUE@test_keyfile_DEPENDENCIES =  \
@@ -251,6 +250,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -273,6 +273,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -458,23 +459,21 @@ with_dhcpcd = @with_dhcpcd@
 with_netconfig = @with_netconfig@
 with_resolvconf = @with_resolvconf@
 @ENABLE_TESTS_TRUE@SUBDIRS = keyfiles
-@ENABLE_TESTS_TRUE@INCLUDES = \
+@ENABLE_TESTS_TRUE@AM_CPPFLAGS = \
 @ENABLE_TESTS_TRUE@	-I$(top_srcdir)/include \
 @ENABLE_TESTS_TRUE@	-I$(top_builddir)/include \
 @ENABLE_TESTS_TRUE@	-I$(top_srcdir)/libnm-util \
 @ENABLE_TESTS_TRUE@	-I$(top_builddir)/libnm-util \
 @ENABLE_TESTS_TRUE@	-I$(top_srcdir)/libnm-glib \
-@ENABLE_TESTS_TRUE@	-I$(srcdir)/../
-
-@ENABLE_TESTS_TRUE@test_keyfile_SOURCES = \
-@ENABLE_TESTS_TRUE@	test-keyfile.c
-
-@ENABLE_TESTS_TRUE@test_keyfile_CPPFLAGS = \
+@ENABLE_TESTS_TRUE@	-I$(srcdir)/../ \
 @ENABLE_TESTS_TRUE@	$(GLIB_CFLAGS) \
 @ENABLE_TESTS_TRUE@	$(DBUS_CFLAGS) \
 @ENABLE_TESTS_TRUE@	-DTEST_KEYFILES_DIR=\"$(abs_srcdir)/keyfiles\" \
 @ENABLE_TESTS_TRUE@	-DTEST_SCRATCH_DIR=\"$(abs_builddir)/keyfiles\"
 
+@ENABLE_TESTS_TRUE@test_keyfile_SOURCES = \
+@ENABLE_TESTS_TRUE@	test-keyfile.c
+
 @ENABLE_TESTS_TRUE@test_keyfile_LDADD = \
 @ENABLE_TESTS_TRUE@	$(builddir)/../libkeyfile-io.la \
 @ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-glib/libnm-glib.la \
@@ -535,7 +534,7 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_keyfile-test-keyfile.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-keyfile.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -558,20 +557,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
-test_keyfile-test-keyfile.o: test-keyfile.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_keyfile_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_keyfile-test-keyfile.o -MD -MP -MF $(DEPDIR)/test_keyfile-test-keyfile.Tpo -c -o test_keyfile-test-keyfile.o `test -f 'test-keyfile.c' || echo '$(srcdir)/'`test-keyfile.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_keyfile-test-keyfile.Tpo $(DEPDIR)/test_keyfile-test-keyfile.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test-keyfile.c' object='test_keyfile-test-keyfile.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_keyfile_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_keyfile-test-keyfile.o `test -f 'test-keyfile.c' || echo '$(srcdir)/'`test-keyfile.c
-
-test_keyfile-test-keyfile.obj: test-keyfile.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_keyfile_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_keyfile-test-keyfile.obj -MD -MP -MF $(DEPDIR)/test_keyfile-test-keyfile.Tpo -c -o test_keyfile-test-keyfile.obj `if test -f 'test-keyfile.c'; then $(CYGPATH_W) 'test-keyfile.c'; else $(CYGPATH_W) '$(srcdir)/test-keyfile.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_keyfile-test-keyfile.Tpo $(DEPDIR)/test_keyfile-test-keyfile.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test-keyfile.c' object='test_keyfile-test-keyfile.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_keyfile_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_keyfile-test-keyfile.obj `if test -f 'test-keyfile.c'; then $(CYGPATH_W) 'test-keyfile.c'; else $(CYGPATH_W) '$(srcdir)/test-keyfile.c'; fi`
-
 mostlyclean-libtool:
 	-rm -f *.lo
 
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Makefile.in b/src/settings/plugins/keyfile/tests/keyfiles/Makefile.in
index d479d450..450269b4 100644
--- a/src/settings/plugins/keyfile/tests/keyfiles/Makefile.in
+++ b/src/settings/plugins/keyfile/tests/keyfiles/Makefile.in
@@ -151,6 +151,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -173,6 +174,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
diff --git a/src/settings/tests/Makefile.am b/src/settings/tests/Makefile.am
index 5c0c4565..9471bcb7 100644
--- a/src/settings/tests/Makefile.am
+++ b/src/settings/tests/Makefile.am
@@ -1,10 +1,12 @@
 if ENABLE_TESTS
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libnm-util \
-	-I$(top_srcdir)/src/settings
+	-I$(top_srcdir)/src/settings \
+	$(GLIB_CFLAGS) \
+	$(DBUS_CFLAGS)
 
 noinst_PROGRAMS = \
 	test-wired-defname
@@ -14,10 +16,6 @@ noinst_PROGRAMS = \
 test_wired_defname_SOURCES = \
 	test-wired-defname.c
 
-test_wired_defname_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS)
-
 test_wired_defname_LDADD = \
 	$(top_builddir)/libnm-util/libnm-util.la \
 	$(top_builddir)/src/settings/libtest-settings-utils.la \
diff --git a/src/settings/tests/Makefile.in b/src/settings/tests/Makefile.in
index c0bdfa6f..1a8b6e1c 100644
--- a/src/settings/tests/Makefile.in
+++ b/src/settings/tests/Makefile.in
@@ -103,7 +103,8 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 PROGRAMS = $(noinst_PROGRAMS)
 am__test_wired_defname_SOURCES_DIST = test-wired-defname.c
-@ENABLE_TESTS_TRUE@am_test_wired_defname_OBJECTS = test_wired_defname-test-wired-defname.$(OBJEXT)
+@ENABLE_TESTS_TRUE@am_test_wired_defname_OBJECTS =  \
+@ENABLE_TESTS_TRUE@	test-wired-defname.$(OBJEXT)
 test_wired_defname_OBJECTS = $(am_test_wired_defname_OBJECTS)
 am__DEPENDENCIES_1 =
 @ENABLE_TESTS_TRUE@test_wired_defname_DEPENDENCIES =  \
@@ -207,6 +208,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -229,6 +231,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -413,21 +416,19 @@ with_dhclient = @with_dhclient@
 with_dhcpcd = @with_dhcpcd@
 with_netconfig = @with_netconfig@
 with_resolvconf = @with_resolvconf@
-@ENABLE_TESTS_TRUE@INCLUDES = \
+@ENABLE_TESTS_TRUE@AM_CPPFLAGS = \
 @ENABLE_TESTS_TRUE@	-I$(top_srcdir)/include \
 @ENABLE_TESTS_TRUE@	-I$(top_builddir)/include \
 @ENABLE_TESTS_TRUE@	-I$(top_srcdir)/libnm-util \
-@ENABLE_TESTS_TRUE@	-I$(top_srcdir)/src/settings
+@ENABLE_TESTS_TRUE@	-I$(top_srcdir)/src/settings \
+@ENABLE_TESTS_TRUE@	$(GLIB_CFLAGS) \
+@ENABLE_TESTS_TRUE@	$(DBUS_CFLAGS)
 
 
 ####### wired defname test #######
 @ENABLE_TESTS_TRUE@test_wired_defname_SOURCES = \
 @ENABLE_TESTS_TRUE@	test-wired-defname.c
 
-@ENABLE_TESTS_TRUE@test_wired_defname_CPPFLAGS = \
-@ENABLE_TESTS_TRUE@	$(GLIB_CFLAGS) \
-@ENABLE_TESTS_TRUE@	$(DBUS_CFLAGS)
-
 @ENABLE_TESTS_TRUE@test_wired_defname_LDADD = \
 @ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
 @ENABLE_TESTS_TRUE@	$(top_builddir)/src/settings/libtest-settings-utils.la \
@@ -488,7 +489,7 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_wired_defname-test-wired-defname.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-wired-defname.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -511,20 +512,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
-test_wired_defname-test-wired-defname.o: test-wired-defname.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_wired_defname_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_wired_defname-test-wired-defname.o -MD -MP -MF $(DEPDIR)/test_wired_defname-test-wired-defname.Tpo -c -o test_wired_defname-test-wired-defname.o `test -f 'test-wired-defname.c' || echo '$(srcdir)/'`test-wired-defname.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_wired_defname-test-wired-defname.Tpo $(DEPDIR)/test_wired_defname-test-wired-defname.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test-wired-defname.c' object='test_wired_defname-test-wired-defname.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_wired_defname_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_wired_defname-test-wired-defname.o `test -f 'test-wired-defname.c' || echo '$(srcdir)/'`test-wired-defname.c
-
-test_wired_defname-test-wired-defname.obj: test-wired-defname.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_wired_defname_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_wired_defname-test-wired-defname.obj -MD -MP -MF $(DEPDIR)/test_wired_defname-test-wired-defname.Tpo -c -o test_wired_defname-test-wired-defname.obj `if test -f 'test-wired-defname.c'; then $(CYGPATH_W) 'test-wired-defname.c'; else $(CYGPATH_W) '$(srcdir)/test-wired-defname.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_wired_defname-test-wired-defname.Tpo $(DEPDIR)/test_wired_defname-test-wired-defname.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test-wired-defname.c' object='test_wired_defname-test-wired-defname.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_wired_defname_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_wired_defname-test-wired-defname.obj `if test -f 'test-wired-defname.c'; then $(CYGPATH_W) 'test-wired-defname.c'; else $(CYGPATH_W) '$(srcdir)/test-wired-defname.c'; fi`
-
 mostlyclean-libtool:
 	-rm -f *.lo
 
diff --git a/src/supplicant-manager/Makefile.am b/src/supplicant-manager/Makefile.am
index 74ec9c38..a4d2f250 100644
--- a/src/supplicant-manager/Makefile.am
+++ b/src/supplicant-manager/Makefile.am
@@ -1,6 +1,8 @@
 SUBDIRS = . tests
 
-INCLUDES = \
+noinst_LTLIBRARIES = libsupplicant-manager.la
+
+libsupplicant_manager_la_CPPFLAGS = \
 	-I${top_srcdir}/src \
 	-I${top_builddir}/src/generated \
 	-I${top_srcdir}/src/generated \
@@ -8,9 +10,11 @@ INCLUDES = \
 	-I${top_builddir}/include \
 	-I${top_srcdir}/include \
 	-I${top_builddir}/libnm-util \
-	-I${top_srcdir}/libnm-util
-
-noinst_LTLIBRARIES = libsupplicant-manager.la
+	-I${top_srcdir}/libnm-util \
+	$(DBUS_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	-DNM_PKGDATADIR=\"$(pkgdatadir)\" \
+	-DNM_LOCALSTATEDIR=\"$(localstatedir)\"
 
 libsupplicant_manager_la_SOURCES = \
 	nm-supplicant-types.h \
@@ -23,12 +27,6 @@ libsupplicant_manager_la_SOURCES = \
 	nm-supplicant-settings-verify.h \
 	nm-supplicant-settings-verify.c
 
-libsupplicant_manager_la_CPPFLAGS = \
-	$(DBUS_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	-DNM_PKGDATADIR=\"$(pkgdatadir)\" \
-	-DNM_LOCALSTATEDIR=\"$(localstatedir)\"
-
 libsupplicant_manager_la_LIBADD = \
 	$(top_builddir)/src/logging/libnm-logging.la \
 	$(DBUS_LIBS) \
diff --git a/src/supplicant-manager/Makefile.in b/src/supplicant-manager/Makefile.in
index 21fb2e47..6a46202a 100644
--- a/src/supplicant-manager/Makefile.in
+++ b/src/supplicant-manager/Makefile.in
@@ -251,6 +251,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -273,6 +274,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -458,7 +460,8 @@ with_dhcpcd = @with_dhcpcd@
 with_netconfig = @with_netconfig@
 with_resolvconf = @with_resolvconf@
 SUBDIRS = . tests
-INCLUDES = \
+noinst_LTLIBRARIES = libsupplicant-manager.la
+libsupplicant_manager_la_CPPFLAGS = \
 	-I${top_srcdir}/src \
 	-I${top_builddir}/src/generated \
 	-I${top_srcdir}/src/generated \
@@ -466,9 +469,12 @@ INCLUDES = \
 	-I${top_builddir}/include \
 	-I${top_srcdir}/include \
 	-I${top_builddir}/libnm-util \
-	-I${top_srcdir}/libnm-util
+	-I${top_srcdir}/libnm-util \
+	$(DBUS_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	-DNM_PKGDATADIR=\"$(pkgdatadir)\" \
+	-DNM_LOCALSTATEDIR=\"$(localstatedir)\"
 
-noinst_LTLIBRARIES = libsupplicant-manager.la
 libsupplicant_manager_la_SOURCES = \
 	nm-supplicant-types.h \
 	nm-supplicant-manager.h \
@@ -480,12 +486,6 @@ libsupplicant_manager_la_SOURCES = \
 	nm-supplicant-settings-verify.h \
 	nm-supplicant-settings-verify.c
 
-libsupplicant_manager_la_CPPFLAGS = \
-	$(DBUS_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	-DNM_PKGDATADIR=\"$(pkgdatadir)\" \
-	-DNM_LOCALSTATEDIR=\"$(localstatedir)\"
-
 libsupplicant_manager_la_LIBADD = \
 	$(top_builddir)/src/logging/libnm-logging.la \
 	$(DBUS_LIBS) \
diff --git a/src/supplicant-manager/tests/Makefile.am b/src/supplicant-manager/tests/Makefile.am
index 20ba9cc5..58132a60 100644
--- a/src/supplicant-manager/tests/Makefile.am
+++ b/src/supplicant-manager/tests/Makefile.am
@@ -1,22 +1,20 @@
 if ENABLE_TESTS
 
-INCLUDES = \
+noinst_PROGRAMS = test-supplicant-config
+
+test_supplicant_config_CPPFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libnm-util \
 	-I$(top_builddir)/libnm-util \
 	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/supplicant-manager
-
-noinst_PROGRAMS = test-supplicant-config
+	-I$(top_srcdir)/src/supplicant-manager \
+	$(GLIB_CFLAGS) \
+	$(DBUS_CFLAGS)
 
 test_supplicant_config_SOURCES = \
 	test-supplicant-config.c
 
-test_supplicant_config_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS)
-
 test_supplicant_config_LDADD = \
 	$(top_builddir)/libnm-util/libnm-util.la \
 	$(top_builddir)/src/supplicant-manager/libsupplicant-manager.la \
diff --git a/src/supplicant-manager/tests/Makefile.in b/src/supplicant-manager/tests/Makefile.in
index dcd90d61..11dc6d5c 100644
--- a/src/supplicant-manager/tests/Makefile.in
+++ b/src/supplicant-manager/tests/Makefile.in
@@ -207,6 +207,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -229,6 +230,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -413,21 +415,19 @@ with_dhclient = @with_dhclient@
 with_dhcpcd = @with_dhcpcd@
 with_netconfig = @with_netconfig@
 with_resolvconf = @with_resolvconf@
-@ENABLE_TESTS_TRUE@INCLUDES = \
+@ENABLE_TESTS_TRUE@test_supplicant_config_CPPFLAGS = \
 @ENABLE_TESTS_TRUE@	-I$(top_srcdir)/include \
 @ENABLE_TESTS_TRUE@	-I$(top_builddir)/include \
 @ENABLE_TESTS_TRUE@	-I$(top_srcdir)/libnm-util \
 @ENABLE_TESTS_TRUE@	-I$(top_builddir)/libnm-util \
 @ENABLE_TESTS_TRUE@	-I$(top_srcdir)/src \
-@ENABLE_TESTS_TRUE@	-I$(top_srcdir)/src/supplicant-manager
+@ENABLE_TESTS_TRUE@	-I$(top_srcdir)/src/supplicant-manager \
+@ENABLE_TESTS_TRUE@	$(GLIB_CFLAGS) \
+@ENABLE_TESTS_TRUE@	$(DBUS_CFLAGS)
 
 @ENABLE_TESTS_TRUE@test_supplicant_config_SOURCES = \
 @ENABLE_TESTS_TRUE@	test-supplicant-config.c
 
-@ENABLE_TESTS_TRUE@test_supplicant_config_CPPFLAGS = \
-@ENABLE_TESTS_TRUE@	$(GLIB_CFLAGS) \
-@ENABLE_TESTS_TRUE@	$(DBUS_CFLAGS)
-
 @ENABLE_TESTS_TRUE@test_supplicant_config_LDADD = \
 @ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
 @ENABLE_TESTS_TRUE@	$(top_builddir)/src/supplicant-manager/libsupplicant-manager.la \
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 8f406361..77e6c0f5 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -1,13 +1,15 @@
 if ENABLE_TESTS
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libnm-util \
 	-I$(top_builddir)/libnm-util \
 	-I$(top_srcdir)/src/dhcp-manager \
 	-I$(top_srcdir)/src \
-	-I$(top_builddir)/src
+	-I$(top_builddir)/src \
+	$(GLIB_CFLAGS) \
+	$(DBUS_CFLAGS)
 
 noinst_PROGRAMS = \
 	test-dhcp-options \
@@ -20,8 +22,7 @@ test_dhcp_options_SOURCES = \
 	test-dhcp-options.c
 
 test_dhcp_options_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS) \
+	$(AM_CPPFLAGS) \
 	-DDHCLIENT_PATH=\"$(DHCLIENT_PATH)\" \
 	-DDHCPCD_PATH=\"$(DHCPCD_PATH)\"
 
@@ -37,9 +38,6 @@ test_dhcp_options_LDADD = \
 test_policy_hosts_SOURCES = \
 	test-policy-hosts.c
 
-test_policy_hosts_CPPFLAGS = \
-	$(GLIB_CFLAGS)
-
 test_policy_hosts_LDADD = \
 	-ldl \
 	$(top_builddir)/src/libtest-policy-hosts.la \
@@ -50,10 +48,6 @@ test_policy_hosts_LDADD = \
 test_wifi_ap_utils_SOURCES = \
 	test-wifi-ap-utils.c
 
-test_wifi_ap_utils_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS)
-
 test_wifi_ap_utils_LDADD = \
 	$(top_builddir)/libnm-util/libnm-util.la \
 	$(top_builddir)/src/libtest-wifi-ap-utils.la \
diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in
index c161a609..177cc4e9 100644
--- a/src/tests/Makefile.in
+++ b/src/tests/Makefile.in
@@ -118,12 +118,14 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
 am__test_policy_hosts_SOURCES_DIST = test-policy-hosts.c
-@ENABLE_TESTS_TRUE@am_test_policy_hosts_OBJECTS = test_policy_hosts-test-policy-hosts.$(OBJEXT)
+@ENABLE_TESTS_TRUE@am_test_policy_hosts_OBJECTS =  \
+@ENABLE_TESTS_TRUE@	test-policy-hosts.$(OBJEXT)
 test_policy_hosts_OBJECTS = $(am_test_policy_hosts_OBJECTS)
 @ENABLE_TESTS_TRUE@test_policy_hosts_DEPENDENCIES = $(top_builddir)/src/libtest-policy-hosts.la \
 @ENABLE_TESTS_TRUE@	$(am__DEPENDENCIES_1)
 am__test_wifi_ap_utils_SOURCES_DIST = test-wifi-ap-utils.c
-@ENABLE_TESTS_TRUE@am_test_wifi_ap_utils_OBJECTS = test_wifi_ap_utils-test-wifi-ap-utils.$(OBJEXT)
+@ENABLE_TESTS_TRUE@am_test_wifi_ap_utils_OBJECTS =  \
+@ENABLE_TESTS_TRUE@	test-wifi-ap-utils.$(OBJEXT)
 test_wifi_ap_utils_OBJECTS = $(am_test_wifi_ap_utils_OBJECTS)
 @ENABLE_TESTS_TRUE@test_wifi_ap_utils_DEPENDENCIES =  \
 @ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
@@ -225,6 +227,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -247,6 +250,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -431,14 +435,16 @@ with_dhclient = @with_dhclient@
 with_dhcpcd = @with_dhcpcd@
 with_netconfig = @with_netconfig@
 with_resolvconf = @with_resolvconf@
-@ENABLE_TESTS_TRUE@INCLUDES = \
+@ENABLE_TESTS_TRUE@AM_CPPFLAGS = \
 @ENABLE_TESTS_TRUE@	-I$(top_srcdir)/include \
 @ENABLE_TESTS_TRUE@	-I$(top_builddir)/include \
 @ENABLE_TESTS_TRUE@	-I$(top_srcdir)/libnm-util \
 @ENABLE_TESTS_TRUE@	-I$(top_builddir)/libnm-util \
 @ENABLE_TESTS_TRUE@	-I$(top_srcdir)/src/dhcp-manager \
 @ENABLE_TESTS_TRUE@	-I$(top_srcdir)/src \
-@ENABLE_TESTS_TRUE@	-I$(top_builddir)/src
+@ENABLE_TESTS_TRUE@	-I$(top_builddir)/src \
+@ENABLE_TESTS_TRUE@	$(GLIB_CFLAGS) \
+@ENABLE_TESTS_TRUE@	$(DBUS_CFLAGS)
 
 
 ####### DHCP options test #######
@@ -446,8 +452,7 @@ with_resolvconf = @with_resolvconf@
 @ENABLE_TESTS_TRUE@	test-dhcp-options.c
 
 @ENABLE_TESTS_TRUE@test_dhcp_options_CPPFLAGS = \
-@ENABLE_TESTS_TRUE@	$(GLIB_CFLAGS) \
-@ENABLE_TESTS_TRUE@	$(DBUS_CFLAGS) \
+@ENABLE_TESTS_TRUE@	$(AM_CPPFLAGS) \
 @ENABLE_TESTS_TRUE@	-DDHCLIENT_PATH=\"$(DHCLIENT_PATH)\" \
 @ENABLE_TESTS_TRUE@	-DDHCPCD_PATH=\"$(DHCPCD_PATH)\"
 
@@ -463,9 +468,6 @@ with_resolvconf = @with_resolvconf@
 @ENABLE_TESTS_TRUE@test_policy_hosts_SOURCES = \
 @ENABLE_TESTS_TRUE@	test-policy-hosts.c
 
-@ENABLE_TESTS_TRUE@test_policy_hosts_CPPFLAGS = \
-@ENABLE_TESTS_TRUE@	$(GLIB_CFLAGS)
-
 @ENABLE_TESTS_TRUE@test_policy_hosts_LDADD = \
 @ENABLE_TESTS_TRUE@	-ldl \
 @ENABLE_TESTS_TRUE@	$(top_builddir)/src/libtest-policy-hosts.la \
@@ -476,10 +478,6 @@ with_resolvconf = @with_resolvconf@
 @ENABLE_TESTS_TRUE@test_wifi_ap_utils_SOURCES = \
 @ENABLE_TESTS_TRUE@	test-wifi-ap-utils.c
 
-@ENABLE_TESTS_TRUE@test_wifi_ap_utils_CPPFLAGS = \
-@ENABLE_TESTS_TRUE@	$(GLIB_CFLAGS) \
-@ENABLE_TESTS_TRUE@	$(DBUS_CFLAGS)
-
 @ENABLE_TESTS_TRUE@test_wifi_ap_utils_LDADD = \
 @ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
 @ENABLE_TESTS_TRUE@	$(top_builddir)/src/libtest-wifi-ap-utils.la \
@@ -551,9 +549,9 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-policy-hosts.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-wifi-ap-utils.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_dhcp_options-test-dhcp-options.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_policy_hosts-test-policy-hosts.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_wifi_ap_utils-test-wifi-ap-utils.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -590,34 +588,6 @@ test_dhcp_options-test-dhcp-options.obj: test-dhcp-options.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_dhcp_options_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_dhcp_options-test-dhcp-options.obj `if test -f 'test-dhcp-options.c'; then $(CYGPATH_W) 'test-dhcp-options.c'; else $(CYGPATH_W) '$(srcdir)/test-dhcp-options.c'; fi`
 
-test_policy_hosts-test-policy-hosts.o: test-policy-hosts.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_policy_hosts_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_policy_hosts-test-policy-hosts.o -MD -MP -MF $(DEPDIR)/test_policy_hosts-test-policy-hosts.Tpo -c -o test_policy_hosts-test-policy-hosts.o `test -f 'test-policy-hosts.c' || echo '$(srcdir)/'`test-policy-hosts.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_policy_hosts-test-policy-hosts.Tpo $(DEPDIR)/test_policy_hosts-test-policy-hosts.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test-policy-hosts.c' object='test_policy_hosts-test-policy-hosts.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_policy_hosts_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_policy_hosts-test-policy-hosts.o `test -f 'test-policy-hosts.c' || echo '$(srcdir)/'`test-policy-hosts.c
-
-test_policy_hosts-test-policy-hosts.obj: test-policy-hosts.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_policy_hosts_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_policy_hosts-test-policy-hosts.obj -MD -MP -MF $(DEPDIR)/test_policy_hosts-test-policy-hosts.Tpo -c -o test_policy_hosts-test-policy-hosts.obj `if test -f 'test-policy-hosts.c'; then $(CYGPATH_W) 'test-policy-hosts.c'; else $(CYGPATH_W) '$(srcdir)/test-policy-hosts.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_policy_hosts-test-policy-hosts.Tpo $(DEPDIR)/test_policy_hosts-test-policy-hosts.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test-policy-hosts.c' object='test_policy_hosts-test-policy-hosts.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_policy_hosts_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_policy_hosts-test-policy-hosts.obj `if test -f 'test-policy-hosts.c'; then $(CYGPATH_W) 'test-policy-hosts.c'; else $(CYGPATH_W) '$(srcdir)/test-policy-hosts.c'; fi`
-
-test_wifi_ap_utils-test-wifi-ap-utils.o: test-wifi-ap-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_wifi_ap_utils_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_wifi_ap_utils-test-wifi-ap-utils.o -MD -MP -MF $(DEPDIR)/test_wifi_ap_utils-test-wifi-ap-utils.Tpo -c -o test_wifi_ap_utils-test-wifi-ap-utils.o `test -f 'test-wifi-ap-utils.c' || echo '$(srcdir)/'`test-wifi-ap-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_wifi_ap_utils-test-wifi-ap-utils.Tpo $(DEPDIR)/test_wifi_ap_utils-test-wifi-ap-utils.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test-wifi-ap-utils.c' object='test_wifi_ap_utils-test-wifi-ap-utils.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_wifi_ap_utils_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_wifi_ap_utils-test-wifi-ap-utils.o `test -f 'test-wifi-ap-utils.c' || echo '$(srcdir)/'`test-wifi-ap-utils.c
-
-test_wifi_ap_utils-test-wifi-ap-utils.obj: test-wifi-ap-utils.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_wifi_ap_utils_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test_wifi_ap_utils-test-wifi-ap-utils.obj -MD -MP -MF $(DEPDIR)/test_wifi_ap_utils-test-wifi-ap-utils.Tpo -c -o test_wifi_ap_utils-test-wifi-ap-utils.obj `if test -f 'test-wifi-ap-utils.c'; then $(CYGPATH_W) 'test-wifi-ap-utils.c'; else $(CYGPATH_W) '$(srcdir)/test-wifi-ap-utils.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_wifi_ap_utils-test-wifi-ap-utils.Tpo $(DEPDIR)/test_wifi_ap_utils-test-wifi-ap-utils.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test-wifi-ap-utils.c' object='test_wifi_ap_utils-test-wifi-ap-utils.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_wifi_ap_utils_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test_wifi_ap_utils-test-wifi-ap-utils.obj `if test -f 'test-wifi-ap-utils.c'; then $(CYGPATH_W) 'test-wifi-ap-utils.c'; else $(CYGPATH_W) '$(srcdir)/test-wifi-ap-utils.c'; fi`
-
 mostlyclean-libtool:
 	-rm -f *.lo
 
diff --git a/src/vpn-manager/Makefile.am b/src/vpn-manager/Makefile.am
index a525ce20..94809ddd 100644
--- a/src/vpn-manager/Makefile.am
+++ b/src/vpn-manager/Makefile.am
@@ -1,4 +1,14 @@
-INCLUDES = \
+noinst_LTLIBRARIES = libvpn-manager.la
+
+libvpn_manager_la_SOURCES = \
+	nm-vpn-manager.c \
+	nm-vpn-manager.h \
+	nm-vpn-service.c \
+	nm-vpn-service.h \
+	nm-vpn-connection.c \
+	nm-vpn-connection.h
+
+libvpn_manager_la_CPPFLAGS = \
 	-I${top_srcdir} \
 	-I${top_builddir}/include \
 	-I${top_srcdir}/include \
@@ -10,24 +20,11 @@ INCLUDES = \
 	-I${top_srcdir}/src/posix-signals \
 	-I${top_srcdir}/src \
 	-I${top_srcdir}/src/dns-manager \
+	$(LIBNL_CFLAGS) \
+	$(DBUS_CFLAGS) \
+	$(GLIB_CFLAGS) \
 	-DVPN_NAME_FILES_DIR=\""$(sysconfdir)/NetworkManager/VPN"\"
 
-
-noinst_LTLIBRARIES = libvpn-manager.la
-
-libvpn_manager_la_SOURCES = \
-	nm-vpn-manager.c \
-	nm-vpn-manager.h \
-	nm-vpn-service.c \
-	nm-vpn-service.h \
-	nm-vpn-connection.c \
-	nm-vpn-connection.h
-
-libvpn_manager_la_CPPFLAGS =	\
-	$(LIBNL_CFLAGS)		\
-	$(DBUS_CFLAGS)		\
-	$(GLIB_CFLAGS)
-
 libvpn_manager_la_LIBADD = \
 	$(top_builddir)/src/generated/libnm-generated.la \
 	$(top_builddir)/src/logging/libnm-logging.la \
diff --git a/src/vpn-manager/Makefile.in b/src/vpn-manager/Makefile.in
index 5457536c..94e33078 100644
--- a/src/vpn-manager/Makefile.in
+++ b/src/vpn-manager/Makefile.in
@@ -209,6 +209,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -231,6 +232,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -415,7 +417,16 @@ with_dhclient = @with_dhclient@
 with_dhcpcd = @with_dhcpcd@
 with_netconfig = @with_netconfig@
 with_resolvconf = @with_resolvconf@
-INCLUDES = \
+noinst_LTLIBRARIES = libvpn-manager.la
+libvpn_manager_la_SOURCES = \
+	nm-vpn-manager.c \
+	nm-vpn-manager.h \
+	nm-vpn-service.c \
+	nm-vpn-service.h \
+	nm-vpn-connection.c \
+	nm-vpn-connection.h
+
+libvpn_manager_la_CPPFLAGS = \
 	-I${top_srcdir} \
 	-I${top_builddir}/include \
 	-I${top_srcdir}/include \
@@ -427,22 +438,11 @@ INCLUDES = \
 	-I${top_srcdir}/src/posix-signals \
 	-I${top_srcdir}/src \
 	-I${top_srcdir}/src/dns-manager \
+	$(LIBNL_CFLAGS) \
+	$(DBUS_CFLAGS) \
+	$(GLIB_CFLAGS) \
 	-DVPN_NAME_FILES_DIR=\""$(sysconfdir)/NetworkManager/VPN"\"
 
-noinst_LTLIBRARIES = libvpn-manager.la
-libvpn_manager_la_SOURCES = \
-	nm-vpn-manager.c \
-	nm-vpn-manager.h \
-	nm-vpn-service.c \
-	nm-vpn-service.h \
-	nm-vpn-connection.c \
-	nm-vpn-connection.h
-
-libvpn_manager_la_CPPFLAGS = \
-	$(LIBNL_CFLAGS)		\
-	$(DBUS_CFLAGS)		\
-	$(GLIB_CFLAGS)
-
 libvpn_manager_la_LIBADD = \
 	$(top_builddir)/src/generated/libnm-generated.la \
 	$(top_builddir)/src/logging/libnm-logging.la \
diff --git a/src/wifi/Makefile.am b/src/wifi/Makefile.am
index c9a1b474..41007432 100644
--- a/src/wifi/Makefile.am
+++ b/src/wifi/Makefile.am
@@ -1,11 +1,3 @@
-INCLUDES = \
-	-I${top_srcdir}/include \
-	-I${top_builddir}/include \
-	-I${top_srcdir}/src/logging \
-	-I${top_srcdir}/libnm-util \
-	-I${top_builddir}/libnm-util \
-	-I${top_srcdir}/src
-
 noinst_LTLIBRARIES = libwifi-utils.la
 
 libwifi_utils_la_SOURCES = \
@@ -20,6 +12,12 @@ libwifi_utils_la_SOURCES += wifi-utils-wext.c wifi-utils-wext.h
 endif
 
 libwifi_utils_la_CPPFLAGS = \
+	-I${top_srcdir}/include \
+	-I${top_builddir}/include \
+	-I${top_srcdir}/src/logging \
+	-I${top_srcdir}/libnm-util \
+	-I${top_builddir}/libnm-util \
+	-I${top_srcdir}/src \
 	$(GLIB_CFLAGS) \
 	$(LIBNL_CFLAGS)
 
diff --git a/src/wifi/Makefile.in b/src/wifi/Makefile.in
index 20ccb537..cace5d68 100644
--- a/src/wifi/Makefile.in
+++ b/src/wifi/Makefile.in
@@ -211,6 +211,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -233,6 +234,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -417,19 +419,17 @@ with_dhclient = @with_dhclient@
 with_dhcpcd = @with_dhcpcd@
 with_netconfig = @with_netconfig@
 with_resolvconf = @with_resolvconf@
-INCLUDES = \
-	-I${top_srcdir}/include \
-	-I${top_builddir}/include \
-	-I${top_srcdir}/src/logging \
-	-I${top_srcdir}/libnm-util \
-	-I${top_builddir}/libnm-util \
-	-I${top_srcdir}/src
-
 noinst_LTLIBRARIES = libwifi-utils.la
 libwifi_utils_la_SOURCES = wifi-utils.c wifi-utils.h \
 	wifi-utils-private.h wifi-utils-nl80211.c wifi-utils-nl80211.h \
 	$(am__append_1)
 libwifi_utils_la_CPPFLAGS = \
+	-I${top_srcdir}/include \
+	-I${top_builddir}/include \
+	-I${top_srcdir}/src/logging \
+	-I${top_srcdir}/libnm-util \
+	-I${top_builddir}/libnm-util \
+	-I${top_srcdir}/src \
 	$(GLIB_CFLAGS) \
 	$(LIBNL_CFLAGS)
 
diff --git a/src/wifi/wifi-utils-nl80211.c b/src/wifi/wifi-utils-nl80211.c
index 486a6951..5f909c44 100644
--- a/src/wifi/wifi-utils-nl80211.c
+++ b/src/wifi/wifi-utils-nl80211.c
@@ -132,6 +132,15 @@ _nl80211_send_and_recv (struct nl_sock *nl_sock,
 	while (!done) {
 		err = nl_recvmsgs (nl_sock, cb);
 		if (err && err != -NLE_AGAIN) {
+			/* Kernel scan list can change while we are dumping it, as new scan
+			 * results from H/W can arrive. BSS info is assured to be consistent
+			 * and we don't need consistent view of whole scan list. Hence do
+			 * not warn on DUMP_INTR error for get scan command.
+			 */
+			if (err == -NLE_DUMP_INTR &&
+			    genlmsg_hdr(nlmsg_hdr(msg))->cmd == NL80211_CMD_GET_SCAN)
+				break;
+
 			nm_log_warn (LOGD_WIFI, "nl_recvmsgs() error: (%d) %s",
 			             err, nl_geterror (err));
 			break;
diff --git a/src/wimax/Makefile.am b/src/wimax/Makefile.am
index caf017d8..55c7046b 100644
--- a/src/wimax/Makefile.am
+++ b/src/wimax/Makefile.am
@@ -1,13 +1,3 @@
-INCLUDES = \
-	-I${top_srcdir}/src \
-	-I${top_builddir}/src/generated \
-	-I${top_srcdir}/src/generated \
-	-I${top_srcdir}/src/logging \
-	-I${top_builddir}/include \
-	-I${top_srcdir}/include \
-	-I${top_builddir}/libnm-util \
-	-I${top_srcdir}/libnm-util
-
 pkglib_LTLIBRARIES = libnm-device-plugin-wimax.la
 
 libnm_device_plugin_wimax_la_SOURCES = \
@@ -23,6 +13,14 @@ libnm_device_plugin_wimax_la_SOURCES = \
 	iwmxsdk.h
 
 libnm_device_plugin_wimax_la_CPPFLAGS = \
+	-I${top_srcdir}/src \
+	-I${top_builddir}/src/generated \
+	-I${top_srcdir}/src/generated \
+	-I${top_srcdir}/src/logging \
+	-I${top_builddir}/include \
+	-I${top_srcdir}/include \
+	-I${top_builddir}/libnm-util \
+	-I${top_srcdir}/libnm-util \
 	$(DBUS_CFLAGS) \
 	$(IWMX_SDK_CFLAGS) \
 	$(LIBNL_CFLAGS) \
diff --git a/src/wimax/Makefile.in b/src/wimax/Makefile.in
index aacd5abb..5210414d 100644
--- a/src/wimax/Makefile.in
+++ b/src/wimax/Makefile.in
@@ -242,6 +242,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -264,6 +265,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -448,16 +450,6 @@ with_dhclient = @with_dhclient@
 with_dhcpcd = @with_dhcpcd@
 with_netconfig = @with_netconfig@
 with_resolvconf = @with_resolvconf@
-INCLUDES = \
-	-I${top_srcdir}/src \
-	-I${top_builddir}/src/generated \
-	-I${top_srcdir}/src/generated \
-	-I${top_srcdir}/src/logging \
-	-I${top_builddir}/include \
-	-I${top_srcdir}/include \
-	-I${top_builddir}/libnm-util \
-	-I${top_srcdir}/libnm-util
-
 pkglib_LTLIBRARIES = libnm-device-plugin-wimax.la
 libnm_device_plugin_wimax_la_SOURCES = \
 	nm-wimax-factory.c \
@@ -472,6 +464,14 @@ libnm_device_plugin_wimax_la_SOURCES = \
 	iwmxsdk.h
 
 libnm_device_plugin_wimax_la_CPPFLAGS = \
+	-I${top_srcdir}/src \
+	-I${top_builddir}/src/generated \
+	-I${top_srcdir}/src/generated \
+	-I${top_srcdir}/src/logging \
+	-I${top_builddir}/include \
+	-I${top_srcdir}/include \
+	-I${top_builddir}/libnm-util \
+	-I${top_srcdir}/libnm-util \
 	$(DBUS_CFLAGS) \
 	$(IWMX_SDK_CFLAGS) \
 	$(LIBNL_CFLAGS) \
diff --git a/test/Makefile.am b/test/Makefile.am
index bdfd306d..4b7ca439 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,11 +1,10 @@
-INCLUDES = -I${top_srcdir}                    \
-           -I${top_srcdir}/libnm-util         \
-           -I${top_builddir}/libnm-util         \
-           -I${top_srcdir}/libnm-glib         \
-           -I${top_srcdir}/include            \
-	   -I${top_builddir}/include
-
 AM_CPPFLAGS = \
+	-I${top_srcdir} \
+	-I${top_srcdir}/libnm-util \
+	-I${top_builddir}/libnm-util \
+	-I${top_srcdir}/libnm-glib \
+	-I${top_srcdir}/include  \
+	-I${top_builddir}/include \
 	$(DBUS_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	-DBINDIR=\"$(bindir)\" \
diff --git a/test/Makefile.in b/test/Makefile.in
index f599ca3a..f904b534 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -224,6 +224,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -246,6 +247,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -430,14 +432,13 @@ with_dhclient = @with_dhclient@
 with_dhcpcd = @with_dhcpcd@
 with_netconfig = @with_netconfig@
 with_resolvconf = @with_resolvconf@
-INCLUDES = -I${top_srcdir}                    \
-           -I${top_srcdir}/libnm-util         \
-           -I${top_builddir}/libnm-util         \
-           -I${top_srcdir}/libnm-glib         \
-           -I${top_srcdir}/include            \
-	   -I${top_builddir}/include
-
 AM_CPPFLAGS = \
+	-I${top_srcdir} \
+	-I${top_srcdir}/libnm-util \
+	-I${top_builddir}/libnm-util \
+	-I${top_srcdir}/libnm-glib \
+	-I${top_srcdir}/include  \
+	-I${top_builddir}/include \
 	$(DBUS_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	-DBINDIR=\"$(bindir)\" \
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 38d861ec..abb7c5fa 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,11 +1,5 @@
 GENERATE_SETTINGS_SPEC_SOURCE = generate-settings-spec.c
 
-INCLUDES = \
-	-I$(top_srcdir)/include \
-	-I$(top_builddir)/include \
-	-I$(top_srcdir)/libnm-util \
-	-I$(top_builddir)/libnm-util
-
 noinst_PROGRAMS = \
 	generate-settings-spec
 
@@ -13,6 +7,10 @@ generate_settings_spec_SOURCES = \
 	$(GENERATE_SETTINGS_SPEC_SOURCE)
 
 generate_settings_spec_CPPFLAGS = \
+	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include \
+	-I$(top_srcdir)/libnm-util \
+	-I$(top_builddir)/libnm-util \
 	$(GLIB_CFLAGS) \
 	$(DBUS_CFLAGS)
 
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 5fee27e2..9b0005b1 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -207,6 +207,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -229,6 +230,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -414,16 +416,14 @@ with_dhcpcd = @with_dhcpcd@
 with_netconfig = @with_netconfig@
 with_resolvconf = @with_resolvconf@
 GENERATE_SETTINGS_SPEC_SOURCE = generate-settings-spec.c
-INCLUDES = \
-	-I$(top_srcdir)/include \
-	-I$(top_builddir)/include \
-	-I$(top_srcdir)/libnm-util \
-	-I$(top_builddir)/libnm-util
-
 generate_settings_spec_SOURCES = \
 	$(GENERATE_SETTINGS_SPEC_SOURCE)
 
 generate_settings_spec_CPPFLAGS = \
+	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include \
+	-I$(top_srcdir)/libnm-util \
+	-I$(top_builddir)/libnm-util \
 	$(GLIB_CFLAGS) \
 	$(DBUS_CFLAGS)
 
diff --git a/vapi/Makefile.in b/vapi/Makefile.in
index 6ec20502..4fec961d 100644
--- a/vapi/Makefile.in
+++ b/vapi/Makefile.in
@@ -220,6 +220,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -242,6 +243,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
-- 
cgit 1.3.0-6-gf8a5