diff options
Diffstat (limited to 'introspection')
| -rw-r--r-- | introspection/Makefile.am | 1 | ||||
| -rw-r--r-- | introspection/Makefile.in | 58 | ||||
| -rw-r--r-- | introspection/all.xml.in | 1 | ||||
| -rw-r--r-- | introspection/generic-types.xml | 19 | ||||
| -rw-r--r-- | introspection/nm-active-connection.xml | 5 | ||||
| -rw-r--r-- | introspection/nm-device-bridge.xml | 34 | ||||
| -rw-r--r-- | introspection/nm-device.xml | 25 | ||||
| -rw-r--r-- | introspection/nm-manager.xml | 29 |
8 files changed, 142 insertions, 30 deletions
diff --git a/introspection/Makefile.am b/introspection/Makefile.am index a267b51a..3850a234 100644 --- a/introspection/Makefile.am +++ b/introspection/Makefile.am @@ -13,6 +13,7 @@ EXTRA_DIST = \ nm-device-wimax.xml \ nm-device-infiniband.xml \ nm-device-bond.xml \ + nm-device-bridge.xml \ nm-device-vlan.xml \ nm-device.xml \ nm-ip4-config.xml \ diff --git a/introspection/Makefile.in b/introspection/Makefile.in index 158e7b4c..268ffd4e 100644 --- a/introspection/Makefile.in +++ b/introspection/Makefile.in @@ -55,16 +55,18 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/all.xml.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ - $(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)/m4/vapigen.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/gnome-code-coverage.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)/m4/vapigen.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -97,6 +99,10 @@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CKDB_PATH = @CKDB_PATH@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -111,9 +117,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DHCLIENT_PATH = @DHCLIENT_PATH@ -DHCLIENT_VERSION = @DHCLIENT_VERSION@ DHCPCD_PATH = @DHCPCD_PATH@ -DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ @@ -123,17 +127,14 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GENHTML = @GENHTML@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GIO_CFLAGS = @GIO_CFLAGS@ -GIO_LIBS = @GIO_LIBS@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MAKEFILE = @GLIB_MAKEFILE@ GLIB_MKENUMS = @GLIB_MKENUMS@ -GMODULE_CFLAGS = @GMODULE_CFLAGS@ -GMODULE_LIBS = @GMODULE_LIBS@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ @@ -174,6 +175,7 @@ IPTABLES_PATH = @IPTABLES_PATH@ IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@ IWMX_SDK_LIBS = @IWMX_SDK_LIBS@ KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@ +LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBDL = @LIBDL@ @@ -190,11 +192,7 @@ LIBNL2_LIBS = @LIBNL2_LIBS@ LIBNL3_CFLAGS = @LIBNL3_CFLAGS@ LIBNL3_LIBS = @LIBNL3_LIBS@ LIBNL_CFLAGS = @LIBNL_CFLAGS@ -LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@ -LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@ LIBNL_LIBS = @LIBNL_LIBS@ -LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@ -LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ @@ -209,6 +207,8 @@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ +MM_GLIB_CFLAGS = @MM_GLIB_CFLAGS@ +MM_GLIB_LIBS = @MM_GLIB_LIBS@ MOC = @MOC@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ @@ -218,6 +218,7 @@ NMEDIT = @NMEDIT@ NM_MAJOR_VERSION = @NM_MAJOR_VERSION@ NM_MICRO_VERSION = @NM_MICRO_VERSION@ NM_MINOR_VERSION = @NM_MINOR_VERSION@ +NM_MODIFY_SYSTEM_POLICY = @NM_MODIFY_SYSTEM_POLICY@ NM_VERSION = @NM_VERSION@ NSS_CFLAGS = @NSS_CFLAGS@ NSS_LIBS = @NSS_LIBS@ @@ -244,13 +245,14 @@ PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@ QT_CFLAGS = @QT_CFLAGS@ QT_LIBS = @QT_LIBS@ RANLIB = @RANLIB@ -RESOLVCONF_PATH = @RESOLVCONF_PATH@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ -SYSTEMD_LIBS = @SYSTEMD_LIBS@ +SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@ +SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@ +SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@ +SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@ SYSTEM_CA_PATH = @SYSTEM_CA_PATH@ UDEV_BASE_DIR = @UDEV_BASE_DIR@ USE_NLS = @USE_NLS@ @@ -305,6 +307,11 @@ localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ +nmbinary = @nmbinary@ +nmconfdir = @nmconfdir@ +nmdatadir = @nmdatadir@ +nmrundir = @nmrundir@ +nmstatedir = @nmstatedir@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ prefix = @prefix@ @@ -319,6 +326,10 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +with_dhclient = @with_dhclient@ +with_dhcpcd = @with_dhcpcd@ +with_netconfig = @with_netconfig@ +with_resolvconf = @with_resolvconf@ EXTRA_DIST = \ all.xml.in \ generic-types.xml \ @@ -334,6 +345,7 @@ EXTRA_DIST = \ nm-device-wimax.xml \ nm-device-infiniband.xml \ nm-device-bond.xml \ + nm-device-bridge.xml \ nm-device-vlan.xml \ nm-device.xml \ nm-ip4-config.xml \ diff --git a/introspection/all.xml.in b/introspection/all.xml.in index e9e7b0e0..a8cea613 100644 --- a/introspection/all.xml.in +++ b/introspection/all.xml.in @@ -36,6 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <xi:include href="nm-device-wimax.xml"/> <xi:include href="nm-device-infiniband.xml"/> <xi:include href="nm-device-bond.xml"/> +<xi:include href="nm-device-bridge.xml"/> <xi:include href="nm-device-vlan.xml"/> <xi:include href="nm-device-adsl.xml"/> <xi:include href="nm-wimax-nsp.xml"/> diff --git a/introspection/generic-types.xml b/introspection/generic-types.xml index 1a9e3169..681b6662 100644 --- a/introspection/generic-types.xml +++ b/introspection/generic-types.xml @@ -26,10 +26,25 @@ <tp:docstring>Mode is unknown.</tp:docstring> </tp:enumvalue> <tp:enumvalue suffix="ADHOC" value="1"> - <tp:docstring>Uncoordinated network without central infrastructure.</tp:docstring> + <tp:docstring> + For both devices and access point objects, indicates the object is + part of an Ad-Hoc 802.11 network without a central coordinating access + point. + </tp:docstring> </tp:enumvalue> <tp:enumvalue suffix="INFRA" value="2"> - <tp:docstring>Coordinated network with one or more central controllers.</tp:docstring> + <tp:docstring> + The wireless device or access point is in infrastructure mode. For + devices, this indicates the device is an 802.11 client/station. For + access point objects, this indicates the object is an access point that + provides connectivity to clients. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="AP" value="3"> + <tp:docstring> + The device is an access point/hotspot. Not valid for access point + objects themselves. + </tp:docstring> </tp:enumvalue> </tp:enum> </tp:generic-types> diff --git a/introspection/nm-active-connection.xml b/introspection/nm-active-connection.xml index ef01ab16..d90565ae 100644 --- a/introspection/nm-active-connection.xml +++ b/introspection/nm-active-connection.xml @@ -70,6 +70,11 @@ The connection is being torn down and cleaned up. </tp:docstring> </tp:enumvalue> + <tp:enumvalue suffix="DEACTIVATED" value="4"> + <tp:docstring> + The connection is no longer active. + </tp:docstring> + </tp:enumvalue> </tp:enum> </interface> </node> diff --git a/introspection/nm-device-bridge.xml b/introspection/nm-device-bridge.xml new file mode 100644 index 00000000..f3b25602 --- /dev/null +++ b/introspection/nm-device-bridge.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"> + <interface name="org.freedesktop.NetworkManager.Device.Bridge"> + + <property name="HwAddress" type="s" access="read"> + <tp:docstring> + Hardware address of the device. + </tp:docstring> + </property> + + <property name="Carrier" type="b" access="read"> + <tp:docstring> + Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not). + </tp:docstring> + </property> + + <property name="Slaves" type="ao" access="read"> + <tp:docstring> + Array of object paths representing devices which are currently + slaved to this device. + </tp:docstring> + </property> + + <signal name="PropertiesChanged"> + <arg name="properties" type="a{sv}" tp:type="String_Variant_Map"> + <tp:docstring> + A dictionary mapping property names to variant boxed values + </tp:docstring> + </arg> + </signal> + + </interface> +</node> diff --git a/introspection/nm-device.xml b/introspection/nm-device.xml index 20bbb917..b03b1b84 100644 --- a/introspection/nm-device.xml +++ b/introspection/nm-device.xml @@ -120,6 +120,11 @@ The general type of the network device; ie Ethernet, WiFi, etc. </tp:docstring> </property> + <property name="AvailableConnections" type="ao" access="read"> + <tp:docstring> + An array of object paths of every configured connection that is currently 'available' through this device. + </tp:docstring> + </property> <method name="Disconnect"> <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_device_disconnect"/> @@ -279,6 +284,11 @@ The device is an ADSL device supporting PPPoE and PPPoATM protocols. </tp:docstring> </tp:enumvalue> + <tp:enumvalue suffix="BRIDGE" value="13"> + <tp:docstring> + The device is a bridge interface. + </tp:docstring> + </tp:enumvalue> </tp:enum> <tp:flags name="NM_DEVICE_CAP" value-prefix="NM_DEVICE_CAP" type="u"> @@ -554,6 +564,21 @@ Problem with the RFC 2684 Ethernet over ADSL bridge. </tp:docstring> </tp:enumvalue> + <tp:enumvalue suffix="MODEM_MANAGER_UNAVAILABLE" value="52"> + <tp:docstring> + ModemManager was not running or quit unexpectedly. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="SSID_NOT_FOUND" value="53"> + <tp:docstring> + The 802.11 Wi-Fi network could not be found. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="SECONDARY_CONNECTION_FAILED" value="54"> + <tp:docstring> + A secondary connection of the base connection failed. + </tp:docstring> + </tp:enumvalue> </tp:enum> <tp:struct name="NM_DEVICE_STATE_REASON_STRUCT"> diff --git a/introspection/nm-manager.xml b/introspection/nm-manager.xml index f5fd7abc..6f3c8cac 100644 --- a/introspection/nm-manager.xml +++ b/introspection/nm-manager.xml @@ -216,11 +216,30 @@ <tp:docstring> 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: [NONE, HW, RFKILL, - ETHER, WIFI, BT, MB, DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4, - DNS, VPN, SHARING, SUPPLICANT, USER_SET, SYS_SET, SUSPEND, CORE, - DEVICE, OLPC]. If an empty string is given, the log level is changed - but the current set of log domains remains unchanged. + related to that domain. Available domains are: [HW, 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. + </tp:docstring> + </arg> + </method> + + <method name="GetLogging"> + <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_get_logging"/> + <tp:docstring> + Get current logging verbosity level and operations domains. + </tp:docstring> + <arg name="level" type="s" direction="out"> + <tp:docstring> + One of [ERR, WARN, INFO, DEBUG]. + </tp:docstring> + </arg> + <arg name="domains" type="s" direction="out"> + <tp:docstring> + For available domains see SetLogging() call. </tp:docstring> </arg> </method> |