From 33491bc4279481db8ae47213e34a6d695a0e8830 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 6 Jul 2014 02:16:10 +0200 Subject: Imported Upstream version 0.9.10.0 --- introspection/Makefile.am | 7 ++ introspection/Makefile.in | 28 ++++++- introspection/all.xml.in | 2 + introspection/nm-active-connection.xml | 73 ++++++++++++++++-- introspection/nm-agent-manager.xml | 18 +++++ introspection/nm-device-generic.xml | 27 +++++++ introspection/nm-device-gre.xml | 81 ++++++++++++++++++++ introspection/nm-device-macvlan.xml | 33 +++++++++ introspection/nm-device-team.xml | 34 +++++++++ introspection/nm-device-tun.xml | 55 ++++++++++++++ introspection/nm-device-veth.xml | 21 ++++++ introspection/nm-device-vxlan.xml | 122 +++++++++++++++++++++++++++++++ introspection/nm-device-wifi.xml | 28 ++++++- introspection/nm-device-wimax.xml | 7 ++ introspection/nm-device.xml | 52 ++++++++++++- introspection/nm-ip4-config.xml | 32 +++++--- introspection/nm-ip6-config.xml | 18 ++++- introspection/nm-manager.xml | 40 ++++++++-- introspection/nm-secret-agent.xml | 63 +++++++++++++++- introspection/nm-settings-connection.xml | 63 ++++++++++++++-- introspection/nm-settings.xml | 99 +++++++++++++++++++++++++ introspection/nm-vpn-plugin.xml | 76 ++++++++++++++++++- introspection/vpn-errors.xml | 46 +++++++++--- 23 files changed, 974 insertions(+), 51 deletions(-) create mode 100644 introspection/nm-device-generic.xml create mode 100644 introspection/nm-device-gre.xml create mode 100644 introspection/nm-device-macvlan.xml create mode 100644 introspection/nm-device-team.xml create mode 100644 introspection/nm-device-tun.xml create mode 100644 introspection/nm-device-veth.xml create mode 100644 introspection/nm-device-vxlan.xml (limited to 'introspection') diff --git a/introspection/Makefile.am b/introspection/Makefile.am index 3850a234..03015579 100644 --- a/introspection/Makefile.am +++ b/introspection/Makefile.am @@ -13,8 +13,15 @@ EXTRA_DIST = \ nm-device-wimax.xml \ nm-device-infiniband.xml \ nm-device-bond.xml \ + nm-device-team.xml \ nm-device-bridge.xml \ nm-device-vlan.xml \ + nm-device-generic.xml \ + nm-device-veth.xml \ + nm-device-tun.xml \ + nm-device-macvlan.xml \ + nm-device-vxlan.xml \ + nm-device-gre.xml \ nm-device.xml \ nm-ip4-config.xml \ nm-ip6-config.xml \ diff --git a/introspection/Makefile.in b/introspection/Makefile.in index f5c1f23a..9e6cc901 100644 --- a/introspection/Makefile.in +++ b/introspection/Makefile.in @@ -81,7 +81,8 @@ subdir = introspection DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(srcdir)/all.xml.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_readline.m4 \ + $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/gnome-code-coverage.m4 \ $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \ @@ -145,12 +146,15 @@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DBUS_CFLAGS = @DBUS_CFLAGS@ +DBUS_GLIB_100_CFLAGS = @DBUS_GLIB_100_CFLAGS@ +DBUS_GLIB_100_LIBS = @DBUS_GLIB_100_LIBS@ DBUS_LIBS = @DBUS_LIBS@ DBUS_SYS_DIR = @DBUS_SYS_DIR@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DHCLIENT_PATH = @DHCLIENT_PATH@ DHCPCD_PATH = @DHCPCD_PATH@ +DISTRO_NETWORK_SERVICE = @DISTRO_NETWORK_SERVICE@ DLLTOOL = @DLLTOOL@ DNSMASQ_PATH = @DNSMASQ_PATH@ DSYMUTIL = @DSYMUTIL@ @@ -175,7 +179,6 @@ 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@ @@ -220,12 +223,16 @@ LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBM = @LIBM@ +LIBNDP_CFLAGS = @LIBNDP_CFLAGS@ +LIBNDP_LIBS = @LIBNDP_LIBS@ LIBNL_CFLAGS = @LIBNL_CFLAGS@ LIBNL_LIBS = @LIBNL_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_LIBS = @LIBSOUP_LIBS@ +LIBTEAMDCTL_CFLAGS = @LIBTEAMDCTL_CFLAGS@ +LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ @@ -242,6 +249,8 @@ MOC = @MOC@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ +NEWT_CFLAGS = @NEWT_CFLAGS@ +NEWT_LIBS = @NEWT_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ NM_MAJOR_VERSION = @NM_MAJOR_VERSION@ @@ -269,11 +278,16 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POLKIT_CFLAGS = @POLKIT_CFLAGS@ POLKIT_LIBS = @POLKIT_LIBS@ POSUB = @POSUB@ +PPPD_PATH = @PPPD_PATH@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@ +PPPOE_PATH = @PPPOE_PATH@ QT_CFLAGS = @QT_CFLAGS@ QT_LIBS = @QT_LIBS@ RANLIB = @RANLIB@ +READLINE_LIBS = @READLINE_LIBS@ SED = @SED@ +SELINUX_CFLAGS = @SELINUX_CFLAGS@ +SELINUX_LIBS = @SELINUX_LIBS@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -288,6 +302,7 @@ UDEV_BASE_DIR = @UDEV_BASE_DIR@ USE_NLS = @USE_NLS@ UUID_CFLAGS = @UUID_CFLAGS@ UUID_LIBS = @UUID_LIBS@ +VALGRIND_RULES = @VALGRIND_RULES@ VAPIGEN = @VAPIGEN@ VAPIGEN_MAKEFILE = @VAPIGEN_MAKEFILE@ VAPIGEN_VAPIDIR = @VAPIGEN_VAPIDIR@ @@ -350,6 +365,7 @@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ +subdirs = @subdirs@ sysconfdir = @sysconfdir@ systemdsystemunitdir = @systemdsystemunitdir@ target_alias = @target_alias@ @@ -360,6 +376,7 @@ with_dhclient = @with_dhclient@ with_dhcpcd = @with_dhcpcd@ with_netconfig = @with_netconfig@ with_resolvconf = @with_resolvconf@ +with_valgrind = @with_valgrind@ EXTRA_DIST = \ all.xml.in \ generic-types.xml \ @@ -375,8 +392,15 @@ EXTRA_DIST = \ nm-device-wimax.xml \ nm-device-infiniband.xml \ nm-device-bond.xml \ + nm-device-team.xml \ nm-device-bridge.xml \ nm-device-vlan.xml \ + nm-device-generic.xml \ + nm-device-veth.xml \ + nm-device-tun.xml \ + nm-device-macvlan.xml \ + nm-device-vxlan.xml \ + nm-device-gre.xml \ nm-device.xml \ nm-ip4-config.xml \ nm-ip6-config.xml \ diff --git a/introspection/all.xml.in b/introspection/all.xml.in index a8cea613..29cccdb5 100644 --- a/introspection/all.xml.in +++ b/introspection/all.xml.in @@ -37,6 +37,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + diff --git a/introspection/nm-active-connection.xml b/introspection/nm-active-connection.xml index b6a3c48d..cbecdfce 100644 --- a/introspection/nm-active-connection.xml +++ b/introspection/nm-active-connection.xml @@ -11,7 +11,9 @@ - The path of the connection. + + The path of the connection. + @@ -20,29 +22,86 @@ not change over the lifetime of the ActiveConnection once set. + + + The ID of the connection, provided as a convenience so that clients + do not have to retrieve all connection details. + + The UUID of the connection, provided as a convenience so that clients do not have to retrieve all connection details. + + + The type of the connection, provided as a convenience so that clients + do not have to retrieve all connection details. + + - Array of object paths representing devices which are part of this active connection. + + Array of object paths representing devices which are part of this active + connection. + - The state of this active connection. + + The state of this active connection. + - Whether this active connection is the default IPv4 connection, i.e. whether it currently owns the default IPv4 route. + + Whether this active connection is the default IPv4 connection, i.e. + whether it currently owns the default IPv4 route. + + + + + Object path of the Ip4Config object describing the configuration of the + connection. Only valid when the connection is in the + NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. + + + + + Object path of the Dhcp4Config object describing the DHCP options + returned by the DHCP server (assuming the connection used DHCP). Only + valid when the connection is in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED + state. + - Whether this active connection is the default IPv6 connection, i.e. whether it currently owns the default IPv6 route. + + Whether this active connection is the default IPv6 connection, i.e. + whether it currently owns the default IPv6 route. + + + + + Object path of the Ip6Config object describing the configuration of the + connection. Only valid when the connection is in the + NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. + + + + + Object path of the Dhcp6Config object describing the DHCP options + returned by the DHCP server (assuming the connection used DHCP). Only + valid when the connection is in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED + state. + - Whether this active connection is also a VPN connection. + + Whether this active connection is also a VPN connection. + - The path to the master device if the connection is a slave. + + The path to the master device if the connection is a slave. + diff --git a/introspection/nm-agent-manager.xml b/introspection/nm-agent-manager.xml index e26caacf..d1074428 100644 --- a/introspection/nm-agent-manager.xml +++ b/introspection/nm-agent-manager.xml @@ -23,6 +23,24 @@ + + + Like Register() but indicates agent capabilities to NetworkManager. + + + + + + See the Register() method's identifier argument. + + + + + Indicates various agent capabilities to NetworkManager. + + + + Called by secret Agents to notify NetworkManager that they will no diff --git a/introspection/nm-device-generic.xml b/introspection/nm-device-generic.xml new file mode 100644 index 00000000..79d19899 --- /dev/null +++ b/introspection/nm-device-generic.xml @@ -0,0 +1,27 @@ + + + + + + + + Hardware address of the device. + + + + + + A (non-localized) description of the interface type, if known. + + + + + + + A dictionary mapping property names to variant boxed values + + + + + + diff --git a/introspection/nm-device-gre.xml b/introspection/nm-device-gre.xml new file mode 100644 index 00000000..ae418aab --- /dev/null +++ b/introspection/nm-device-gre.xml @@ -0,0 +1,81 @@ + + + + + + + + The object path of the parent device. + + + + + + The expected set of GRE flags for incoming packets. (The + values are specified by the GRE specification. On Linux, they + are defined in <linux/if_tunnel.h>. Eg, GRE_KEY for the + 'Key Present' bit.) + + + + + + The set of GRE flags to use for outgoing packets. (The + values are specified by the GRE specification. On Linux, they + are defined in <linux/if_tunnel.h>. Eg, GRE_KEY for the + 'Key Present' bit.) + + + + + + Expected input key (if the "Key Present" bit is set in the input flags). + + + + + + Output key (if the "Key Present" bit is set in the output flags). + + + + + + The local end of the tunnel. + + + + + + The remote end of the tunnel. + + + + + + The value to use in the IP TTL field for tunnel packets. + + + + + + The value to use in the IP ToS field for tunnel packets. + + + + + + Whether path MTU discovery is performed. + + + + + + + A dictionary mapping property names to variant boxed values + + + + + + diff --git a/introspection/nm-device-macvlan.xml b/introspection/nm-device-macvlan.xml new file mode 100644 index 00000000..a387bf56 --- /dev/null +++ b/introspection/nm-device-macvlan.xml @@ -0,0 +1,33 @@ + + + + + + + + The object path of the parent device. + + + + + + The macvlan mode, one of "private", "vepa", "bridge", or "passthru". + + + + + + Whether the device is blocked from going into promiscuous mode. + + + + + + + A dictionary mapping property names to variant boxed values + + + + + + diff --git a/introspection/nm-device-team.xml b/introspection/nm-device-team.xml new file mode 100644 index 00000000..baf39fa8 --- /dev/null +++ b/introspection/nm-device-team.xml @@ -0,0 +1,34 @@ + + + + + + + + Hardware address of the device. + + + + + + Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not). + + + + + + Array of object paths representing devices which are currently + slaved to this device. + + + + + + + A dictionary mapping property names to variant boxed values + + + + + + diff --git a/introspection/nm-device-tun.xml b/introspection/nm-device-tun.xml new file mode 100644 index 00000000..8b0f81fb --- /dev/null +++ b/introspection/nm-device-tun.xml @@ -0,0 +1,55 @@ + + + + + + + + The uid of the tunnel owner, or -1 if it has no owner. + + + + + + The gid of the tunnel group, or -1 if it has no owner. + + + + + + The tunnel mode, either "tun" or "tap". + + + + + + The tunnel's "TUN_NO_PI" flag; true if no protocol info is + prepended to the tunnel packets. + + + + + + The tunnel's "TUN_VNET_HDR" flag; true if the tunnel packets + include a virtio network header. + + + + + + The tunnel's "TUN_TAP_MQ" flag; true if callers can connect to + the tap device multiple times, for multiple send/receive + queues. + + + + + + + A dictionary mapping property names to variant boxed values + + + + + + diff --git a/introspection/nm-device-veth.xml b/introspection/nm-device-veth.xml new file mode 100644 index 00000000..e06d0ceb --- /dev/null +++ b/introspection/nm-device-veth.xml @@ -0,0 +1,21 @@ + + + + + + + + The object path of the device's peer. + + + + + + + A dictionary mapping property names to variant boxed values + + + + + + diff --git a/introspection/nm-device-vxlan.xml b/introspection/nm-device-vxlan.xml new file mode 100644 index 00000000..053eea4d --- /dev/null +++ b/introspection/nm-device-vxlan.xml @@ -0,0 +1,122 @@ + + + + + + + + The object path of the parent device (if the VXLAN is not + purely internal to this host). + + + + + + The VXLAN Network Identifier (VNI). + + + + + + The IP (v4 or v6) multicast group used to communicate with other physical + hosts on this VXLAN. + + + + + + The local IPv4 or IPv6 address to use when sending VXLAN packets to other + physical hosts. + + + + + + The value to use in the IP ToS field for VXLAN packets sent to + other physical hosts. + + + + + + The value to use in the IP TTL field for VXLAN packets sent to + other physical hosts. + + + + + + True if the VXLAN dynamically learns remote IP addresses. + + + + + + The interval at which the kernel purges stale cached addresses + (in kernel jiffies, ie, centiseconds). + + + + + + The maximum number of entries that can be added to the VXLAN's + forwarding table. + + + + + + Destination port for outgoing VXLAN packets. + + + + + + The lowest source port number to use for outgoing VXLAN packets. + + + + + + The highest source port number to use for outgoing VXLAN packets. + + + + + + True if the VXLAN is implementing DOVE ARP proxying for remote + clients. + + + + + + True if the VXLAN is implementing DOVE route short-circuiting + of known remote IP addresses. + + + + + + True if the VXLAN will emit netlink notifications of L2 switch + misses. + + + + + + True if the VXLAN will emit netlink notifications of L3 switch + misses. + + + + + + + A dictionary mapping property names to variant boxed values + + + + + + diff --git a/introspection/nm-device-wifi.xml b/introspection/nm-device-wifi.xml index dcfa20cc..65c7b71d 100644 --- a/introspection/nm-device-wifi.xml +++ b/introspection/nm-device-wifi.xml @@ -6,11 +6,27 @@ - List of access point object paths + List of access point object paths. - Get the list of access points visible to this device. + DEPRECATED. Get the list of access points visible to this device. Note + that this list does not include access points which hide their SSID. To + retrieve a list of all access points (including hidden ones) use the + GetAllAccessPoints() method. + + + + + + + + List of access point object paths. + + + + Get the list of all access points visible to this device, including + hidden ones for which the SSID is not yet known. @@ -50,11 +66,19 @@ The bit rate currently used by the wireless device, in kilobits/second (Kb/s). + + + + List of object paths of access point visible to this wireless device. + + + Object path of the access point currently used by the wireless device. + The capabilities of the wireless device. diff --git a/introspection/nm-device-wimax.xml b/introspection/nm-device-wimax.xml index 6e414087..b48ffe94 100644 --- a/introspection/nm-device-wimax.xml +++ b/introspection/nm-device-wimax.xml @@ -14,6 +14,13 @@ + + + List of object paths of Network Service Providers (NSPs) visible to this + WiMAX device. + + + Hardware address of the device. diff --git a/introspection/nm-device.xml b/introspection/nm-device.xml index b03b1b84..f459bce4 100644 --- a/introspection/nm-device.xml +++ b/introspection/nm-device.xml @@ -51,9 +51,9 @@ Flags describing the capabilities of the device. - + - The IPv4 address bound to the device. FIXME: what about devices with >1 IP address? + DEPRECATED; use the 'Addresses' property of the 'Ip4Config' object instead. @@ -125,6 +125,19 @@ An array of object paths of every configured connection that is currently 'available' through this device. + + + If non-empty, an (opaque) indicator of the physical network + port associated with the device. This can be used to recognize + when two seemingly-separate hardware devices are actually just + different virtual interfaces to the same physical port. + + + + + The device MTU (maximum transmission unit). + + @@ -289,6 +302,16 @@ The device is a bridge interface. + + + The device is a generic interface type unrecognized by NetworkManager. + + + + + The device is a team master interface. + + @@ -579,6 +602,31 @@ A secondary connection of the base connection failed. + + + DCB or FCoE setup failed. + + + + + teamd control failed. + + + + + Modem failed or no longer available. + + + + + Modem now ready and available. + + + + + The SIM PIN was incorrect. + + diff --git a/introspection/nm-ip4-config.xml b/introspection/nm-ip4-config.xml index 70d3e1ce..6a8750b7 100644 --- a/introspection/nm-ip4-config.xml +++ b/introspection/nm-ip4-config.xml @@ -2,21 +2,15 @@ + + The gateway in use. + Array of tuples of IPv4 address/prefix/gateway. All 3 elements of each tuple are in network byte order. Essentially: [(addr, prefix, gateway), (addr, prefix, gateway), ...] - - The nameservers in use. - - - The Windows Internet Name Service servers associated with the connection. Each address is in network byte order. - - - A list of domains this address belongs to. - Tuples of IPv4 route/prefix/next-hop/metric. All 4 elements of each tuple are in network byte order. 'route' and 'next hop' are IPv4 @@ -24,6 +18,26 @@ [(route, prefix, next-hop, metric), (route, prefix, next-hop, metric), ...] + + The nameservers in use. + + + A list of domains this address belongs to. + + + A list of dns searches. + + + The Windows Internet Name Service servers associated with the connection. Each address is in network byte order. + + + + + + A dictionary mapping property names to variant boxed values + + + diff --git a/introspection/nm-ip6-config.xml b/introspection/nm-ip6-config.xml index 60478185..55c519e7 100644 --- a/introspection/nm-ip6-config.xml +++ b/introspection/nm-ip6-config.xml @@ -2,18 +2,32 @@ + + The gateway in use. + Tuples of IPv6 address/prefix/gateway. + + Tuples of IPv6 route/prefix/next-hop/metric. + The nameservers in use. A list of domains this address belongs to. - - Tuples of IPv6 route/prefix/next-hop/metric. + + A list of dns searches. + + + + + A dictionary mapping property names to variant boxed values + + + diff --git a/introspection/nm-manager.xml b/introspection/nm-manager.xml index a0e27732..6af2be30 100644 --- a/introspection/nm-manager.xml +++ b/introspection/nm-manager.xml @@ -41,12 +41,17 @@ - The connection to activate the devices with. + The connection to activate. If "/" is given, a valid device path must + be given, and NetworkManager picks the best connection to activate for + the given device. VPN connections must always pass a valid connection + path. - The object path of device to be activated for physical connections. This parameter is ignored for VPN connections, because the specific_object (if provided) specifies the device to use. + The object path of device to be activated for physical connections. + This parameter is ignored for VPN connections, because the + specific_object (if provided) specifies the device to use. @@ -55,7 +60,7 @@ This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For WiFi connections, pass the object path of a specific AP from the card's scan - list, or "/" to pick and AP automatically. For VPN connections, pass + list, or "/" to pick an AP automatically. For VPN connections, pass the object path of an ActiveConnection object that should serve as the "base" connection (to which the VPN connections lifetime will be tied), or pass "/" and NM will automatically use the current default device. @@ -204,6 +209,7 @@ + Set logging verbosity and which operations are logged. @@ -216,13 +222,17 @@ A combination of logging domains separated by commas (','), or "NONE" to disable logging. Each domain enables logging for operations - related to that domain. Available domains are: [HW, RFKILL, ETHER, + related to that domain. Available domains are: [PLATFORM, RFKILL, ETHER, WIFI, BT, MB, DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4, DNS, VPN, SHARING, SUPPLICANT, AGENTS, SETTINGS, SUSPEND, CORE, DEVICE, - OLPC, WIMAX, INFINIBAND, FIREWALL, ADSL, BOND, VLAN]. In addition to - these domains, the following special domains can be used: [NONE, ALL, - DEFAULT, DHCP, IP]. If an empty string is given, the log level is - changed but the current set of log domains remains unchanged. + OLPC, WIMAX, INFINIBAND, FIREWALL, ADSL, BOND, VLAN, BRIDGE, DBUS_PROPS, + TEAM, CONCHECK, DCB, DISPATCH]. + In addition to these domains, the following special domains can be used: + [NONE, ALL, DEFAULT, DHCP, IP]. You can also specify that some domains + should log at a different level from the default by appending a colon (':') + and a log level (eg, 'WIFI:DEBUG'). If an empty string is given, the + log level is changed but the current set of log domains remains + unchanged. @@ -266,6 +276,12 @@ + + + The list of network devices/interfaces NetworkManager knows about. + + + Indicates if overall networking is currently enabled or not. See the @@ -334,6 +350,14 @@ + + + Indicates whether NM is still starting up; this becomes FALSE + when NM has finished attempting to activate every connection + that it might be able to activate at startup. + + + NetworkManager version. diff --git a/introspection/nm-secret-agent.xml b/introspection/nm-secret-agent.xml index 48dde703..337d0a7f 100644 --- a/introspection/nm-secret-agent.xml +++ b/introspection/nm-secret-agent.xml @@ -11,7 +11,8 @@ itself and should not expect its SaveSecrets() method to be called. SaveSecrets() will be called eg if some program other than the agent itself (like a connection editor) changes the secrets out of - band. + band. The agent should implement this D-Bus interface on an object + with the path /org/freedesktop/NetworkManager/SecretAgent. @@ -21,7 +22,9 @@ and the user enters new secrets, the agent is expected to save the new secrets to persistent storage (if the secret's flags include AGENT_OWNED) as NetworkManager will not send these - secrets back to the same agent via a SaveSecrets() call. + secrets back to the same agent via a SaveSecrets() call. If + the user canceled any interaction, the agent should return the + UserCanceled error (see below). @@ -55,7 +58,10 @@ required, so in some cases no hints may be given. The Agent should return any secrets it has, or that it thinks are required, regardless of what hints NetworkManager sends - in this request. + in this request. Some hints have special prefixes that + provide information to the agent; for example, VPN requests + may send server-specific messages prefixed with + "x-vpn-message:". @@ -75,6 +81,45 @@ the setting, and one or more secrets. + + + + + Should be returned when the process requesting secrets is + not authorized to do so (like if the caller is not root + or not NetworkManager). + + + + + Should be returned if the 'connection' argument is invalid. + + + + + Should be returned when the user has canceled the request. + + + + + Should be returned when NetworkManager has requested that + the agent cancel the request. + + + + + Should be returned if the agent has encountered some internal + error processing the request. + + + + + Should be returned if there are no available secrets, for + example if user interaction is not allowed and there are + no secrets stored by the agent for this connection. + + + @@ -181,6 +226,18 @@ + + + No special capabilities. + + + + The agent supports passing hints to VPN plugin authentication + dialogs. + + + + diff --git a/introspection/nm-settings-connection.xml b/introspection/nm-settings-connection.xml index 9089b009..b5bd2cd0 100644 --- a/introspection/nm-settings-connection.xml +++ b/introspection/nm-settings-connection.xml @@ -9,10 +9,11 @@ - Update the connection with new settings and properties, replacing - all previous settings and properties. Secrets may be part of the - update request, and will be either stored in persistent storage or - given to a Secret Agent for storage, depending on the request. + Update the connection with new settings and properties (replacing + all previous settings and properties) and save the connection to + disk. Secrets may be part of the update request, and will be either + stored in persistent storage or sent to a Secret Agent for storage, + depending on the flags associated with each secret. @@ -23,6 +24,28 @@ + + + Update the connection with new settings and properties (replacing + all previous settings and properties) but do not immediately save + the connection to disk. Secrets may be part of the update request + and may sent to a Secret Agent for storage, depending on the + flags associated with each secret. + + Use the 'Save' method to save these changes to disk. Note + that unsaved changes will be lost if the connection is + reloaded from disk (either automatically on file change or + due to an explicit ReloadConnections call). + + + + + + New connection settings, properties, and (optionally) secrets. + + + + Delete the connection. @@ -70,6 +93,15 @@ + + + Saves a "dirty" connection (that had previously been + updated with UpdateUnsaved) to persistent storage. + + + + + Emitted when any settings or permissions change. When handling @@ -83,9 +115,28 @@ Emitted when this connection is no longer available. This happens when the connection is deleted or if it is no longer - accessable by any of the system's logged-in users. After - receipt of this signal, the object no longer exists. + accessible by any of the system's logged-in users. After + receipt of this signal, the object no longer exists. Also + see the Settings.ConnectionRemoved signal. + + + + + + If set, indicates that the in-memory state of the + connection does not match the on-disk state. This flag + will be set when UpdateUnsaved() is called or when any + connection details change, and cleared when the connection + is saved to disk via Save() or from internal operations. + + + + + + A dictionary mapping property names to variant boxed values. + + diff --git a/introspection/nm-settings.xml b/introspection/nm-settings.xml index c7914668..3a71959c 100644 --- a/introspection/nm-settings.xml +++ b/introspection/nm-settings.xml @@ -23,6 +23,7 @@ Retrieve the object path of a connection, given that connection's UUID. + The UUID to find the connection object path for. @@ -56,6 +57,83 @@ + + + Add new connection but do not save it to disk immediately. This + operation does not start the network connection unless (1) device is + idle and able to connect to the network described by the new connection, + and (2) the connection is allowed to be started automatically. + + Use the 'Save' method on the connection to save these changes + to disk. Note that unsaved changes will be lost if the + connection is reloaded from disk (either automatically on file + change or due to an explicit ReloadConnections call). + + + + + + Connection settings and properties. + + + + + Object path of the new connection that was just added. + + + + + + + Loads or reloads the indicated connections from disk. You + should call this after making changes directly to an on-disk + connection file to make sure that NetworkManager sees the + changes. (If "monitor-connection-files" in NetworkManager.conf + is "true", then this will have no real effect, but is + harmless.) As with AddConnection(), this operation does not + necessarily start the network connection. + + + + + + Array of paths to on-disk connection profiles in directories + monitored by NetworkManager. + + + + + Success or failure of the operation as a whole. True if + NetworkManager at least tried to load the indicated + connections, even if it did not succeed. False if an error + occurred before trying to load the connections (eg, + permission denied). + + + + + Paths of connection files that could not be loaded. + + + + + + + Tells NetworkManager to reload all connection files from disk, + including noticing any added or deleted connection files. By + default, connections are re-read automatically any time they + change, so you only need to use this command if you have set + "monitor-connection-files=false" in NetworkManager.conf. + + + + + + Success or failure. + + + + Save the hostname to persistent configuration. @@ -69,6 +147,12 @@ + + + List of object paths of available network connection profiles. + + + The machine hostname stored in persistent configuration. @@ -107,6 +191,21 @@ + + + Emitted when a connection is no longer available. This happens when + the connection is deleted or if it is no longer accessible by any of + the system's logged-in users. After receipt of this signal, the + connection no longer exists and cannot be used. Also see the + Settings.Connection.Removed signal. + + + + Object path of the removed connection. + + + + diff --git a/introspection/nm-vpn-plugin.xml b/introspection/nm-vpn-plugin.xml index 5fb11622..07397c2b 100644 --- a/introspection/nm-vpn-plugin.xml +++ b/introspection/nm-vpn-plugin.xml @@ -5,9 +5,11 @@ This interface is provided by plugins providing VPN services to the NetworkManager daemon. + - Tells the plugin to connect. + Tells the plugin to connect. Interactive secrets requests (eg, emitting + the SecretsRequired signal) are not allowed. @@ -21,6 +23,36 @@ + + + + + + + Tells the plugin to connect, allowing interactive secrets requests (eg + the plugin is allowed to emit the SecretsRequired signal if the VPN + service indicates that it needs additional secrets during the connect + process). + + + + + Describes the connection to be established. + + + + + Additional details about the Connect process. + + + + + + + + + + @@ -122,6 +154,48 @@ + + + Emitted during an ongoing ConnectInteractive() request when the plugin + has determined that new secrets are required. NetworkManager will then + call the NewSecrets() method with a connection hash including the new + secrets. + + + + Informational message, if any, about the request. For example, if + a second PIN is required, could indicate to the user to wait for + the token code to change until entering the next PIN. + + + + + Array of strings of VPN secret names which the plugin thinks + secrets may be required for, or other VPN-specific data to be + processed by the VPN's front-end. + + + + + + + Called in response to a SecretsRequired signal to deliver updated secrets + or other information to the plugin. + + + + + Describes the connection including the new secrets. + + + + + + + + + + The plugin obtained generic configuration information. diff --git a/introspection/vpn-errors.xml b/introspection/vpn-errors.xml index 0dba7e6f..7b92d073 100644 --- a/introspection/vpn-errors.xml +++ b/introspection/vpn-errors.xml @@ -2,31 +2,59 @@ - This is a drab, nondescript error. + General failure without further details. - The request could not be processed because the VPN connection is already being started. + + The plugin is already starting, and another connect request was received. + - The request could not be processed because a VPN connection was already active. + + The plugin is already connected, and another connect request was received. + - The request could not be processed because the VPN connection is already being stopped. + + The plugin is already stopping, and another stop request was received. + - The request could not be processed because the VPN connection was already stopped. + + The plugin is already stopped, and another disconnect request was received. + - The request could not be processed because the VPN connection is in the wrong state for this type of request. FIXME: too general? + + The request could not be processed because the VPN plugin is in the wrong + state for this type of request. + - Invalid arguments were passed with the request. FIXME: too general. + + The request could not be processed because it contained malformed + arguments, or arguments of unexpected type. It usually means that one of + the VPN setting data items or secrets was not of the expected type (i.e. + int, string, bool, etc). + - A binary providing the service failed to launch. + + A binary providing the service failed to launch. + - The request could not be processed because the VPN connection settings were invalid. + + The request could not be processed because the connection was invalid. It + usually means that the connection's VPN setting was missing some required + data item or secret. + + + + + The request could not be processed because the plugin does not support + interactive operations, such as ConnectInteractive() or NewSecrets(). + -- cgit 1.3.0-6-gf8a5