From f75dd6fd1975146623052b843b182dc32c3fbe46 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 8 Apr 2011 07:30:59 +0200 Subject: Imported Upstream version 0.8.998 --- introspection/Makefile.am | 14 +-- introspection/Makefile.in | 62 +++++++----- introspection/all.xml | 14 +-- introspection/errors.xml | 14 +-- introspection/nm-active-connection.xml | 8 +- introspection/nm-agent-manager.xml | 38 ++++++++ introspection/nm-device-cdma.xml | 15 --- introspection/nm-device-gsm.xml | 15 --- introspection/nm-device-modem.xml | 64 +++++++++++++ introspection/nm-device-serial.xml | 20 ---- introspection/nm-device-wimax.xml | 103 ++++++++++++++++++++ introspection/nm-device.xml | 74 ++++++++++++--- introspection/nm-exported-connection.xml | 99 ------------------- introspection/nm-manager-client.xml | 83 ---------------- introspection/nm-manager.xml | 145 ++++++++++++++++++---------- introspection/nm-secret-agent.xml | 158 +++++++++++++++++++++++++++++++ introspection/nm-settings-connection.xml | 93 ++++++++++++++++++ introspection/nm-settings-system.xml | 81 ---------------- introspection/nm-settings.xml | 42 +++++++- introspection/nm-wimax-nsp.xml | 44 +++++++++ 20 files changed, 753 insertions(+), 433 deletions(-) create mode 100644 introspection/nm-agent-manager.xml delete mode 100644 introspection/nm-device-cdma.xml delete mode 100644 introspection/nm-device-gsm.xml create mode 100644 introspection/nm-device-modem.xml delete mode 100644 introspection/nm-device-serial.xml create mode 100644 introspection/nm-device-wimax.xml delete mode 100644 introspection/nm-exported-connection.xml delete mode 100644 introspection/nm-manager-client.xml create mode 100644 introspection/nm-secret-agent.xml create mode 100644 introspection/nm-settings-connection.xml delete mode 100644 introspection/nm-settings-system.xml create mode 100644 introspection/nm-wimax-nsp.xml (limited to 'introspection') diff --git a/introspection/Makefile.am b/introspection/Makefile.am index 212da3ab..320245ee 100644 --- a/introspection/Makefile.am +++ b/introspection/Makefile.am @@ -8,21 +8,21 @@ EXTRA_DIST = \ nm-device-wifi.xml \ nm-device-olpc-mesh.xml \ nm-device-ethernet.xml \ - nm-device-cdma.xml \ - nm-device-gsm.xml \ - nm-device-serial.xml \ + nm-device-modem.xml \ + nm-device-wimax.xml \ nm-device.xml \ nm-ip4-config.xml \ nm-ip6-config.xml \ nm-manager.xml \ - nm-manager-client.xml \ nm-settings.xml \ - nm-settings-system.xml \ - nm-exported-connection.xml \ + nm-settings-connection.xml \ nm-vpn-plugin.xml \ nm-vpn-connection.xml \ nm-ppp-manager.xml \ nm-active-connection.xml \ nm-dhcp4-config.xml \ - nm-dhcp6-config.xml + nm-dhcp6-config.xml \ + nm-agent-manager.xml \ + nm-wimax-nsp.xml \ + nm-secret-agent.xml diff --git a/introspection/Makefile.in b/introspection/Makefile.in index 3e4fb45e..fd64eca6 100644 --- a/introspection/Makefile.in +++ b/introspection/Makefile.in @@ -37,11 +37,16 @@ subdir = introspection DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ - $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -58,7 +63,6 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ -ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ @@ -67,8 +71,6 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -85,6 +87,7 @@ DHCLIENT_PATH = @DHCLIENT_PATH@ DHCLIENT_VERSION = @DHCLIENT_VERSION@ DHCPCD_PATH = @DHCPCD_PATH@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -93,6 +96,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ @@ -101,8 +105,8 @@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GMODULE_CFLAGS = @GMODULE_CFLAGS@ GMODULE_LIBS = @GMODULE_LIBS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ GNUTLS_LIBS = @GNUTLS_LIBS@ GREP = @GREP@ @@ -117,13 +121,23 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ +INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ +INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ +INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@ +INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@ +INTROSPECTION_LIBS = @INTROSPECTION_LIBS@ +INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ +INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ +INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ IPTABLES_PATH = @IPTABLES_PATH@ +IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@ +IWMX_SDK_LIBS = @IWMX_SDK_LIBS@ KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -131,6 +145,8 @@ LIBDL = @LIBDL@ LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ LIBM = @LIBM@ LIBNL_CFLAGS = @LIBNL_CFLAGS@ LIBNL_LIBS = @LIBNL_LIBS@ @@ -139,13 +155,15 @@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -171,12 +189,9 @@ PKGCONFIG_PATH = @PKGCONFIG_PATH@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ POLKIT_CFLAGS = @POLKIT_CFLAGS@ POLKIT_LIBS = @POLKIT_LIBS@ POSUB = @POSUB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@ RANLIB = @RANLIB@ RESOLVCONF_PATH = @RESOLVCONF_PATH@ @@ -191,10 +206,13 @@ UUID_CFLAGS = @UUID_CFLAGS@ UUID_LIBS = @UUID_LIBS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ @@ -253,23 +271,23 @@ EXTRA_DIST = \ nm-device-wifi.xml \ nm-device-olpc-mesh.xml \ nm-device-ethernet.xml \ - nm-device-cdma.xml \ - nm-device-gsm.xml \ - nm-device-serial.xml \ + nm-device-modem.xml \ + nm-device-wimax.xml \ nm-device.xml \ nm-ip4-config.xml \ nm-ip6-config.xml \ nm-manager.xml \ - nm-manager-client.xml \ nm-settings.xml \ - nm-settings-system.xml \ - nm-exported-connection.xml \ + nm-settings-connection.xml \ nm-vpn-plugin.xml \ nm-vpn-connection.xml \ nm-ppp-manager.xml \ nm-active-connection.xml \ nm-dhcp4-config.xml \ - nm-dhcp6-config.xml + nm-dhcp6-config.xml \ + nm-agent-manager.xml \ + nm-wimax-nsp.xml \ + nm-secret-agent.xml all: all-am diff --git a/introspection/all.xml b/introspection/all.xml index 1c32f3f3..5d1baf01 100644 --- a/introspection/all.xml +++ b/introspection/all.xml @@ -3,10 +3,10 @@ xmlns:xi="http://www.w3.org/2001/XInclude"> NetworkManager D-Bus Interface Specification -0.8 +0.9 -Copyright (C) 2008 - 2009 Red Hat, Inc. +Copyright (C) 2008 - 2011 Red Hat, Inc. Copyright (C) 2008 - 2009 Novell, Inc. @@ -30,19 +30,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - - + + + - - + + diff --git a/introspection/errors.xml b/introspection/errors.xml index 444b325d..f2db8667 100644 --- a/introspection/errors.xml +++ b/introspection/errors.xml @@ -5,7 +5,7 @@ - Connection was not provided by any known settings service. + Connection was not provided by the settings service. @@ -15,18 +15,6 @@ - - - Invalid settings service (not a recognized system or user settings service name). - - - - - - Connection was superseded by a system connection. - - - User does not have the permission to activate this connection. diff --git a/introspection/nm-active-connection.xml b/introspection/nm-active-connection.xml index 765830a1..41aeab62 100644 --- a/introspection/nm-active-connection.xml +++ b/introspection/nm-active-connection.xml @@ -2,9 +2,6 @@ - - The D-Bus service name providing this connection. - The path of the connection. @@ -51,6 +48,11 @@ The connection is activated. + + + The connection is being torn down and cleaned up. + + diff --git a/introspection/nm-agent-manager.xml b/introspection/nm-agent-manager.xml new file mode 100644 index 00000000..0b1e3e6e --- /dev/null +++ b/introspection/nm-agent-manager.xml @@ -0,0 +1,38 @@ + + + + + + + + Called by secret Agents to register their ability to provide and save + network secrets. + + + + + + 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). + + + + + + + Called by secret Agents to notify NetworkManager that they will no + longer handle requests for network secrets. Agents are automatically + unregistered when they disconnect from D-Bus. + + + + + + + + diff --git a/introspection/nm-device-cdma.xml b/introspection/nm-device-cdma.xml deleted file mode 100644 index 2b43f8fd..00000000 --- a/introspection/nm-device-cdma.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - A dictionary mapping property names to variant boxed values - - - - - - diff --git a/introspection/nm-device-gsm.xml b/introspection/nm-device-gsm.xml deleted file mode 100644 index 650d656a..00000000 --- a/introspection/nm-device-gsm.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - A dictionary mapping property names to variant boxed values - - - - - - diff --git a/introspection/nm-device-modem.xml b/introspection/nm-device-modem.xml new file mode 100644 index 00000000..0ca101fd --- /dev/null +++ b/introspection/nm-device-modem.xml @@ -0,0 +1,64 @@ + + + + + + + + + A dictionary mapping property names to variant boxed values + + + + + + + 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 generic family of access technologies the modem currently supports + without a firmware reload or reinitialization. + + + + + + Flags describing one or more of the general access technology families + that a modem device supports. + + + Modem has no capabilties. + + + + Modem supports the analog wired telephone network (ie 56k dialup) and + does not have wireless/cellular capabilities. + + + + + Modem supports at least one of CDMA 1xRTT, EVDO revision 0, EVDO + revision A, or EVDO revision B. + + + + + Modem supports at least one of GSM, GPRS, EDGE, UMTS, HSDPA, HSUPA, or + HSPA+ packet switched data capability. + + + + + Modem has at LTE data capability. + + + + + + diff --git a/introspection/nm-device-serial.xml b/introspection/nm-device-serial.xml deleted file mode 100644 index 13b08537..00000000 --- a/introspection/nm-device-serial.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - Bytes received - - - - - Bytes sent - - - - - - diff --git a/introspection/nm-device-wimax.xml b/introspection/nm-device-wimax.xml new file mode 100644 index 00000000..6e414087 --- /dev/null +++ b/introspection/nm-device-wimax.xml @@ -0,0 +1,103 @@ + + + + + + + + + List of NSP object paths + + + + Get the list of NSPs visible to this device. + + + + + + Hardware address of the device. + + + + + + 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. + + + + + + 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. + + + + + + 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. + + + + + + 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. + + + + + + The ID of the serving base station as received from the network. Has + no meaning when the device is not connected. + + + + + + Object path of the NSP currently used by the WiMax device. + + + + + + + A dictionary mapping property names to variant boxed values. + + + + Emitted when the WiMax device's properties changed. + + + + + + + The object path of the newly found NSP. + + + + Emitted when a new NSP is found by the device. + + + + + + + The object path of the NSP that has disappeared. + + + + Emitted when an NSP disappears from view of the device. + + + + + diff --git a/introspection/nm-device.xml b/introspection/nm-device.xml index eaebdf35..13c542a6 100644 --- a/introspection/nm-device.xml +++ b/introspection/nm-device.xml @@ -4,7 +4,18 @@ - Unique Device Identifier. + Operating-system specific transient device hardware identifier. This + is an opaque string representing the underlying hardware for the device, + and shouldn't be used to keep track of individual devices. For some + device types (Bluetooth, Modems) it is an identifier used by the + hardware service (ie bluez or ModemManager) to refer to that device, + and client programs use it get additional information from those + services which NM does not provide. The Udi is not guaranteed to be + consistent across reboots or hotplugs of the hardware. If you're looking + for a way to uniquely track each device in your application, use the + object path. If you're looking for a way to track a specific piece of + hardware across reboot or hotplug, use a MAC address or USB serial + number. @@ -111,47 +122,62 @@ The device is in an unknown state. - + - The device is not managed by NetworkManager. + The device is recognized but not managed by NetworkManager. - + The device cannot be used (carrier off, rfkill, etc). - + The device is not connected. - + The device is preparing to connect. - + The device is being configured. - + The device is awaiting secrets necessary to continue connection. - + The IP settings of the device are being requested and configured. - + + + The device's IP connectivity ability is being determined. + + + + + The device is waiting for secondary connections to be activated. + + + The device is active. - + + + The device's network connection is being torn down. + + + The device is in a failure state following an attempt to activate it. @@ -174,14 +200,32 @@ The device is an 802.11 WiFi device. - + + Unused + + + Unused + + + + The device is Bluetooth device that provides PAN or DUN capabilities. + + + + + The device is an OLPC mesh networking device. + + + - The device is a GSM-based cellular WAN device. + The device is an 802.16e Mobile WiMAX device. - + - The device is a CDMA/IS-95-based cellular WAN device. + The device is a modem supporting one or more of analog telephone, + CDMA/EVDO, GSM/UMTS/HSPA, or LTE standards to access a cellular or + wireline data network. diff --git a/introspection/nm-exported-connection.xml b/introspection/nm-exported-connection.xml deleted file mode 100644 index 46907c05..00000000 --- a/introspection/nm-exported-connection.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - Represents a single network connection configuration. - - - - - Update the connection with new settings and properties, replacing all previous settings and properties. - - - - - - New connection properties. - - - - - - - Delete the connection. - - - - - - - - Get the settings maps describing this object. - - - - - The nested settings maps describing this object. - - - - - - - Emitted when some settings changed. - - - - Contains complete connection setting parameters, including changes. - - - - - - - Emitted when this connection has been deleted/removed. After receipt of this signal, the object no longer exists. - - - - - - - - Secrets have a separate interface so that they can be locked down. - - - - - Get the secrets encapsulated in this object. - - - - - - Name of the setting to return. - - - - - Array of strings of key names in the Setting for which NM thinks - a secrets may be required. - - - - - Indicates whether new secrets should be requested or if the request can be fulfilled from storage. - - - - - - Nested settings maps containing secrets. Each setting MUST contain at least the 'name' field, containing the name of the setting, and one or more secrets. - - - - - - - diff --git a/introspection/nm-manager-client.xml b/introspection/nm-manager-client.xml deleted file mode 100644 index 24e4a29e..00000000 --- a/introspection/nm-manager-client.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/introspection/nm-manager.xml b/introspection/nm-manager.xml index f281d9d2..5eb4614f 100644 --- a/introspection/nm-manager.xml +++ b/introspection/nm-manager.xml @@ -27,11 +27,6 @@ Activate a connection using the supplied device. - - - The D-Bus service name of the settings service that provides this connection. - - The connection to activate the devices with. @@ -62,7 +57,6 @@ - Another connection is already activating or the same connection is already active. FIXME: check if the error name is correct. FIXME: split into 2 errors? @@ -72,6 +66,55 @@ + + + + + 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), then activate the new connection. + Cannot be used for VPN connections at this time. + + + + Connection settings and properties; if incomplete missing settings will + be automatically completed using the given device and specific object. + + + + + The object path of device to be activated using the given connection. + + + + + The 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 "/" should be used (ie, no specific object). For WiFi + connections, pass the object path of a specific AP from the card's scan + list, which will be used to complete the details of the newly added + connection. + + + + + Object path of the new connection that was just added. + + + + + The path of the active connection object representing this active connection. + + + + + + + The connection is invalid for this device. + + + + Deactivate an active connection. @@ -169,6 +212,15 @@ + + + The overall networking state as determined by the NetworkManager daemon, + based on the state of network devices under it's management. + + + + + Indicates if overall networking is currently enabled or not. See the @@ -200,6 +252,18 @@ + + + Indicates if WiMAX devices are currently enabled or not. + + + + + + Indicates if the WiMAX hardware is currently enabled, i.e. the state of the RF kill switch. + + + List of active connection object paths. @@ -268,67 +332,46 @@ - The NetworkManager daemon is in an unknown state. + Networking state is unknown. - + - The NetworkManager daemon is asleep and all interfaces managed by it are inactive. + Networking is inactive and all devices are disabled. - + - The NetworkManager daemon is connecting a device. FIXME: What does this mean when one device is active and another is connecting? + There is no active network connection. - + - The NetworkManager daemon is connected. + Network connections are being cleaned up. - + - The NetworkManager daemon is disconnected. + A network device is connecting to a network and there is no other + available network connection. - - - - - - - DEPRECATED. NetworkManager's state changed. Use the 'StateChanged' signal instead. - - + - The new state of NetworkManager. + A network device is connected, but there is only link-local connectivity. - - - - - - DEPRECATED. Control the NetworkManager daemon's sleep state. When asleep, all interfaces that it manages are deactivated. - - - - - - - - DEPRECATED. Control the NetworkManager daemon's sleep state. When awake, all known interfaces are available to be activated. - - - - - - - - DEPRECATED. The overall state of the NetworkManager daemon. - - - - + + + + A network device is connected, but there is only site-local connectivity. + + + + + A network device is connected, with global network connectivity. + + + diff --git a/introspection/nm-secret-agent.xml b/introspection/nm-secret-agent.xml new file mode 100644 index 00000000..9655c2b9 --- /dev/null +++ b/introspection/nm-secret-agent.xml @@ -0,0 +1,158 @@ + + + + + + + Private D-Bus interface used by secret agents that store and provide + secrets to NetworkManager. + + + + + Retrieve and return stored secrets, if any, or request new + secrets from the agent's user. + + + + + + Nested settings maps containing the connection for which + secrets are being requested. This may contain system-owned + secrets if the agent has successfully authenticated to + modify system network settings and the GetSecrets request + flags allow user interaction. + + + + + Object path of the connection for which secrets are being + requested. + + + + + Setting name for which secrets are being requested. + + + + + Array of strings of key names in the requested setting for + which NetworkManager thinks a secrets may be required. The + Agent should return any secrets it has, or that it thinks + are required, regardless of what hints NetworkManager sends + in this request. + + + + + Flags which modify the behavior of the secrets request. + If true, new secrets are assumed to be invalid or incorrect, + and the agent should ask the user for new secrets. If false, + existing secrets should be retrieved from storage and + returned without interrupting the user. + + + + + + Nested settings maps containing secrets. Each setting MUST + contain at least the 'name' field, containing the name of + the setting, and one or more secrets. + + + + + + + Flags modifying the behavior of GetSecrets request. + + + + 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. + + + + + 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. + + + + + 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. + + + + + + + Cancel a pending GetSecrets request for secrets of the given + connection. Any matching request should be canceled. + + + + + + Object path of the connection for which, if secrets are being + requested, the request should be canceled. + + + + + Setting name for which secrets for this connection were + originally being requested. + + + + + + + Save given secrets to backing storage. + + + + + + Nested settings maps containing the entire connection + (including secrets), for which the agent should save the + secrets to backing storage. + + + + + Object path of the connection for which the agent should + save secrets to backing storage. + + + + + + + Delete secrets from backing storage. + + + + + + Nested settings maps containing the connection properties + (sans secrets), for which the agent should delete the + secrets from backing storage. + + + + + Object path of the connection for which the agent should + delete secrets from backing storage. + + + + + + + diff --git a/introspection/nm-settings-connection.xml b/introspection/nm-settings-connection.xml new file mode 100644 index 00000000..9089b009 --- /dev/null +++ b/introspection/nm-settings-connection.xml @@ -0,0 +1,93 @@ + + + + + + + Represents a single network connection configuration. + + + + + 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. + + + + + + New connection settings, properties, and (optionally) secrets. + + + + + + + Delete the connection. + + + + + + + + Get the settings maps describing this network configuration. + This will never include any secrets required for connection + to the network, as those are often protected. Secrets must + be requested separately using the GetSecrets() call. + + + + + + The nested settings maps describing this object. + + + + + + + Get the secrets belonging to this network configuration. Only + secrets from persistent storage or a Secret Agent running in + the requestor's session will be returned. The user will never + be prompted for secrets as a result of this request. + + + + + + Name of the setting to return secrets for. If empty, all + all secrets will be returned. + + + + + + Nested settings maps containing secrets. + + + + + + + Emitted when any settings or permissions change. When handling + this signal, clients should re-read the connection using the + GetSettings method to get the changes and to ensure the client + still has permission to access the connection. + + + + + + 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. + + + + + + diff --git a/introspection/nm-settings-system.xml b/introspection/nm-settings-system.xml deleted file mode 100644 index 598274c0..00000000 --- a/introspection/nm-settings-system.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - Implemented by the system settings service to provide additional settings to NetworkManager. - - - - - Save the hostname to persistent configuration. - - - - - - The hostname to save to persistent configuration. If blank, the persistent hostname is cleared. - - - - - - - The machine hostname stored in persistent configuration. - - - - - - If true, adding and modifying connections is supported. - - - - - - - A dictionary mapping property names to variant boxed values - - - - - - - Emitted when system authorization details change, indicating that clients may wish to recheck permissions with GetPermissions. - - - - - - Returns a bitfield indicating certain operations the caller is permitted to perform. Some of these operations may require authorization by the user. - - - - - - A bitfield of permitted operations. Some of these operations may require the user to authorize via password entry or other means. - - - - - - - No permissions. - - - Can modify/add/delete connections. - - - Can share connections via a encrypted user-created WiFi network. - - - Can share connections via a open/unencrypted user-created WiFi network. - - - Can modify the persistent system hostname. - - - - - - diff --git a/introspection/nm-settings.xml b/introspection/nm-settings.xml index b252c00d..f816b087 100644 --- a/introspection/nm-settings.xml +++ b/introspection/nm-settings.xml @@ -1,9 +1,9 @@ - + - The NetworkManagerSettings interface is provided by the service which provides connections to NetworkManager. + The Settings interface allows clients to view and administrate the connections stored and used by NetworkManager. @@ -29,8 +29,46 @@ Connection settings and properties. + + + Object path of the new connection that was just added. + + + + + Save the hostname to persistent configuration. + + + + + + The hostname to save to persistent configuration. If blank, the persistent hostname is cleared. + + + + + + + The machine hostname stored in persistent configuration. + + + + + + If true, adding and modifying connections is supported. + + + + + + + A dictionary mapping property names to variant boxed values + + + + Emitted when a new connection has been added. diff --git a/introspection/nm-wimax-nsp.xml b/introspection/nm-wimax-nsp.xml new file mode 100644 index 00000000..55ac4abc --- /dev/null +++ b/introspection/nm-wimax-nsp.xml @@ -0,0 +1,44 @@ + + + + + + + The name of the NSP. + + + The current signal quality of the NSP, in percent. + + + The network type of the NSP. + + + + + + A dictionary mapping property names to variant boxed values. + + + + + + + Network type of the NSP. + + + Unknown network. + + + Home network. + + + Partner network. + + + Roaming partner network. + + + + + + -- cgit 1.3.0-6-gf8a5