diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-08-23 18:43:45 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-08-23 18:43:45 -0500 |
| commit | 2d67c1c6b2606b2c96831a44da73afe41fb8b6e1 (patch) | |
| tree | c38b6207b211df66ea48448cd86c04fcc90ad43a | |
| parent | 32e6eba8731f7f3328ae287d0493d941dadec06f (diff) | |
| download | tdelibs-2d67c1c6b2606b2c96831a44da73afe41fb8b6e1.tar.gz tdelibs-2d67c1c6b2606b2c96831a44da73afe41fb8b6e1.zip | |
Update introspection to latest NM API
32 files changed, 1700 insertions, 556 deletions
diff --git a/tdecore/networkbackends/network-manager/dbus/CMakeLists.txt b/tdecore/networkbackends/network-manager/dbus/CMakeLists.txt index 70371c6ad..e179dad3e 100644 --- a/tdecore/networkbackends/network-manager/dbus/CMakeLists.txt +++ b/tdecore/networkbackends/network-manager/dbus/CMakeLists.txt @@ -35,31 +35,25 @@ function( add_dbus_xml option basename classname namespace xmlfile ) endfunction( ) add_dbus_xml( p networkmanagerproxy NetworkManagerProxy DBus nm-manager.xml ) -add_dbus_xml( p networkmanagervpnproxy NetworkManagerVPNProxy DBus nm-vpn-manager.xml ) +add_dbus_xml( p networkmanagerpppproxy NetworkManagerPPPProxy DBus nm-ppp-manager.xml ) add_dbus_xml( p deviceproxy DeviceProxy DBus nm-device.xml ) -add_dbus_xml( p wirelessproxy WirelessDeviceProxy DBus nm-device-802-11-wireless.xml ) -add_dbus_xml( p wiredproxy WiredDeviceProxy DBus nm-device-802-3-ethernet.xml ) -add_dbus_xml( p gsmproxy GSMDeviceProxy DBus nm-device-gsm.xml ) -add_dbus_xml( p cdmaproxy CDMADeviceProxy DBus nm-device-cdma.xml ) +add_dbus_xml( p wifiproxy WiFiDeviceProxy DBus nm-device-wifi.xml ) +add_dbus_xml( p wimaxproxy WiMaxDeviceProxy DBus nm-device-wimax.xml ) +add_dbus_xml( p ethernetproxy EthernetDeviceProxy DBus nm-device-ethernet.xml ) +add_dbus_xml( p infinibandproxy InfinibandDeviceProxy DBus nm-device-infiniband.xml ) +add_dbus_xml( p modemproxy ModemDeviceProxy DBus nm-device-modem.xml ) add_dbus_xml( p accesspointproxy AccessPointProxy DBus nm-access-point.xml ) add_dbus_xml( p activeconnectionproxy ActiveConnectionProxy DBus nm-active-connection.xml ) -add_dbus_xml( p vpnconnectionproxy VPNConnectionProxy DBus nm-vpn-connection-only.xml ) +add_dbus_xml( p vpnconnectionproxy VPNConnectionProxy DBus nm-vpn-connection.xml ) add_dbus_xml( p vpnpluginproxy VPNPluginProxy DBus nm-vpn-plugin.xml ) add_dbus_xml( i networkmanagersettings SettingsInterface DBus nm-settings.xml ) -add_dbus_xml( i connection "" DBus nm-exported-connection.xml ) - -add_custom_command( OUTPUT connectionnode.cpp connectionnode.h introspectableinterface.cpp introspectableinterface.h - COMMAND ${DBUSXML2QT3_EXECUTABLE} -n connectionnode -c ConnectionNode -N DBus ${INTROSPECTIONPATH}/nm-exported-connection.xml 2>/dev/null - COMMAND sed s/\#include\\ \\"secrets.h\\"// connectionnode.cpp > connectionnode.cpp_tmp - COMMAND sed s/\#include\\ \\"introspectable.h\\"/\#include\\ \\"introspectableinterface.h\\"/ connectionnode.cpp_tmp > connectionnode.cpp - COMMAND rm -f connectionnode.cpp_tmp - DEPENDS ${INTROSPECTIONPATH}/nm-exported-connection.xml ) +add_dbus_xml( i connectionsettings ConnectionSettingsInterface DBus nm-settings-connection.xml ) # generate moc files -set( MOCHEADERS accesspointproxy.h deviceproxy.h networkmanagerproxy.h networkmanagervpnproxy.h wiredproxy.h - wirelessproxy.h activeconnectionproxy.h vpnconnectionproxy.h vpnpluginproxy.h gsmproxy.h cdmaproxy.h ) +set( MOCHEADERS accesspointproxy.h deviceproxy.h networkmanagerproxy.h networkmanagerpppproxy.h ethernetproxy.h + infinibandproxy.h wifiproxy.h wimaxproxy.h activeconnectionproxy.h vpnconnectionproxy.h vpnpluginproxy.h modemproxy.h ) foreach( _header_file ${MOCHEADERS} ) get_filename_component( _basename "${_header_file}" NAME_WE ) @@ -79,10 +73,10 @@ add_custom_command( OUTPUT mocfiles.cpp tde_add_library( tdenm_dbus STATIC_PIC SOURCES - networkmanagerproxy.cpp networkmanagervpnproxy.cpp - deviceproxy.cpp wiredproxy.cpp wirelessproxy.cpp - accesspointproxy.cpp networkmanagersettings.cpp - connection.cpp connectionnode.cpp introspectableinterface.cpp + networkmanagerproxy.cpp networkmanagerpppproxy.cpp + deviceproxy.cpp ethernetproxy.cpp infinibandproxy.cpp wifiproxy.cpp + wimaxproxy.cpp accesspointproxy.cpp networkmanagersettings.cpp + connectionsettings.cpp mocfiles.cpp activeconnectionproxy.cpp vpnconnectionproxy.cpp - vpnpluginproxy.cpp gsmproxy.cpp cdmaproxy.cpp + vpnpluginproxy.cpp modemproxy.cpp ) diff --git a/tdecore/networkbackends/network-manager/introspection/Makefile.am b/tdecore/networkbackends/network-manager/introspection/Makefile.am deleted file mode 100644 index b16f0aed3..000000000 --- a/tdecore/networkbackends/network-manager/introspection/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -EXTRA_DIST = \ - nm-access-point.xml \ - nm-active-connection.xml \ - nm-device-802-11-wireless.xml \ - nm-device-802-3-ethernet.xml \ - nm-device-cdma.xml \ - nm-device-gsm.xml \ - nm-device.xml \ - nm-exported-connection.xml \ - nm-ip4-config.xml \ - nm-manager.xml \ - nm-manager-client.xml \ - nm-ppp-manager.xml \ - nm-settings.xml \ - nm-vpn-manager.xml \ - nm-vpn-plugin.xml \ - nm-vpn-connection.xml - diff --git a/tdecore/networkbackends/network-manager/introspection/nm-access-point.xml b/tdecore/networkbackends/network-manager/introspection/nm-access-point.xml index 5a42f9552..21f238ffa 100644 --- a/tdecore/networkbackends/network-manager/introspection/nm-access-point.xml +++ b/tdecore/networkbackends/network-manager/introspection/nm-access-point.xml @@ -18,7 +18,7 @@ <tp:docstring>The radio channel frequency in use by the access point, in MHz.</tp:docstring> </property> <property name="HwAddress" type="s" access="read"> - <tp:docstring>The hardware address of the access point.</tp:docstring> + <tp:docstring>The hardware address (BSSID) of the access point.</tp:docstring> </property> <property name="Mode" type="u" access="read" tp:type="NM_802_11_MODE"> @@ -28,7 +28,7 @@ <tp:docstring>The maximum bitrate this access point is capable of, in kilobits/second (Kb/s).</tp:docstring> </property> <property name="Strength" type="y" access="read"> - <tp:docstring>The current signal strength received from this access point.</tp:docstring> + <tp:docstring>The current signal quality of the access point, in percent.</tp:docstring> </property> <signal name="PropertiesChanged"> @@ -69,16 +69,16 @@ <tp:docstring>Access point supports pairwise CCMP encryption.</tp:docstring> </tp:flag> <tp:flag suffix="GROUP_WEP40" value="0x10"> - <tp:docstring>Access point supports a group 40-bit WEP cypher.</tp:docstring> + <tp:docstring>Access point supports a group 40-bit WEP cipher.</tp:docstring> </tp:flag> <tp:flag suffix="GROUP_WEP104" value="0x20"> - <tp:docstring>Access point supports a group 104-bit WEP cypher.</tp:docstring> + <tp:docstring>Access point supports a group 104-bit WEP cipher.</tp:docstring> </tp:flag> <tp:flag suffix="GROUP_TKIP" value="0x40"> - <tp:docstring>Access point supports a group TKIP cypher.</tp:docstring> + <tp:docstring>Access point supports a group TKIP cipher.</tp:docstring> </tp:flag> <tp:flag suffix="GROUP_CCMP" value="0x80"> - <tp:docstring>Access point supports a group CCMP cypher.</tp:docstring> + <tp:docstring>Access point supports a group CCMP cipher.</tp:docstring> </tp:flag> <tp:flag suffix="KEY_MGMT_PSK" value="0x100"> <tp:docstring>Access point supports PSK key management.</tp:docstring> diff --git a/tdecore/networkbackends/network-manager/introspection/nm-active-connection.xml b/tdecore/networkbackends/network-manager/introspection/nm-active-connection.xml index f69d2f6fd..ef01ab160 100644 --- a/tdecore/networkbackends/network-manager/introspection/nm-active-connection.xml +++ b/tdecore/networkbackends/network-manager/introspection/nm-active-connection.xml @@ -2,29 +2,43 @@ <node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"> <interface name="org.freedesktop.NetworkManager.Connection.Active"> - <property name="ServiceName" type="s" access="read"> - <tp:docstring>The D-Bus service name providing this connection.</tp:docstring> - </property> + <tp:docstring> + Objects that implement the Connection.Active interface represent an attempt + to connect to a network using the details provided by a Connection object. + The Connection.Active object tracks the life-cycle of the connection + attempt and if successful indicates whether the connected network is the + "default" or preferred network for access. + </tp:docstring> + <property name="Connection" type="o" access="read"> <tp:docstring>The path of the connection.</tp:docstring> </property> <property name="SpecificObject" type="o" access="read"> <tp:docstring>A specific object associated with the active connection.</tp:docstring> </property> - <property name="SharedServiceName" type="s" access="read"> - <tp:docstring>The D-Bus service name that provides a connection with which this active connection is shared.</tp:docstring> - </property> - <property name="SharedConnection" type="o" access="read"> - <tp:docstring>The path of a connection provided by the D-Bus service SharedServiceName which which this connection is shared.</tp:docstring> + <property name="Uuid" type="s" access="read"> + <tp:docstring> + The UUID of the connection, provided as a convenience so that clients + do not have to retrieve all connection details. + </tp:docstring> </property> <property name="Devices" type="ao" access="read"> <tp:docstring>Array of object paths representing devices which are part of this active connection.</tp:docstring> </property> - <property name="State" type="u" access="read" tp:type="NM_ACTIVE_DEVICE_STATE"> + <property name="State" type="u" access="read" tp:type="NM_ACTIVE_CONNECTION_STATE"> <tp:docstring>The state of this active connection.</tp:docstring> </property> <property name="Default" type="b" access="read"> - <tp:docstring>Whether this active connection is the default connection, i.e. whether it currently owns the default route.</tp:docstring> + <tp:docstring>Whether this active connection is the default IPv4 connection, i.e. whether it currently owns the default IPv4 route.</tp:docstring> + </property> + <property name="Default6" type="b" access="read"> + <tp:docstring>Whether this active connection is the default IPv6 connection, i.e. whether it currently owns the default IPv6 route.</tp:docstring> + </property> + <property name="Vpn" type="b" access="read"> + <tp:docstring>Whether this active connection is also a VPN connection.</tp:docstring> + </property> + <property name="Master" type="o" access="read"> + <tp:docstring>The path to the master device if the connection is a slave.</tp:docstring> </property> <signal name="PropertiesChanged"> @@ -51,6 +65,11 @@ The connection is activated. </tp:docstring> </tp:enumvalue> + <tp:enumvalue suffix="DEACTIVATING" value="3"> + <tp:docstring> + The connection is being torn down and cleaned up. + </tp:docstring> + </tp:enumvalue> </tp:enum> </interface> </node> diff --git a/tdecore/networkbackends/network-manager/introspection/nm-agent-manager.xml b/tdecore/networkbackends/network-manager/introspection/nm-agent-manager.xml new file mode 100644 index 000000000..e26caacf4 --- /dev/null +++ b/tdecore/networkbackends/network-manager/introspection/nm-agent-manager.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<node name="/org/freedesktop/NetworkManager/AgentManager" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"> + <interface name="org.freedesktop.NetworkManager.AgentManager"> + + <method name="Register"> + <tp:docstring> + Called by secret Agents to register their ability to provide and save + network secrets. + </tp:docstring> + <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_agent_manager_register"/> + <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> + <arg name="identifier" type="s" direction="in"> + <tp:docstring> + 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). + </tp:docstring> + </arg> + </method> + + <method name="Unregister"> + <tp:docstring> + 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. + </tp:docstring> + <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_agent_manager_unregister"/> + <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> + </method> + + </interface> +</node> + diff --git a/tdecore/networkbackends/network-manager/introspection/nm-device-gsm.xml b/tdecore/networkbackends/network-manager/introspection/nm-device-adsl.xml index 650d656a7..ec50d1104 100644 --- a/tdecore/networkbackends/network-manager/introspection/nm-device-gsm.xml +++ b/tdecore/networkbackends/network-manager/introspection/nm-device-adsl.xml @@ -1,7 +1,7 @@ <?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.Gsm"> + <interface name="org.freedesktop.NetworkManager.Device.Adsl"> <signal name="PropertiesChanged"> <arg name="properties" type="a{sv}" tp:type="String_Variant_Map"> @@ -11,5 +11,11 @@ </arg> </signal> + <property name="Carrier" type="b" access="read"> + <tp:docstring> + Indicates whether the physical carrier is found. + </tp:docstring> + </property> + </interface> </node> diff --git a/tdecore/networkbackends/network-manager/introspection/nm-device-bond.xml b/tdecore/networkbackends/network-manager/introspection/nm-device-bond.xml new file mode 100644 index 000000000..9d200ef8f --- /dev/null +++ b/tdecore/networkbackends/network-manager/introspection/nm-device-bond.xml @@ -0,0 +1,27 @@ +<?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.Bond"> + + <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> + + <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/tdecore/networkbackends/network-manager/introspection/nm-device-bt.xml b/tdecore/networkbackends/network-manager/introspection/nm-device-bt.xml new file mode 100644 index 000000000..cc4a9b544 --- /dev/null +++ b/tdecore/networkbackends/network-manager/introspection/nm-device-bt.xml @@ -0,0 +1,48 @@ +<?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.Bluetooth"> + + <property name="HwAddress" type="s" access="read"> + <tp:docstring> + Bluetooth hardware address of the device. + </tp:docstring> + </property> + + <property name="Name" type="s" access="read"> + <tp:docstring> + Bluetooth name of the device. + </tp:docstring> + </property> + + <property name="BtCapabilities" type="u" access="read" tp:type="NM_BT_CAPABILITIES"> + <tp:docstring> + Bluetooth capabilities of the device (either DUN or NAP). + </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> + + <tp:flags name="NM_BT_CAPABILITIES" value-prefix="NM_BT_CAPABILITY" type="u"> + <tp:docstring> + Flags describing the capabilities of a Bluetooth device. + </tp:docstring> + <tp:flag suffix="NONE" value="0x0"> + <tp:docstring>The device has no recognized capabilities.</tp:docstring> + </tp:flag> + <tp:flag suffix="DUN" value="0x1"> + <tp:docstring>The device supports Bluetooth Dial-Up Networking.</tp:docstring> + </tp:flag> + <tp:flag suffix="PAN" value="0x2"> + <tp:docstring>The device supports Bluetooth Personal Area Networking.</tp:docstring> + </tp:flag> + </tp:flags> + + </interface> +</node> diff --git a/tdecore/networkbackends/network-manager/introspection/nm-device-cdma.xml b/tdecore/networkbackends/network-manager/introspection/nm-device-cdma.xml deleted file mode 100644 index 2b43f8fdc..000000000 --- a/tdecore/networkbackends/network-manager/introspection/nm-device-cdma.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?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.Cdma"> - - <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/tdecore/networkbackends/network-manager/introspection/nm-device-ethernet.xml b/tdecore/networkbackends/network-manager/introspection/nm-device-ethernet.xml new file mode 100644 index 000000000..000caf752 --- /dev/null +++ b/tdecore/networkbackends/network-manager/introspection/nm-device-ethernet.xml @@ -0,0 +1,39 @@ +<?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.Wired"> + + <property name="HwAddress" type="s" access="read"> + <tp:docstring> + Active hardware address of the device. + </tp:docstring> + </property> + + <property name="PermHwAddress" type="s" access="read"> + <tp:docstring> + Permanent hardware address of the device. + </tp:docstring> + </property> + + <property name="Speed" type="u" access="read"> + <tp:docstring> + Design speed of the device, in megabits/second (Mb/s). + </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> + + <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/tdecore/networkbackends/network-manager/introspection/nm-device-infiniband.xml b/tdecore/networkbackends/network-manager/introspection/nm-device-infiniband.xml new file mode 100644 index 000000000..097714c69 --- /dev/null +++ b/tdecore/networkbackends/network-manager/introspection/nm-device-infiniband.xml @@ -0,0 +1,27 @@ +<?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.Infiniband"> + + <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> + + <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/tdecore/networkbackends/network-manager/introspection/nm-device-modem.xml b/tdecore/networkbackends/network-manager/introspection/nm-device-modem.xml new file mode 100644 index 000000000..0ca101fd7 --- /dev/null +++ b/tdecore/networkbackends/network-manager/introspection/nm-device-modem.xml @@ -0,0 +1,64 @@ +<?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.Modem"> + + <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> + + <property name="ModemCapabilities" type="u" access="read" tp:type="NM_DEVICE_MODEM_CAPABILITIES"> + <tp:docstring> + 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. + </tp:docstring> + </property> + + <property name="CurrentCapabilities" type="u" access="read" tp:type="NM_DEVICE_MODEM_CAPABILITIES"> + <tp:docstring> + The generic family of access technologies the modem currently supports + without a firmware reload or reinitialization. + </tp:docstring> + </property> + + <tp:flags name="NM_DEVICE_MODEM_CAPABILITIES" value-prefix="NM_DEVICE_MODEM_CAPABILITY" type="u"> + <tp:docstring> + Flags describing one or more of the general access technology families + that a modem device supports. + </tp:docstring> + <tp:flag suffix="NONE" value="0x0"> + <tp:docstring>Modem has no capabilties.</tp:docstring> + </tp:flag> + <tp:flag suffix="POTS" value="0x1"> + <tp:docstring> + Modem supports the analog wired telephone network (ie 56k dialup) and + does not have wireless/cellular capabilities. + </tp:docstring> + </tp:flag> + <tp:flag suffix="CDMA_EVDO" value="0x2"> + <tp:docstring> + Modem supports at least one of CDMA 1xRTT, EVDO revision 0, EVDO + revision A, or EVDO revision B. + </tp:docstring> + </tp:flag> + <tp:flag suffix="GSM_UMTS" value="0x4"> + <tp:docstring> + Modem supports at least one of GSM, GPRS, EDGE, UMTS, HSDPA, HSUPA, or + HSPA+ packet switched data capability. + </tp:docstring> + </tp:flag> + <tp:flag suffix="LTE" value="0x8"> + <tp:docstring> + Modem has at LTE data capability. + </tp:docstring> + </tp:flag> + </tp:flags> + + </interface> +</node> diff --git a/tdecore/networkbackends/network-manager/introspection/nm-device-olpc-mesh.xml b/tdecore/networkbackends/network-manager/introspection/nm-device-olpc-mesh.xml new file mode 100644 index 000000000..c30ecfc60 --- /dev/null +++ b/tdecore/networkbackends/network-manager/introspection/nm-device-olpc-mesh.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.OlpcMesh"> + <property name="HwAddress" type="s" access="read"> + <tp:docstring> + The hardware address of the device. + </tp:docstring> + </property> + + <property name="Companion" type="o" access="read"> + <tp:docstring> + The object path of the companion device. + </tp:docstring> + </property> + + <property name="ActiveChannel" type="u" access="read"> + <tp:docstring> + The currently active channel. + </tp:docstring> + </property> + + <signal name="PropertiesChanged"> + <arg name="properties" type="a{sv}" tp:type="String_Variant_Map"> + <tp:docstring> + A dictionary containing the FIXME: check changed parameters. + </tp:docstring> + </arg> + <tp:docstring> + Emitted when the wireless device's properties changed. + </tp:docstring> + </signal> + </interface> +</node> diff --git a/tdecore/networkbackends/network-manager/introspection/nm-device-802-3-ethernet.xml b/tdecore/networkbackends/network-manager/introspection/nm-device-vlan.xml index cccae99b8..54b7bbe48 100644 --- a/tdecore/networkbackends/network-manager/introspection/nm-device-802-3-ethernet.xml +++ b/tdecore/networkbackends/network-manager/introspection/nm-device-vlan.xml @@ -1,7 +1,7 @@ <?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.Wired"> + <interface name="org.freedesktop.NetworkManager.Device.Vlan"> <property name="HwAddress" type="s" access="read"> <tp:docstring> @@ -9,15 +9,15 @@ </tp:docstring> </property> - <property name="Speed" type="u" access="read"> + <property name="Carrier" type="b" access="read"> <tp:docstring> - Design speed of the device. + Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not). </tp:docstring> </property> - <property name="Carrier" type="b" access="read"> + <property name="VlanId" type="u" access="read"> <tp:docstring> - Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not). + The VLAN ID of this VLAN interface. </tp:docstring> </property> diff --git a/tdecore/networkbackends/network-manager/introspection/nm-device-802-11-wireless.xml b/tdecore/networkbackends/network-manager/introspection/nm-device-wifi.xml index 6b31b3a83..531fc8930 100644 --- a/tdecore/networkbackends/network-manager/introspection/nm-device-802-11-wireless.xml +++ b/tdecore/networkbackends/network-manager/introspection/nm-device-wifi.xml @@ -14,11 +14,31 @@ </tp:docstring> </method> + <method name="RequestScan"> + <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_device_request_scan"/> + <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> + <arg name="options" type="a{sv}" direction="in"> + <tp:docstring> + Options of scan + </tp:docstring> + </arg> + <tp:docstring> + Request the device to scan + </tp:docstring> + </method> + <property name="HwAddress" type="s" access="read"> <tp:docstring> - The hardware address of the device. + The active hardware address of the device. + </tp:docstring> + </property> + + <property name="PermHwAddress" type="s" access="read"> + <tp:docstring> + The permanent hardware address of the device. </tp:docstring> </property> + <property name="Mode" type="u" access="read" tp:type="NM_802_11_MODE"> <tp:docstring> The operating mode of the wireless device. @@ -82,16 +102,16 @@ <tp:docstring>Null capability - syntactic sugar for no capabilities supported. Do not AND this with other capabilities!</tp:docstring> </tp:flag> <tp:flag suffix="CIPHER_WEP40" value="0x1"> - <tp:docstring>The device supports the 40-bit WEP cypher.</tp:docstring> + <tp:docstring>The device supports the 40-bit WEP cipher.</tp:docstring> </tp:flag> <tp:flag suffix="CIPHER_WEP104" value="0x2"> - <tp:docstring>The device supports the 104-bit WEP cypher.</tp:docstring> + <tp:docstring>The device supports the 104-bit WEP cipher.</tp:docstring> </tp:flag> <tp:flag suffix="CIPHER_TKIP" value="0x4"> - <tp:docstring>The device supports the TKIP cypher.</tp:docstring> + <tp:docstring>The device supports the TKIP cipher.</tp:docstring> </tp:flag> <tp:flag suffix="CIPHER_CCMP" value="0x8"> - <tp:docstring>The device supports the CCMP cypher.</tp:docstring> + <tp:docstring>The device supports the CCMP cipher.</tp:docstring> </tp:flag> <tp:flag suffix="WPA" value="0x10"> <tp:docstring>The device supports the WPA encryption/authentication protocol.</tp:docstring> diff --git a/tdecore/networkbackends/network-manager/introspection/nm-device-wimax.xml b/tdecore/networkbackends/network-manager/introspection/nm-device-wimax.xml new file mode 100644 index 000000000..6e414087f --- /dev/null +++ b/tdecore/networkbackends/network-manager/introspection/nm-device-wimax.xml @@ -0,0 +1,103 @@ +<?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.WiMax"> + <method name="GetNspList"> + <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_device_get_nsp_list"/> + <arg name="nsps" type="ao" direction="out"> + <tp:docstring> + List of NSP object paths + </tp:docstring> + </arg> + <tp:docstring> + Get the list of NSPs visible to this device. + </tp:docstring> + </method> + + <property name="HwAddress" type="s" access="read"> + <tp:docstring> + Hardware address of the device. + </tp:docstring> + </property> + + <property name="CenterFrequency" type="u" access="read"> + <tp:docstring> + 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. + </tp:docstring> + </property> + + <property name="Rssi" type="i" access="read"> + <tp:docstring> + 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. + </tp:docstring> + </property> + + <property name="Cinr" type="i" access="read"> + <tp:docstring> + 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. + </tp:docstring> + </property> + + <property name="TxPower" type="i" access="read"> + <tp:docstring> + 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. + </tp:docstring> + </property> + + <property name="Bsid" type="s" access="read"> + <tp:docstring> + The ID of the serving base station as received from the network. Has + no meaning when the device is not connected. + </tp:docstring> + </property> + + <property name="ActiveNsp" type="o" access="read"> + <tp:docstring> + Object path of the NSP currently used by the WiMax 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> + <tp:docstring> + Emitted when the WiMax device's properties changed. + </tp:docstring> + </signal> + + <signal name="NspAdded"> + <arg name="nsp" type="o"> + <tp:docstring> + The object path of the newly found NSP. + </tp:docstring> + </arg> + <tp:docstring> + Emitted when a new NSP is found by the device. + </tp:docstring> + </signal> + + <signal name="NspRemoved"> + <arg name="nsp" type="o"> + <tp:docstring> + The object path of the NSP that has disappeared. + </tp:docstring> + </arg> + <tp:docstring> + Emitted when an NSP disappears from view of the device. + </tp:docstring> + </signal> + + </interface> +</node> diff --git a/tdecore/networkbackends/network-manager/introspection/nm-device.xml b/tdecore/networkbackends/network-manager/introspection/nm-device.xml index 848942abb..5b2c98b3c 100644 --- a/tdecore/networkbackends/network-manager/introspection/nm-device.xml +++ b/tdecore/networkbackends/network-manager/introspection/nm-device.xml @@ -4,12 +4,31 @@ <interface name="org.freedesktop.NetworkManager.Device"> <property name="Udi" type="s" access="read"> <tp:docstring> - HAL UDI for the device. + 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. </tp:docstring> </property> <property name="Interface" type="s" access="read"> <tp:docstring> - The network interface offered by the device. + The name of the device's control (and often data) interface. + </tp:docstring> + </property> + <property name="IpInterface" type="s" access="read"> + <tp:docstring> + The name of the device's data interface when available. This property + may not refer to the actual data interface until the device has + successfully established a data connection, indicated by the device's + State becoming ACTIVATED. </tp:docstring> </property> <property name="Driver" type="s" access="read"> @@ -17,6 +36,16 @@ The driver handling the device. </tp:docstring> </property> + <property name="DriverVersion" type="s" access="read"> + <tp:docstring> + The version of the driver handling the device. + </tp:docstring> + </property> + <property name="FirmwareVersion" type="s" access="read"> + <tp:docstring> + The firmware version for the device. + </tp:docstring> + </property> <property name="Capabilities" type="u" access="read" tp:type="NM_DEVICE_CAP"> <tp:docstring> Flags describing the capabilities of the device. @@ -32,31 +61,95 @@ The current state of the device. </tp:docstring> </property> + <property name="StateReason" type="(uu)" access="read" tp:type="NM_DEVICE_STATE_REASON_STRUCT"> + <tp:docstring> + The current state and reason for changing to that state. + </tp:docstring> + </property> + <property name="ActiveConnection" type="o" access="read"> + <tp:docstring> + Object path of an ActiveConnection object that "owns" this device during + activation. The ActiveConnection object tracks the life-cycle of a + connection to a specific network and implements the + org.freedesktop.NetworkManager.Connection.Active D-Bus interface. + </tp:docstring> + </property> <property name="Ip4Config" type="o" access="read"> <tp:docstring> Object path of the Ip4Config object describing the configuration of the device. Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state. </tp:docstring> </property> + <property name="Dhcp4Config" type="o" access="read"> + <tp:docstring> + Object path of the Dhcp4Config object describing the DHCP options returned by the DHCP server. Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state. + </tp:docstring> + </property> + <property name="Ip6Config" type="o" access="read"> + <tp:docstring> + Object path of the Ip6Config object describing the configuration of the device. Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state. + </tp:docstring> + </property> + <property name="Dhcp6Config" type="o" access="read"> + <tp:docstring> + Object path of the Dhcp6Config object describing the DHCP options + returned by the DHCP server. Only valid when the device is in the + NM_DEVICE_STATE_ACTIVATED state. + </tp:docstring> + </property> <property name="Managed" type="b" access="read"> <tp:docstring> Whether or not this device is managed by NetworkManager. </tp:docstring> </property> - - <!-- Ugh, but I see no other way of getting the type on the caller - based on dbus object path only --> - <property name="DeviceType" type="u" access="read"> + <property name="Autoconnect" type="b" access="readwrite"> + <tp:docstring> + If TRUE, indicates the device is allowed to autoconnect. If FALSE, + manual intervention is required before the device will automatically + connect to a known network, such as activating a connection using the + device, or setting this property to TRUE. + </tp:docstring> + </property> + <property name="FirmwareMissing" type="b" access="read"> + <tp:docstring> + If TRUE, indicates the device is likely missing firmware necessary for + its operation. + </tp:docstring> + </property> + <property name="DeviceType" type="u" access="read" tp:type="NM_DEVICE_TYPE"> + <tp:docstring> + 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"/> + <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> + <tp:docstring> + Disconnects a device and prevents the device from automatically activating further connections without user intervention. + </tp:docstring> + </method> <signal name="StateChanged"> - <arg name="state" type="u" tp:type="NM_DEVICE_STATE"> + <arg name="new_state" type="u" tp:type="NM_DEVICE_STATE"> <tp:docstring> The new state of the device. </tp:docstring> </arg> + <arg name="old_state" type="u" tp:type="NM_DEVICE_STATE"> + <tp:docstring> + The previous state of the device. + </tp:docstring> + </arg> + <arg name="reason" type="u" tp:type="NM_DEVICE_STATE_REASON"> + <tp:docstring> + A reason for the state transition. + </tp:docstring> + </arg> </signal> <tp:enum name="NM_DEVICE_STATE" type="u"> @@ -65,52 +158,134 @@ The device is in an unknown state. </tp:docstring> </tp:enumvalue> - <tp:enumvalue suffix="DOWN" value="1"> + <tp:enumvalue suffix="UNMANAGED" value="10"> + <tp:docstring> + The device is recognized but not managed by NetworkManager. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="UNAVAILABLE" value="20"> <tp:docstring> - The device is down. + The device cannot be used (carrier off, rfkill, etc). </tp:docstring> </tp:enumvalue> - <tp:enumvalue suffix="DISCONNECTED" value="2"> + <tp:enumvalue suffix="DISCONNECTED" value="30"> <tp:docstring> The device is not connected. </tp:docstring> </tp:enumvalue> - <tp:enumvalue suffix="PREPARE" value="3"> + <tp:enumvalue suffix="PREPARE" value="40"> <tp:docstring> The device is preparing to connect. </tp:docstring> </tp:enumvalue> - <tp:enumvalue suffix="CONFIG" value="4"> + <tp:enumvalue suffix="CONFIG" value="50"> <tp:docstring> The device is being configured. </tp:docstring> </tp:enumvalue> - <tp:enumvalue suffix="NEED_AUTH" value="5"> + <tp:enumvalue suffix="NEED_AUTH" value="60"> + <tp:docstring> + The device is awaiting secrets necessary to continue connection. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="IP_CONFIG" value="70"> <tp:docstring> - The device is awaiting authorization credentials. + The IP settings of the device are being requested and configured. </tp:docstring> </tp:enumvalue> - <tp:enumvalue suffix="IP_CONFIG" value="6"> + <tp:enumvalue suffix="IP_CHECK" value="80"> <tp:docstring> - The IP address of the device is being configured. + The device's IP connectivity ability is being determined. </tp:docstring> </tp:enumvalue> - <tp:enumvalue suffix="ACTIVATED" value="7"> + <tp:enumvalue suffix="SECONDARIES" value="90"> + <tp:docstring> + The device is waiting for secondary connections to be activated. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="ACTIVATED" value="100"> <tp:docstring> The device is active. </tp:docstring> </tp:enumvalue> - <tp:enumvalue suffix="FAILED" value="8"> + <tp:enumvalue suffix="DEACTIVATING" value="110"> + <tp:docstring> + The device's network connection is being torn down. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="FAILED" value="120"> <tp:docstring> The device is in a failure state following an attempt to activate it. </tp:docstring> </tp:enumvalue> - <tp:enumvalue suffix="CANCELLED" value="9"> + </tp:enum> + + <tp:enum name="NM_DEVICE_TYPE" type="u"> + <tp:enumvalue suffix="UNKNOWN" value="0"> + <tp:docstring> + The device type is unknown. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="ETHERNET" value="1"> <tp:docstring> - The previous activation attempt on this device was cancelled. + The device is wired Ethernet device. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="WIFI" value="2"> + <tp:docstring> + The device is an 802.11 WiFi device. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="UNUSED1" value="3"> + <tp:docstring>Unused</tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="UNUSED2" value="4"> + <tp:docstring>Unused</tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="BT" value="5"> + <tp:docstring> + The device is Bluetooth device that provides PAN or DUN capabilities. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="OLPC_MESH" value="6"> + <tp:docstring> + The device is an OLPC mesh networking device. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="WIMAX" value="7"> + <tp:docstring> + The device is an 802.16e Mobile WiMAX device. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="MODEM" value="8"> + <tp:docstring> + 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. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="INFINIBAND" value="9"> + <tp:docstring> + The device is an IP-capable InfiniBand interface. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="BOND" value="10"> + <tp:docstring> + The device is a bond master interface. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="VLAN" value="11"> + <tp:docstring> + The device is a VLAN interface. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="ADSL" value="12"> + <tp:docstring> + The device is an ADSL device supporting PPPoE and PPPoATM protocols. </tp:docstring> </tp:enumvalue> </tp:enum> + <tp:flags name="NM_DEVICE_CAP" value-prefix="NM_DEVICE_CAP" type="u"> <tp:flag suffix="NONE" value="0x0"> <tp:docstring>Null capability.</tp:docstring> @@ -122,5 +297,281 @@ <tp:docstring>The device supports carrier detection.</tp:docstring> </tp:flag> </tp:flags> + + <tp:enum name="NM_DEVICE_STATE_REASON" type="u"> + <tp:enumvalue suffix="UNKNOWN" value="0"> + <tp:docstring> + The reason for the device state change is unknown. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="NONE" value="1"> + <tp:docstring> + The state change is normal. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="NOW_MANAGED" value="2"> + <tp:docstring> + The device is now managed. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="NOW_UNMANAGED" value="3"> + <tp:docstring> + The device is no longer managed. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="CONFIG_FAILED" value="4"> + <tp:docstring> + The device could not be readied for configuration. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="CONFIG_UNAVAILABLE" value="5"> + <tp:docstring> + IP configuration could not be reserved (no available address, timeout, etc). + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="CONFIG_EXPIRED" value="6"> + <tp:docstring> + The IP configuration is no longer valid. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="NO_SECRETS" value="7"> + <tp:docstring> + Secrets were required, but not provided. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="SUPPLICANT_DISCONNECT" value="8"> + <tp:docstring> + The 802.1X supplicant disconnected from the access point or authentication server. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="SUPPLICANT_CONFIG_FAILED" value="9"> + <tp:docstring> + Configuration of the 802.1X supplicant failed. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="SUPPLICANT_FAILED" value="10"> + <tp:docstring> + The 802.1X supplicant quit or failed unexpectedly. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="SUPPLICANT_TIMEOUT" value="11"> + <tp:docstring> + The 802.1X supplicant took too long to authenticate. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="PPP_START_FAILED" value="12"> + <tp:docstring> + The PPP service failed to start within the allowed time. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="PPP_DISCONNECT" value="13"> + <tp:docstring> + The PPP service disconnected unexpectedly. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="PPP_FAILED" value="14"> + <tp:docstring> + The PPP service quit or failed unexpectedly. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="DHCP_START_FAILED" value="15"> + <tp:docstring> + The DHCP service failed to start within the allowed time. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="DHCP_ERROR" value="16"> + <tp:docstring> + The DHCP service reported an unexpected error. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="DHCP_FAILED" value="17"> + <tp:docstring> + The DHCP service quit or failed unexpectedly. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="SHARED_START_FAILED" value="18"> + <tp:docstring> + The shared connection service failed to start. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="SHARED_FAILED" value="19"> + <tp:docstring> + The shared connection service quit or failed unexpectedly. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="AUTOIP_START_FAILED" value="20"> + <tp:docstring> + The AutoIP service failed to start. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="AUTOIP_ERROR" value="21"> + <tp:docstring> + The AutoIP service reported an unexpected error. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="AUTOIP_FAILED" value="22"> + <tp:docstring> + The AutoIP service quit or failed unexpectedly. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="MODEM_BUSY" value="23"> + <tp:docstring> + Dialing failed because the line was busy. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="MODEM_NO_DIAL_TONE" value="24"> + <tp:docstring> + Dialing failed because there was no dial tone. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="MODEM_NO_CARRIER" value="25"> + <tp:docstring> + Dialing failed because there was carrier. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="MODEM_DIAL_TIMEOUT" value="26"> + <tp:docstring> + Dialing timed out. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="MODEM_DIAL_FAILED" value="27"> + <tp:docstring> + Dialing failed. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="MODEM_INIT_FAILED" value="28"> + <tp:docstring> + Modem initialization failed. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="GSM_APN_FAILED" value="29"> + <tp:docstring> + Failed to select the specified GSM APN. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="GSM_REGISTRATION_NOT_SEARCHING" value="30"> + <tp:docstring> + Not searching for networks. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="GSM_REGISTRATION_DENIED" value="31"> + <tp:docstring> + Network registration was denied. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="GSM_REGISTRATION_TIMEOUT" value="32"> + <tp:docstring> + Network registration timed out. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="GSM_REGISTRATION_FAILED" value="33"> + <tp:docstring> + Failed to register with the requested GSM network. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="GSM_PIN_CHECK_FAILED" value="34"> + <tp:docstring> + PIN check failed. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="FIRMWARE_MISSING" value="35"> + <tp:docstring> + Necessary firmware for the device may be missing. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="REMOVED" value="36"> + <tp:docstring> + The device was removed. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="SLEEPING" value="37"> + <tp:docstring> + NetworkManager went to sleep. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="CONNECTION_REMOVED" value="38"> + <tp:docstring> + The device's active connection was removed or disappeared. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="USER_REQUESTED" value="39"> + <tp:docstring> + A user or client requested the disconnection. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="CARRIER" value="40"> + <tp:docstring> + The device's carrier/link changed. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="CONNECTION_ASSUMED" value="41"> + <tp:docstring> + The device's existing connection was assumed. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="SUPPLICANT_AVAILABLE" value="42"> + <tp:docstring> + The 802.1x supplicant is now available. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="MODEM_NOT_FOUND" value="43"> + <tp:docstring> + The modem could not be found. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="BT_FAILED" value="44"> + <tp:docstring> + The Bluetooth connection timed out or failed. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="GSM_SIM_NOT_INSERTED" value="45"> + <tp:docstring> + GSM Modem's SIM Card not inserted. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="GSM_SIM_PIN_REQUIRED" value="46"> + <tp:docstring> + GSM Modem's SIM Pin required. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="GSM_SIM_PUK_REQUIRED" value="47"> + <tp:docstring> + GSM Modem's SIM Puk required. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="GSM_SIM_WRONG" value="48"> + <tp:docstring> + GSM Modem's SIM wrong + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="INFINIBAND_MODE" value="49"> + <tp:docstring> + InfiniBand device does not support connected mode. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="DEPENDENCY_FAILED" value="50"> + <tp:docstring> + A dependency of the connection failed. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="BR2684_FAILED" value="51"> + <tp:docstring> + Problem with the RFC 2684 Ethernet over ADSL bridge. + </tp:docstring> + </tp:enumvalue> + </tp:enum> + + <tp:struct name="NM_DEVICE_STATE_REASON_STRUCT"> + <tp:member type="u" name="state" tp:type="NM_DEVICE_STATE"> + <tp:docstring> + The device state. + </tp:docstring> + </tp:member> + <tp:member type="u" name="reason" tp:type="NM_DEVICE_STATE_REASON"> + <tp:docstring> + The reason for originally changing to the device state. + </tp:docstring> + </tp:member> + </tp:struct> </interface> </node> diff --git a/tdecore/networkbackends/network-manager/introspection/nm-dhcp4-config.xml b/tdecore/networkbackends/network-manager/introspection/nm-dhcp4-config.xml new file mode 100644 index 000000000..c0821ada9 --- /dev/null +++ b/tdecore/networkbackends/network-manager/introspection/nm-dhcp4-config.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"> + <interface name="org.freedesktop.NetworkManager.DHCP4Config"> + <tp:docstring> + Options and configuration returned by the IPv4 DHCP server. + </tp:docstring> + <property name="Options" type="a{sv}" access="read"> + <tp:docstring>Configuration options returned by a DHCP server, if any.</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/tdecore/networkbackends/network-manager/introspection/nm-dhcp6-config.xml b/tdecore/networkbackends/network-manager/introspection/nm-dhcp6-config.xml new file mode 100644 index 000000000..93b0f1c8f --- /dev/null +++ b/tdecore/networkbackends/network-manager/introspection/nm-dhcp6-config.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"> + <interface name="org.freedesktop.NetworkManager.DHCP6Config"> + <tp:docstring> + Options and configuration returned by the IPv6 DHCP server. + </tp:docstring> + <property name="Options" type="a{sv}" access="read"> + <tp:docstring>Configuration options returned by a DHCP server, if any.</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/tdecore/networkbackends/network-manager/introspection/nm-exported-connection.xml b/tdecore/networkbackends/network-manager/introspection/nm-exported-connection.xml deleted file mode 100644 index 251ccafd4..000000000 --- a/tdecore/networkbackends/network-manager/introspection/nm-exported-connection.xml +++ /dev/null @@ -1,108 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> - -<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"> - - <interface name="org.freedesktop.NetworkManagerSettings.Connection"> - <tp:docstring> - Represents a single network connection configuration. - </tp:docstring> - <method name="GetID"> - <tp:docstring> - Obtain the ID of this connection. - </tp:docstring> - <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_exported_connection_get_id"/> - <arg name="id" type="s" direction="out"> - <tp:docstring> - The ID of this connection. - </tp:docstring> - </arg> - </method> - - <method name="Update"> - <tp:docstring> - Update the connection. - </tp:docstring> - <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_exported_connection_update"/> - <arg name="properties" type="a{sa{sv}}" direction="in"> - <tp:docstring> - New connection properties. - </tp:docstring> - </arg> - </method> - - <method name="Delete"> - <tp:docstring> - Delete the connection. - </tp:docstring> - <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_exported_connection_delete"/> - </method> - - <method name="GetSettings"> - <tp:docstring> - Get the settings maps describing this object. - </tp:docstring> - <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_exported_connection_get_settings"/> - <arg name="settings" type="a{sa{sv}}" direction="out" tp:type="String_String_Variant_Map_Map"> - <tp:docstring> - The nested settings maps describing this object. - </tp:docstring> - </arg> - </method> - - <signal name="Updated"> - <tp:docstring> - Emitted when some settings changed. - </tp:docstring> - <arg name="settings" type="a{sa{sv}}" tp:type="String_String_Variant_Map_Map"> - <tp:docstring> - Contains the changed settings. - </tp:docstring> - </arg> - </signal> - - <signal name="Removed"> - <tp:docstring> - Emitted when this settings object was removed. FIXME: Is this emitted after it was removed or when it is about to be removed? If after removed, then different semantics to Device removed. if prior to removal, should be called AboutToBeRemoved. - </tp:docstring> - </signal> - - </interface> - - <interface name="org.freedesktop.NetworkManagerSettings.Connection.Secrets"> - <tp:docstring> - Secrets have a separate interface so that they can be locked down. - </tp:docstring> - - <method name="GetSecrets"> - <tp:docstring> - Get the secrets encapsulated in this object. - </tp:docstring> - <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_exported_connection_get_secrets"/> - <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> - <arg name="setting_name" type="s" direction="in"> - <tp:docstring> - Name of the setting to return. - </tp:docstring> - </arg> - <arg name="hints" type="as" direction="in"> - <tp:docstring> - Array of strings of key names in the Setting for which NM thinks - a secrets may be required. - </tp:docstring> - </arg> - <arg name="request_new" type="b" direction="in"> - <tp:docstring> - Indicates whether new secrets should be requested or if the request can be fulfilled from storage. - </tp:docstring> - </arg> - - <arg name="secrets" type="a{sa{sv}}" direction="out" tp:type="String_String_Variant_Map_Map"> - <tp:docstring> - 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. - </tp:docstring> - </arg> - </method> - - </interface> - -</node> diff --git a/tdecore/networkbackends/network-manager/introspection/nm-ip4-config.xml b/tdecore/networkbackends/network-manager/introspection/nm-ip4-config.xml index 8e3bf573c..70d3e1ce4 100644 --- a/tdecore/networkbackends/network-manager/introspection/nm-ip4-config.xml +++ b/tdecore/networkbackends/network-manager/introspection/nm-ip4-config.xml @@ -3,22 +3,26 @@ <node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"> <interface name="org.freedesktop.NetworkManager.IP4Config"> <property name="Addresses" type="aau" access="read"> - <tp:docstring>Tuples of IPv4 address/netmask/gateway. The gateway is optional, if not given should be 0.</tp:docstring> - </property> - <property name="Hostname" type="s" access="read"> - <tp:docstring>The hostname associated with this IPv4 address. FIXME: what about multiple hostnames?</tp:docstring> + <tp:docstring>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), ...] + </tp:docstring> </property> <property name="Nameservers" type="au" access="read"> <tp:docstring>The nameservers in use.</tp:docstring> </property> + <property name="WinsServers" type="au" access="read"> + <tp:docstring>The Windows Internet Name Service servers associated with the connection. Each address is in network byte order.</tp:docstring> + </property> <property name="Domains" type="as" access="read"> <tp:docstring>A list of domains this address belongs to.</tp:docstring> </property> - <property name="NisDomain" type="s" access="read"> - <tp:docstring>The NIS domain this address belongs to.</tp:docstring> - </property> - <property name="NisServers" type="au" access="read"> - <tp:docstring>The NIS servers associated with this address.</tp:docstring> + <property name="Routes" type="aau" access="read"> + <tp:docstring>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 + addresses, while prefix and metric are simple unsigned integers. Essentially: + [(route, prefix, next-hop, metric), (route, prefix, next-hop, metric), ...] + </tp:docstring> </property> </interface> </node> diff --git a/tdecore/networkbackends/network-manager/introspection/nm-ip6-config.xml b/tdecore/networkbackends/network-manager/introspection/nm-ip6-config.xml new file mode 100644 index 000000000..604781857 --- /dev/null +++ b/tdecore/networkbackends/network-manager/introspection/nm-ip6-config.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"> + <interface name="org.freedesktop.NetworkManager.IP6Config"> + <property name="Addresses" type="a(ayuay)" access="read"> + <tp:docstring>Tuples of IPv6 address/prefix/gateway.</tp:docstring> + </property> + <property name="Nameservers" type="aay" access="read"> + <tp:docstring>The nameservers in use.</tp:docstring> + </property> + <property name="Domains" type="as" access="read"> + <tp:docstring>A list of domains this address belongs to.</tp:docstring> + </property> + <property name="Routes" type="a(ayuayu)" access="read"> + <tp:docstring>Tuples of IPv6 route/prefix/next-hop/metric.</tp:docstring> + </property> + </interface> +</node> + diff --git a/tdecore/networkbackends/network-manager/introspection/nm-manager-client.xml b/tdecore/networkbackends/network-manager/introspection/nm-manager-client.xml deleted file mode 100644 index cf8961143..000000000 --- a/tdecore/networkbackends/network-manager/introspection/nm-manager-client.xml +++ /dev/null @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> - -<!-- -READ ME! READ ME! READ ME! READ ME! READ ME! - -This file needs to be kept in sync with nm-manager.xml with the exception of -the legacy methods at the end of nm-manager.xml. - -This file is only used to ensure that a few legacy 0.6 D-DBus methods that -NM supports don't leak into libnm-glib, but are only exposed by the NMManager -object. dbus-glib generates the same bound function names for D-Bus the methods -"sleep" and "Sleep", unfortunately. ---> - -<node name="/"> - <interface name="org.freedesktop.NetworkManager"> - <method name="GetDevices"> - <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_get_devices"/> - <arg name="devices" type="ao" direction="out"/> - </method> - - <method name="ActivateConnection"> - <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_activate_connection"/> - <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> - <arg name="service_name" type="s" direction="in"/> - <arg name="connection" type="o" direction="in"/> - <arg name="device" type="o" direction="in"/> - <arg name="specific_object" type="o" direction="in"/> - <arg name="active_connection" type="o" direction="out"/> - </method> - - <method name="DeactivateConnection"> - <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_deactivate_connection"/> - <arg name="active_connection" type="o" direction="in"/> - </method> - - <method name="Sleep"> - <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_sleep"/> - <arg name="sleep" type="b" direction="in"/> - </method> - - <property name="WirelessEnabled" type="b" access="readwrite"/> - <property name="WirelessHardwareEnabled" type="b" access="read"/> - <property name="ActiveConnections" type="ao" access="read"/> - <property name="State" type="u" access="read"/> - - <signal name="StateChanged"> - <arg name="state" type="u"/> - </signal> - - <signal name="PropertiesChanged"> - <arg name="properties" type="a{sv}"/> - </signal> - - <signal name="DeviceAdded"> - <arg name="state" type="o"/> - </signal> - - <signal name="DeviceRemoved"> - <arg name="state" type="o"/> - </signal> - </interface> -</node> diff --git a/tdecore/networkbackends/network-manager/introspection/nm-manager.xml b/tdecore/networkbackends/network-manager/introspection/nm-manager.xml index a93ee5897..f5fd7abcf 100644 --- a/tdecore/networkbackends/network-manager/introspection/nm-manager.xml +++ b/tdecore/networkbackends/network-manager/introspection/nm-manager.xml @@ -1,13 +1,6 @@ <?xml version="1.0" encoding="UTF-8" ?> -<!-- - READ ME! READ ME! READ ME! READ ME! READ ME! - - This file needs to be kept in sync with nm-manager-client.xml with the exception of - the legacy methods at the end of this file. ---> - -<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"> +<node name="/org/freedesktop/NetworkManager" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"> <interface name="org.freedesktop.NetworkManager"> <method name="GetDevices"> <tp:docstring> @@ -21,17 +14,31 @@ </arg> </method> + <method name="GetDeviceByIpIface"> + <tp:docstring> + Return the object path of the network device referenced by its IP + interface name. Note that some devices (usually modems) only have an + IP interface name when they are connected. + </tp:docstring> + <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_get_device_by_ip_iface"/> + <arg name="iface" type="s" direction="in"> + <tp:docstring> + Interface name of the device to find. + </tp:docstring> + </arg> + <arg name="device" type="o" direction="out"> + <tp:docstring> + Object path of the network device. + </tp:docstring> + </arg> + </method> + <method name="ActivateConnection"> <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_activate_connection"/> <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> <tp:docstring> Activate a connection using the supplied device. </tp:docstring> - <arg name="service_name" type="s" direction="in"> - <tp:docstring> - The D-Bus service name of the settings service that provides this connection. - </tp:docstring> - </arg> <arg name="connection" type="o" direction="in"> <tp:docstring> The connection to activate the devices with. @@ -39,12 +46,19 @@ </arg> <arg name="device" type="o" direction="in"> <tp:docstring> - The device to be activated. + 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. </tp:docstring> </arg> <arg name="specific_object" type="o" direction="in"> <tp:docstring> - The path of a device-type-specific object this activation should use, for example a WiFi access point. + 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, or "/" to pick and 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. </tp:docstring> </arg> <arg name="active_connection" type="o" direction="out"> @@ -55,7 +69,6 @@ <tp:possible-errors> <tp:error name="org.freedesktop.NetworkManager.Error.UnknownConnection"/> <tp:error name="org.freedesktop.NetworkManager.Error.UnknownDevice"/> - <tp:error name="org.freedesktop.NetworkManager.Error.InvalidService"/> <tp:error name="org.freedesktop.NetworkManager.Error.ConnectionActivating"> <tp:docstring>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?</tp:docstring> </tp:error> @@ -65,11 +78,61 @@ </tp:possible-errors> </method> + <method name="AddAndActivateConnection"> + <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_add_and_activate_connection"/> + <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> + <tp:docstring> + 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. + </tp:docstring> + <arg name="connection" type="a{sa{sv}}" direction="in"> + <tp:docstring> + Connection settings and properties; if incomplete missing settings will + be automatically completed using the given device and specific object. + </tp:docstring> + </arg> + <arg name="device" type="o" direction="in"> + <tp:docstring> + The object path of device to be activated using the given connection. + </tp:docstring> + </arg> + <arg name="specific_object" type="o" direction="in"> + <tp:docstring> + 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. + </tp:docstring> + </arg> + <arg name="path" type="o" direction="out"> + <tp:docstring> + Object path of the new connection that was just added. + </tp:docstring> + </arg> + <arg name="active_connection" type="o" direction="out"> + <tp:docstring> + The path of the active connection object representing this active connection. + </tp:docstring> + </arg> + <tp:possible-errors> + <tp:error name="org.freedesktop.NetworkManager.Error.UnknownConnection"/> + <tp:error name="org.freedesktop.NetworkManager.Error.UnknownDevice"/> + <tp:error name="org.freedesktop.NetworkManager.Error.ConnectionInvalid"> + <tp:docstring>The connection is invalid for this device.</tp:docstring> + </tp:error> + </tp:possible-errors> + </method> + <method name="DeactivateConnection"> <tp:docstring> Deactivate an active connection. </tp:docstring> <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_deactivate_connection"/> + <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> <arg name="active_connection" type="o" direction="in"> <tp:docstring> The currently active connection to deactivate. @@ -79,8 +142,12 @@ <method name="Sleep"> <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_sleep"/> + <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> <tp:docstring> - Control the NetworkManager daemon's sleep state. When asleep, all interfaces that it manages are deactivated. When awake, devices are available to be activated. + Control the NetworkManager daemon's sleep state. When asleep, all + interfaces that it manages are deactivated. When awake, devices are + available to be activated. This command should not be called directly + by users or clients; it is intended for system suspend/resume tracking. </tp:docstring> <arg name="sleep" type="b" direction="in"> <tp:docstring> @@ -89,6 +156,91 @@ </arg> </method> + <method name="Enable"> + <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_enable"/> + <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> + <tp:docstring> + Control whether overall networking is enabled or disabled. When + disabled, all interfaces that NM manages are deactivated. When enabled, + all managed interfaces are re-enabled and available to be activated. + This command should be used by clients that provide to users the ability + to enable/disable all networking. + </tp:docstring> + <arg name="enable" type="b" direction="in"> + <tp:docstring> + If FALSE, indicates that all networking should be disabled. If TRUE, + indicates that NetworkManager should begin managing network devices. + </tp:docstring> + </arg> + </method> + + <method name="GetPermissions"> + <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_get_permissions"/> + <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> + <tp:docstring> + Returns the permissions a caller has for various authenticated operations + that NetworkManager provides, like Enable/Disable networking, changing + WiFi, WWAN, and WiMAX state, etc. + </tp:docstring> + <arg name="permissions" type="a{ss}" direction="out"> + <tp:docstring> + Dictionary of available permissions and results. Each permission + is represented by a name (ie "org.freedesktop.NetworkManager.Foobar") + and each result is one of the following values: "yes" (the permission + is available), "auth" (the permission is available after a successful + authentication), or "no" (the permission is denied). Clients may use + these values in the UI to indicate the ability to perform certain + operations. + </tp:docstring> + </arg> + </method> + + <signal name="CheckPermissions"> + <tp:docstring> + Emitted when system authorization details change, indicating that + clients may wish to recheck permissions with GetPermissions. + </tp:docstring> + </signal> + + <method name="SetLogging"> + <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_set_logging"/> + <tp:docstring> + Set logging verbosity and which operations are logged. + </tp:docstring> + <arg name="level" type="s" direction="in"> + <tp:docstring> + One of [ERR, WARN, INFO, DEBUG]. + </tp:docstring> + </arg> + <arg name="domains" type="s" direction="in"> + <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. + </tp:docstring> + </arg> + </method> + + <method name="state"> + <tp:docstring> + The overall networking state as determined by the NetworkManager daemon, + based on the state of network devices under it's management. + </tp:docstring> + <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_get_state"/> + <arg name="state" type="u" direction="out" tp:type="NM_STATE"/> + </method> + + <property name="NetworkingEnabled" type="b" access="read"> + <tp:docstring> + Indicates if overall networking is currently enabled or not. See the + Enable() method. + </tp:docstring> + </property> + <property name="WirelessEnabled" type="b" access="readwrite"> <tp:docstring> Indicates if wireless is currently enabled or not. @@ -101,12 +253,42 @@ </tp:docstring> </property> + <property name="WwanEnabled" type="b" access="readwrite"> + <tp:docstring> + Indicates if mobile broadband devices are currently enabled or not. + </tp:docstring> + </property> + + <property name="WwanHardwareEnabled" type="b" access="read"> + <tp:docstring> + Indicates if the mobile broadband hardware is currently enabled, i.e. the state of the RF kill switch. + </tp:docstring> + </property> + + <property name="WimaxEnabled" type="b" access="readwrite"> + <tp:docstring> + Indicates if WiMAX devices are currently enabled or not. + </tp:docstring> + </property> + + <property name="WimaxHardwareEnabled" type="b" access="read"> + <tp:docstring> + Indicates if the WiMAX hardware is currently enabled, i.e. the state of the RF kill switch. + </tp:docstring> + </property> + <property name="ActiveConnections" type="ao" access="read"> <tp:docstring> List of active connection object paths. </tp:docstring> </property> + <property name="Version" type="s" access="read"> + <tp:docstring> + NetworkManager version. + </tp:docstring> + </property> + <property name="State" type="u" access="read" tp:type="NM_STATE"> <tp:docstring> The overall state of the NetworkManager daemon. @@ -163,65 +345,46 @@ </tp:docstring> <tp:enumvalue suffix="UNKNOWN" value="0"> <tp:docstring> - The NetworkManager daemon is in an unknown state. + Networking state is unknown. </tp:docstring> </tp:enumvalue> - <tp:enumvalue suffix="ASLEEP" value="1"> + <tp:enumvalue suffix="ASLEEP" value="10"> <tp:docstring> - The NetworkManager daemon is asleep and all interfaces managed by it are inactive. + Networking is inactive and all devices are disabled. </tp:docstring> </tp:enumvalue> - <tp:enumvalue suffix="CONNECTING" value="2"> + <tp:enumvalue suffix="DISCONNECTED" value="20"> <tp:docstring> - 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. </tp:docstring> </tp:enumvalue> - <tp:enumvalue suffix="CONNECTED" value="3"> + <tp:enumvalue suffix="DISCONNECTING" value="30"> <tp:docstring> - The NetworkManager daemon is connected. + Network connections are being cleaned up. </tp:docstring> </tp:enumvalue> - <tp:enumvalue suffix="DISCONNECTED" value="4"> + <tp:enumvalue suffix="CONNECTING" value="40"> <tp:docstring> - The NetworkManager daemon is disconnected. + A network device is connecting to a network and there is no other + available network connection. </tp:docstring> </tp:enumvalue> - </tp:enum> - - <!-- Legacy methods to maintain backwards compatibility for 0.6 branch. --> - - <signal name="StateChange"> - <tp:docstring> - DEPRECATED. NetworkManager's state changed. Use the 'StateChanged' signal instead. - </tp:docstring> - <arg name="state" type="u" tp:type="NM_STATE"> + <tp:enumvalue suffix="CONNECTED_LOCAL" value="50"> <tp:docstring> - The new state of NetworkManager. + A network device is connected, but there is only link-local connectivity. </tp:docstring> - </arg> - </signal> - - <method name="sleep"> - <tp:docstring> - DEPRECATED. Control the NetworkManager daemon's sleep state. When asleep, all interfaces that it manages are deactivated. - </tp:docstring> - <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_legacy_sleep"/> - </method> - - <method name="wake"> - <tp:docstring> - DEPRECATED. Control the NetworkManager daemon's sleep state. When awake, all known interfaces are available to be activated. - </tp:docstring> - <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_legacy_wake"/> - </method> - - <method name="state"> - <tp:docstring> - DEPRECATED. The overall state of the NetworkManager daemon. - </tp:docstring> - <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_legacy_state"/> - <arg name="state" type="u" direction="out" tp:type="NM_STATE"/> - </method> + </tp:enumvalue> + <tp:enumvalue suffix="CONNECTED_SITE" value="60"> + <tp:docstring> + A network device is connected, but there is only site-local connectivity. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="CONNECTED_GLOBAL" value="70"> + <tp:docstring> + A network device is connected, with global network connectivity. + </tp:docstring> + </tp:enumvalue> + </tp:enum> </interface> </node> diff --git a/tdecore/networkbackends/network-manager/introspection/nm-secret-agent.xml b/tdecore/networkbackends/network-manager/introspection/nm-secret-agent.xml new file mode 100644 index 000000000..81a1321b1 --- /dev/null +++ b/tdecore/networkbackends/network-manager/introspection/nm-secret-agent.xml @@ -0,0 +1,177 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"> + + <interface name="org.freedesktop.NetworkManager.SecretAgent"> + <tp:docstring> + Private D-Bus interface used by secret agents that store and provide + secrets to NetworkManager. If an agent provides secrets to + NetworkManager as part of connection creation, and the some of those + secrets are "agent owned" the agent should store those secrets + 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. + </tp:docstring> + + <method name="GetSecrets"> + <tp:docstring> + Retrieve and return stored secrets, if any, or request new + secrets from the agent's user. + </tp:docstring> + <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_secret_agent_get_secrets"/> + <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> + <arg name="connection" type="a{sa{sv}}" direction="in" tp:type="String_String_Variant_Map_Map"> + <tp:docstring> + 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. + </tp:docstring> + </arg> + <arg name="connection_path" type="o" direction="in"> + <tp:docstring> + Object path of the connection for which secrets are being + requested. + </tp:docstring> + </arg> + <arg name="setting_name" type="s" direction="in"> + <tp:docstring> + Setting name for which secrets are being requested. + </tp:docstring> + </arg> + <arg name="hints" type="as" direction="in"> + <tp:docstring> + Array of strings of key names in the requested setting for + which NetworkManager thinks a secrets may be required, + and/or well-known identifiers and data that may be useful + to the client in processing the secrets request. The Agent + should return any secrets it has, or that it thinks are + required, regardless of what hints NetworkManager sends + in this request. + </tp:docstring> + </arg> + <arg name="flags" type="u" direction="in" tp:type="NM_SECRET_AGENT_GET_SECRETS_FLAGS"> + <tp:docstring> + 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. + </tp:docstring> + </arg> + + <arg name="secrets" type="a{sa{sv}}" direction="out" tp:type="String_String_Variant_Map_Map"> + <tp:docstring> + 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. + </tp:docstring> + </arg> + </method> + + <tp:flags name="NM_SECRET_AGENT_GET_SECRETS_FLAGS" value-prefix="NM_SECRET_AGENT_GET_SECRETS_FLAG" type="u"> + <tp:docstring> + Flags modifying the behavior of GetSecrets request. + </tp:docstring> + <tp:flag suffix="NONE" value="0x0"> + <tp:docstring> + 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. + </tp:docstring> + </tp:flag> + <tp:flag suffix="ALLOW_INTERACTION" value="0x1"> + <tp:docstring> + 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. + </tp:docstring> + </tp:flag> + <tp:flag suffix="REQUEST_NEW" value="0x2"> + <tp:docstring> + 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. + </tp:docstring> + </tp:flag> + <tp:flag suffix="USER_REQUESTED" value="0x4"> + <tp:docstring> + 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. + </tp:docstring> + </tp:flag> + </tp:flags> + + <method name="CancelGetSecrets"> + <tp:docstring> + Cancel a pending GetSecrets request for secrets of the given + connection. Any matching request should be canceled. + </tp:docstring> + <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_secret_agent_cancel_get_secrets"/> + <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> + <arg name="connection_path" type="o" direction="in"> + <tp:docstring> + Object path of the connection for which, if secrets are being + requested, the request should be canceled. + </tp:docstring> + </arg> + <arg name="setting_name" type="s" direction="in"> + <tp:docstring> + Setting name for which secrets for this connection were + originally being requested. + </tp:docstring> + </arg> + </method> + + <method name="SaveSecrets"> + <tp:docstring> + Save given secrets to backing storage. + </tp:docstring> + <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_secret_agent_save_secrets"/> + <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> + <arg name="connection" type="a{sa{sv}}" direction="in" tp:type="String_String_Variant_Map_Map"> + <tp:docstring> + Nested settings maps containing the entire connection + (including secrets), for which the agent should save the + secrets to backing storage. This method will not be called + when the agent itself is the process creating or updating + a connection; in that case the agent is assumed to have + already saved those secrets since it had them already. + </tp:docstring> + </arg> + <arg name="connection_path" type="o" direction="in"> + <tp:docstring> + Object path of the connection for which the agent should + save secrets to backing storage. + </tp:docstring> + </arg> + </method> + + <method name="DeleteSecrets"> + <tp:docstring> + Delete secrets from backing storage. + </tp:docstring> + <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_secret_agent_delete_secrets"/> + <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> + <arg name="connection" type="a{sa{sv}}" direction="in" tp:type="String_String_Variant_Map_Map"> + <tp:docstring> + Nested settings maps containing the connection properties + (sans secrets), for which the agent should delete the + secrets from backing storage. + </tp:docstring> + </arg> + <arg name="connection_path" type="o" direction="in"> + <tp:docstring> + Object path of the connection for which the agent should + delete secrets from backing storage. + </tp:docstring> + </arg> + </method> + + </interface> + +</node> diff --git a/tdecore/networkbackends/network-manager/introspection/nm-settings-connection.xml b/tdecore/networkbackends/network-manager/introspection/nm-settings-connection.xml new file mode 100644 index 000000000..9089b009a --- /dev/null +++ b/tdecore/networkbackends/network-manager/introspection/nm-settings-connection.xml @@ -0,0 +1,93 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"> + + <interface name="org.freedesktop.NetworkManager.Settings.Connection"> + <tp:docstring> + Represents a single network connection configuration. + </tp:docstring> + + <method name="Update"> + <tp:docstring> + 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. + </tp:docstring> + <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_settings_connection_update"/> + <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> + <arg name="properties" type="a{sa{sv}}" direction="in"> + <tp:docstring> + New connection settings, properties, and (optionally) secrets. + </tp:docstring> + </arg> + </method> + + <method name="Delete"> + <tp:docstring> + Delete the connection. + </tp:docstring> + <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_settings_connection_delete"/> + <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> + </method> + + <method name="GetSettings"> + <tp:docstring> + 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. + </tp:docstring> + <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_settings_connection_get_settings"/> + <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> + <arg name="settings" type="a{sa{sv}}" direction="out" tp:type="String_String_Variant_Map_Map"> + <tp:docstring> + The nested settings maps describing this object. + </tp:docstring> + </arg> + </method> + + <method name="GetSecrets"> + <tp:docstring> + 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. + </tp:docstring> + <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_settings_connection_get_secrets"/> + <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> + <arg name="setting_name" type="s" direction="in"> + <tp:docstring> + Name of the setting to return secrets for. If empty, all + all secrets will be returned. + </tp:docstring> + </arg> + + <arg name="secrets" type="a{sa{sv}}" direction="out" tp:type="String_String_Variant_Map_Map"> + <tp:docstring> + Nested settings maps containing secrets. + </tp:docstring> + </arg> + </method> + + <signal name="Updated"> + <tp:docstring> + 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. + </tp:docstring> + </signal> + + <signal name="Removed"> + <tp:docstring> + 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. + </tp:docstring> + </signal> + + </interface> + +</node> diff --git a/tdecore/networkbackends/network-manager/introspection/nm-settings.xml b/tdecore/networkbackends/network-manager/introspection/nm-settings.xml index 5e072f264..301cde76d 100644 --- a/tdecore/networkbackends/network-manager/introspection/nm-settings.xml +++ b/tdecore/networkbackends/network-manager/introspection/nm-settings.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8" ?> -<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"> - <interface name="org.freedesktop.NetworkManagerSettings"> +<node name="/org/freedesktop/NetworkManager/Settings" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"> + <interface name="org.freedesktop.NetworkManager.Settings"> <tp:docstring> - 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. </tp:docstring> <method name="ListConnections"> @@ -18,9 +18,77 @@ </arg> </method> + <method name="GetConnectionByUuid"> + <tp:docstring> + Retrieve the object path of a connection, given that connection's UUID. + </tp:docstring> + <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_settings_get_connection_by_uuid"/> + <arg name="uuid" type="s" direction="in"> + <tp:docstring> + The UUID to find the connection object path for. + </tp:docstring> + </arg> + <arg name="connection" type="o" direction="out"> + <tp:docstring> + The connection's object path. + </tp:docstring> + </arg> + </method> + + <method name="AddConnection"> + <tp:docstring> + Add new connection. + </tp:docstring> + <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_settings_add_connection"/> + <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> + <arg name="connection" type="a{sa{sv}}" direction="in"> + <tp:docstring> + Connection settings and properties. + </tp:docstring> + </arg> + <arg name="path" type="o" direction="out"> + <tp:docstring> + Object path of the new connection that was just added. + </tp:docstring> + </arg> + </method> + + <method name="SaveHostname"> + <tp:docstring> + Save the hostname to persistent configuration. + </tp:docstring> + <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_settings_save_hostname"/> + <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> + <arg name="hostname" type="s" direction="in"> + <tp:docstring> + The hostname to save to persistent configuration. If blank, the persistent hostname is cleared. + </tp:docstring> + </arg> + </method> + + <property name="Hostname" type="s" access="read"> + <tp:docstring> + The machine hostname stored in persistent configuration. + </tp:docstring> + </property> + + <property name="CanModify" type="b" access="read"> + <tp:docstring> + If true, adding and modifying connections is supported. + </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> + <signal name="NewConnection"> <tp:docstring> - Emitted when a new connection has been configured. + Emitted when a new connection has been added. </tp:docstring> <arg name="connection" type="o"> <tp:docstring> @@ -28,5 +96,7 @@ </tp:docstring> </arg> </signal> + </interface> </node> + diff --git a/tdecore/networkbackends/network-manager/introspection/nm-vpn-connection-only.xml b/tdecore/networkbackends/network-manager/introspection/nm-vpn-connection-only.xml deleted file mode 100644 index 8feee0335..000000000 --- a/tdecore/networkbackends/network-manager/introspection/nm-vpn-connection-only.xml +++ /dev/null @@ -1,136 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> - -<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"> - <interface name="org.freedesktop.NetworkManager.VPN.Connection"> - <tp:docstring> - Represents an active connection to a Virtual Private Network. - </tp:docstring> - - <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> - - <property name="VpnState" type="u" access="read" tp:type="NM_VPN_CONNECTION_STATE"> - <tp:docstring>The VPN-specific state of the connection.</tp:docstring> - </property> - <property name="Banner" type="s" access="read"> - <tp:docstring>The banner string of the VPN connection.</tp:docstring> - </property> - - <signal name="VpnStateChanged"> - <tp:docstring> - Emitted when the state of the VPN connection has changed. - </tp:docstring> - <arg name="state" type="u" tp:type="NM_VPN_CONNECTION_STATE"> - <tp:docstring> - The new state of the VPN connection. - </tp:docstring> - </arg> - <arg name="reason" type="u" tp:type="NM_VPN_CONNECTION_STATE_REASON"> - <tp:docstring> - Reason code describing the change to the new state. - </tp:docstring> - </arg> - </signal> - - <tp:enum name="NM_VPN_CONNECTION_STATE" type="u"> - <tp:enumvalue suffix="UNKNOWN" value="0"> - <tp:docstring> - The state of the VPN connection is unknown. - </tp:docstring> - </tp:enumvalue> - <tp:enumvalue suffix="PREPARE" value="1"> - <tp:docstring> - The VPN connection is preparing to connect. - </tp:docstring> - </tp:enumvalue> - <tp:enumvalue suffix="NEED_AUTH" value="2"> - <tp:docstring> - The VPN connection needs authorization credentials. - </tp:docstring> - </tp:enumvalue> - <tp:enumvalue suffix="CONNECT" value="3"> - <tp:docstring> - The VPN connection is being established. FIXME: Should be CONNECTING or CONNECTED. - </tp:docstring> - </tp:enumvalue> - <tp:enumvalue suffix="IP_CONFIG_GET" value="4"> - <tp:docstring> - The VPN connection is getting an IP address. FIXME: Should be an -ING - </tp:docstring> - </tp:enumvalue> - <tp:enumvalue suffix="ACTIVATED" value="5"> - <tp:docstring> - The VPN connection is active. - </tp:docstring> - </tp:enumvalue> - <tp:enumvalue suffix="FAILED" value="6"> - <tp:docstring> - The VPN connection failed. - </tp:docstring> - </tp:enumvalue> - <tp:enumvalue suffix="DISCONNECTED" value="7"> - <tp:docstring> - The VPN connection is disconnected. - </tp:docstring> - </tp:enumvalue> - </tp:enum> - <tp:enum name="NM_VPN_CONNECTION_STATE_REASON" type="u"> - <tp:enumvalue suffix="UNKNOWN" value="0"> - <tp:docstring> - The reason for the VPN connection state change is unknown. - </tp:docstring> - </tp:enumvalue> - <tp:enumvalue suffix="NONE" value="1"> - <tp:docstring> - No reason was given for the VPN connection state change. - </tp:docstring> - </tp:enumvalue> - <tp:enumvalue suffix="USER_DISCONNECTED" value="2"> - <tp:docstring> - The VPN connection changed state because the user disconnected it. - </tp:docstring> - </tp:enumvalue> - <tp:enumvalue suffix="DEVICE_DISCONNECTED" value="3"> - <tp:docstring> - The VPN connection changed state because the device it was using was disconnected. - </tp:docstring> - </tp:enumvalue> - <tp:enumvalue suffix="SERVICE_STOPPED" value="4"> - <tp:docstring> - The service providing the VPN connection was stopped. - </tp:docstring> - </tp:enumvalue> - <tp:enumvalue suffix="IP_CONFIG_INVALID" value="5"> - <tp:docstring> - The IP config of the VPN connection was invalid. - </tp:docstring> - </tp:enumvalue> - <tp:enumvalue suffix="CONNECT_TIMEOUT" value="6"> - <tp:docstring> - The connection attempt to the VPN service timed out. - </tp:docstring> - </tp:enumvalue> - <tp:enumvalue suffix="SERVICE_START_TIMEOUT" value="7"> - <tp:docstring> - A timeout occurred while starting the service providing the VPN connection. - </tp:docstring> - </tp:enumvalue> - <tp:enumvalue suffix="SERVICE_START_FAILED" value="8"> - <tp:docstring> - Starting the service starting the service providing the VPN connection failed. - </tp:docstring> - </tp:enumvalue> - <tp:enumvalue suffix="NO_SECRETS" value="9"> - <tp:docstring> - Necessary secrets for the VPN connection were not provided. - </tp:docstring> - </tp:enumvalue> - </tp:enum> - </interface> -</node> - diff --git a/tdecore/networkbackends/network-manager/introspection/nm-vpn-connection.xml b/tdecore/networkbackends/network-manager/introspection/nm-vpn-connection.xml index e5f74e142..65b917854 100644 --- a/tdecore/networkbackends/network-manager/introspection/nm-vpn-connection.xml +++ b/tdecore/networkbackends/network-manager/introspection/nm-vpn-connection.xml @@ -1,33 +1,6 @@ <?xml version="1.0" encoding="UTF-8" ?> <node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"> - <interface name="org.freedesktop.NetworkManager.Connection.Active"> - <property name="ServiceName" type="s" access="read"> - <tp:docstring>The D-Bus service name providing this connection.</tp:docstring> - </property> - <property name="Connection" type="o" access="read"> - <tp:docstring>The path of the connection.</tp:docstring> - </property> - <property name="SpecificObject" type="o" access="read"> - <tp:docstring>A specific object associated with the active connection.</tp:docstring> - </property> - <property name="SharedServiceName" type="s" access="read"> - <tp:docstring>The D-Bus service name that provides a connection with which this active connection is shared.</tp:docstring> - </property> - <property name="SharedConnection" type="o" access="read"> - <tp:docstring>The path of a connection provided by the D-Bus service SharedServiceName which which this connection is shared.</tp:docstring> - </property> - <property name="Devices" type="ao" access="read"> - <tp:docstring>Array of object paths representing devices which are part of this active connection.</tp:docstring> - </property> - <property name="State" type="u" access="read" tp:type="NM_ACTIVE_DEVICE_STATE"> - <tp:docstring>The state of this active connection.</tp:docstring> - </property> - <property name="Default" type="b" access="read"> - <tp:docstring>Whether this active connection is the default connection, i.e. whether it currently owns the default route.</tp:docstring> - </property> - </interface> - <interface name="org.freedesktop.NetworkManager.VPN.Connection"> <tp:docstring> Represents an active connection to a Virtual Private Network. @@ -157,6 +130,16 @@ Necessary secrets for the VPN connection were not provided. </tp:docstring> </tp:enumvalue> + <tp:enumvalue suffix="LOGIN_FAILED" value="10"> + <tp:docstring> + Authentication to the VPN server failed. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="CONNECTION_REMOVED" value="11"> + <tp:docstring> + The connection was deleted from settings. + </tp:docstring> + </tp:enumvalue> </tp:enum> </interface> </node> diff --git a/tdecore/networkbackends/network-manager/introspection/nm-vpn-manager.xml b/tdecore/networkbackends/network-manager/introspection/nm-vpn-manager.xml deleted file mode 100644 index 57665f61a..000000000 --- a/tdecore/networkbackends/network-manager/introspection/nm-vpn-manager.xml +++ /dev/null @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> - -<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"> - <interface name="org.freedesktop.NetworkManager.VPN.Manager"> - <method name="Connect"> - <tp:docstring> - Establish a VPN connection. - </tp:docstring> - <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_vpn_manager_connect"/> - <arg name="connection_type" type="s" direction="in"> - <tp:docstring> - String describing the connection type. - </tp:docstring> - </arg> - <arg name="connection" type="o" direction="in"> - <tp:docstring> - Object path of the network connection to establish the VPN connection on. - </tp:docstring> - </arg> - <arg name="device" type="o" direction="in"> - <tp:docstring> - Object path of the device to establish the VPN connection on. - </tp:docstring> - </arg> - <arg name="vpn_connection" type="o" direction="out"> - <tp:docstring> - Object path of the newly created VPN connection. - </tp:docstring> - </arg> - </method> - - <method name="ListConnections"> - <tp:docstring> - Get the list of active VPN connections. - </tp:docstring> - <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_vpn_manager_get_connections"/> - <arg name="connections" type="ao" direction="out"> - <tp:docstring> - List of object paths of active VPN connections. - </tp:docstring> - </arg> - </method> - - </interface> -</node> - diff --git a/tdecore/networkbackends/network-manager/introspection/nm-vpn-plugin.xml b/tdecore/networkbackends/network-manager/introspection/nm-vpn-plugin.xml index e7647e1d6..5fb11622a 100644 --- a/tdecore/networkbackends/network-manager/introspection/nm-vpn-plugin.xml +++ b/tdecore/networkbackends/network-manager/introspection/nm-vpn-plugin.xml @@ -55,6 +55,18 @@ </tp:possible-errors> </method> + <method name="SetConfig"> + <tp:docstring> + Set generic connection details on the connection. + </tp:docstring> + <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_vpn_plugin_set_config"/> + <arg name="config" type="a{sv}" direction="in" tp:type="String_Variant_Map"> + <tp:docstring> + Generic configuration details for the connection. + </tp:docstring> + </arg> + </method> + <method name="SetIp4Config"> <tp:docstring> Set IPv4 details on the connection. @@ -62,7 +74,21 @@ <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_vpn_plugin_set_ip4_config"/> <arg name="config" type="a{sv}" direction="in" tp:type="String_Variant_Map"> <tp:docstring> - Ip4Config details for the conneciton. + Ip4Config details for the connection. You must call + SetConfig() before calling this. + </tp:docstring> + </arg> + </method> + + <method name="SetIp6Config"> + <tp:docstring> + Set IPv6 details on the connection. + </tp:docstring> + <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_vpn_plugin_set_ip6_config"/> + <arg name="config" type="a{sv}" direction="in" tp:type="String_Variant_Map"> + <tp:docstring> + Ip6Config details for the connection. You must call + SetConfig() before calling this. </tp:docstring> </arg> </method> @@ -96,6 +122,17 @@ </arg> </signal> + <signal name="Config"> + <tp:docstring> + The plugin obtained generic configuration information. + </tp:docstring> + <arg name="config" type="a{sv}" tp:type="String_Variant_Map"> + <tp:docstring> + The configuration information. + </tp:docstring> + </arg> + </signal> + <signal name="Ip4Config"> <tp:docstring> The plugin obtained an IPv4 configuration. @@ -107,6 +144,17 @@ </arg> </signal> + <signal name="Ip6Config"> + <tp:docstring> + The plugin obtained an IPv6 configuration. + </tp:docstring> + <arg name="ip6config" type="a{sv}" tp:type="String_Variant_Map"> + <tp:docstring> + The IPv6 configuration. + </tp:docstring> + </arg> + </signal> + <signal name="LoginBanner"> <tp:docstring> Emitted when the plugin receives a login banner from the VPN service. @@ -122,11 +170,30 @@ <tp:docstring> Emitted when a failure in the VPN plugin occurs. </tp:docstring> - <arg name="reason" type="u" tp:type="NM_VPN_CONNECTION_STATE_REASON"> + <arg name="reason" type="u" tp:type="NM_VPN_PLUGIN_FAILURE"> <tp:docstring> Reason code for the failure. </tp:docstring> </arg> </signal> + + <tp:enum name="NM_VPN_PLUGIN_FAILURE" type="u"> + <tp:enumvalue suffix="LOGIN_FAILED" value="0"> + <tp:docstring> + Login failed. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="CONNECT_FAILED" value="1"> + <tp:docstring> + Connect failed. + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="BAD_IP_CONFIG" value="2"> + <tp:docstring> + Invalid IP configuration returned from the VPN plugin. + </tp:docstring> + </tp:enumvalue> + </tp:enum> + </interface> </node> diff --git a/tdecore/networkbackends/network-manager/introspection/nm-wimax-nsp.xml b/tdecore/networkbackends/network-manager/introspection/nm-wimax-nsp.xml new file mode 100644 index 000000000..55ac4abcf --- /dev/null +++ b/tdecore/networkbackends/network-manager/introspection/nm-wimax-nsp.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"> + <interface name="org.freedesktop.NetworkManager.WiMax.Nsp"> + + <property name="Name" type="s" access="read"> + <tp:docstring>The name of the NSP.</tp:docstring> + </property> + <property name="SignalQuality" type="u" access="read"> + <tp:docstring>The current signal quality of the NSP, in percent.</tp:docstring> + </property> + <property name="NetworkType" type="u" access="read" tp:type="NM_WIMAX_NSP_NETWORK_TYPE"> + <tp:docstring>The network type of the NSP.</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> + + <tp:flags name="NM_WIMAX_NSP_NETWORK_TYPE" value-prefix="NM_WIMAX_NSP_NETWORK_TYPE" type="u"> + <tp:docstring> + Network type of the NSP. + </tp:docstring> + <tp:flag suffix="UNKNOWN" value="0x0"> + <tp:docstring>Unknown network.</tp:docstring> + </tp:flag> + <tp:flag suffix="HOME" value="0x1"> + <tp:docstring>Home network.</tp:docstring> + </tp:flag> + <tp:flag suffix="PARTNER" value="0x2"> + <tp:docstring>Partner network.</tp:docstring> + </tp:flag> + <tp:flag suffix="ROAMING_PARTNER" value="0x3"> + <tp:docstring>Roaming partner network.</tp:docstring> + </tp:flag> + + </tp:flags> + + </interface> +</node> |