From 2d67c1c6b2606b2c96831a44da73afe41fb8b6e1 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 23 Aug 2012 18:43:45 -0500 Subject: [PATCH] Update introspection to latest NM API --- .../network-manager/dbus/CMakeLists.txt | 36 +- .../network-manager/introspection/Makefile.am | 18 - .../introspection/nm-access-point.xml | 12 +- .../introspection/nm-active-connection.xml | 39 +- .../introspection/nm-agent-manager.xml | 38 ++ .../{nm-device-gsm.xml => nm-device-adsl.xml} | 8 +- .../introspection/nm-device-bond.xml | 27 + .../introspection/nm-device-bt.xml | 48 ++ .../introspection/nm-device-cdma.xml | 15 - .../introspection/nm-device-ethernet.xml | 39 ++ .../introspection/nm-device-infiniband.xml | 27 + .../introspection/nm-device-modem.xml | 64 +++ .../introspection/nm-device-olpc-mesh.xml | 34 ++ ...-802-3-ethernet.xml => nm-device-vlan.xml} | 10 +- ...802-11-wireless.xml => nm-device-wifi.xml} | 30 +- .../introspection/nm-device-wimax.xml | 103 ++++ .../introspection/nm-device.xml | 491 +++++++++++++++++- .../introspection/nm-dhcp4-config.xml | 20 + .../introspection/nm-dhcp6-config.xml | 20 + .../introspection/nm-exported-connection.xml | 108 ---- .../introspection/nm-ip4-config.xml | 22 +- .../introspection/nm-ip6-config.xml | 19 + .../introspection/nm-manager-client.xml | 63 --- .../introspection/nm-manager.xml | 283 +++++++--- .../introspection/nm-secret-agent.xml | 177 +++++++ .../introspection/nm-settings-connection.xml | 93 ++++ .../introspection/nm-settings.xml | 78 ++- .../introspection/nm-vpn-connection-only.xml | 136 ----- .../introspection/nm-vpn-connection.xml | 37 +- .../introspection/nm-vpn-manager.xml | 46 -- .../introspection/nm-vpn-plugin.xml | 71 ++- .../introspection/nm-wimax-nsp.xml | 44 ++ 32 files changed, 1700 insertions(+), 556 deletions(-) delete mode 100644 tdecore/networkbackends/network-manager/introspection/Makefile.am create mode 100644 tdecore/networkbackends/network-manager/introspection/nm-agent-manager.xml rename tdecore/networkbackends/network-manager/introspection/{nm-device-gsm.xml => nm-device-adsl.xml} (64%) create mode 100644 tdecore/networkbackends/network-manager/introspection/nm-device-bond.xml create mode 100644 tdecore/networkbackends/network-manager/introspection/nm-device-bt.xml delete mode 100644 tdecore/networkbackends/network-manager/introspection/nm-device-cdma.xml create mode 100644 tdecore/networkbackends/network-manager/introspection/nm-device-ethernet.xml create mode 100644 tdecore/networkbackends/network-manager/introspection/nm-device-infiniband.xml create mode 100644 tdecore/networkbackends/network-manager/introspection/nm-device-modem.xml create mode 100644 tdecore/networkbackends/network-manager/introspection/nm-device-olpc-mesh.xml rename tdecore/networkbackends/network-manager/introspection/{nm-device-802-3-ethernet.xml => nm-device-vlan.xml} (84%) rename tdecore/networkbackends/network-manager/introspection/{nm-device-802-11-wireless.xml => nm-device-wifi.xml} (80%) create mode 100644 tdecore/networkbackends/network-manager/introspection/nm-device-wimax.xml create mode 100644 tdecore/networkbackends/network-manager/introspection/nm-dhcp4-config.xml create mode 100644 tdecore/networkbackends/network-manager/introspection/nm-dhcp6-config.xml delete mode 100644 tdecore/networkbackends/network-manager/introspection/nm-exported-connection.xml create mode 100644 tdecore/networkbackends/network-manager/introspection/nm-ip6-config.xml delete mode 100644 tdecore/networkbackends/network-manager/introspection/nm-manager-client.xml create mode 100644 tdecore/networkbackends/network-manager/introspection/nm-secret-agent.xml create mode 100644 tdecore/networkbackends/network-manager/introspection/nm-settings-connection.xml delete mode 100644 tdecore/networkbackends/network-manager/introspection/nm-vpn-connection-only.xml delete mode 100644 tdecore/networkbackends/network-manager/introspection/nm-vpn-manager.xml create mode 100644 tdecore/networkbackends/network-manager/introspection/nm-wimax-nsp.xml 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 @@ The radio channel frequency in use by the access point, in MHz. - The hardware address of the access point. + The hardware address (BSSID) of the access point. @@ -28,7 +28,7 @@ The maximum bitrate this access point is capable of, in kilobits/second (Kb/s). - The current signal strength received from this access point. + The current signal quality of the access point, in percent. @@ -69,16 +69,16 @@ Access point supports pairwise CCMP encryption. - Access point supports a group 40-bit WEP cypher. + Access point supports a group 40-bit WEP cipher. - Access point supports a group 104-bit WEP cypher. + Access point supports a group 104-bit WEP cipher. - Access point supports a group TKIP cypher. + Access point supports a group TKIP cipher. - Access point supports a group CCMP cypher. + Access point supports a group CCMP cipher. Access point supports PSK key management. 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 @@ - - The D-Bus service name providing this connection. - + + 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. + + The path of the connection. A specific object associated with the active connection. - - The D-Bus service name that provides a connection with which this active connection is shared. - - - The path of a connection provided by the D-Bus service SharedServiceName which which this connection is shared. + + + The UUID of the connection, provided as a convenience so that clients + do not have to retrieve all connection details. + Array of object paths representing devices which are part of this active connection. - + The state of this active connection. - Whether this active connection is the default connection, i.e. whether it currently owns the default route. + Whether this active connection is the default IPv4 connection, i.e. whether it currently owns the default IPv4 route. + + + Whether this active connection is the default IPv6 connection, i.e. whether it currently owns the default IPv6 route. + + + Whether this active connection is also a VPN connection. + + + The path to the master device if the connection is a slave. @@ -51,6 +65,11 @@ The connection is activated. + + + The connection is being torn down and cleaned up. + + 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 @@ + + + + + + + + Called by secret Agents to register their ability to provide and save + network secrets. + + + + + + Identifies this agent; only one agent in each user session may use the + same identifier. Identifier formatting follows the same rules as + D-Bus bus names with the exception that the ':' character is not + allowed. The valid set of characters is "[A-Z][a-z][0-9]_-." and the + identifier is limited in length to 255 characters with a minimum + of 3 characters. An example valid identifier is 'org.gnome.nm-applet' + (without quotes). + + + + + + + Called by secret Agents to notify NetworkManager that they will no + longer handle requests for network secrets. Agents are automatically + unregistered when they disconnect from D-Bus. + + + + + + + + diff --git a/tdecore/networkbackends/network-manager/introspection/nm-device-gsm.xml b/tdecore/networkbackends/network-manager/introspection/nm-device-adsl.xml similarity index 64% rename from tdecore/networkbackends/network-manager/introspection/nm-device-gsm.xml rename to 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 @@ - + @@ -11,5 +11,11 @@ + + + Indicates whether the physical carrier is found. + + + 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 @@ + + + + + + + + Hardware address of the device. + + + + + + Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not). + + + + + + + A dictionary mapping property names to variant boxed values + + + + + + 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 @@ + + + + + + + + Bluetooth hardware address of the device. + + + + + + Bluetooth name of the device. + + + + + + Bluetooth capabilities of the device (either DUN or NAP). + + + + + + + A dictionary mapping property names to variant boxed values + + + + + + + Flags describing the capabilities of a Bluetooth device. + + + The device has no recognized capabilities. + + + The device supports Bluetooth Dial-Up Networking. + + + The device supports Bluetooth Personal Area Networking. + + + + + 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 @@ - - - - - - - - - A dictionary mapping property names to variant boxed values - - - - - - 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 @@ + + + + + + + + Active hardware address of the device. + + + + + + Permanent hardware address of the device. + + + + + + Design speed of the device, in megabits/second (Mb/s). + + + + + + Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not). + + + + + + + A dictionary mapping property names to variant boxed values + + + + + + 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 @@ + + + + + + + + Hardware address of the device. + + + + + + Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not). + + + + + + + A dictionary mapping property names to variant boxed values + + + + + + 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 @@ + + + + + + + + + A dictionary mapping property names to variant boxed values + + + + + + + The generic family of access technologies the modem supports. Not all + capabilities are available at the same time however; some modems require + a firmware reload or other reinitialization to switch between eg CDMA/EVDO + and GSM/UMTS. + + + + + + The generic family of access technologies the modem currently supports + without a firmware reload or reinitialization. + + + + + + Flags describing one or more of the general access technology families + that a modem device supports. + + + Modem has no capabilties. + + + + Modem supports the analog wired telephone network (ie 56k dialup) and + does not have wireless/cellular capabilities. + + + + + Modem supports at least one of CDMA 1xRTT, EVDO revision 0, EVDO + revision A, or EVDO revision B. + + + + + Modem supports at least one of GSM, GPRS, EDGE, UMTS, HSDPA, HSUPA, or + HSPA+ packet switched data capability. + + + + + Modem has at LTE data capability. + + + + + + diff --git a/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 @@ + + + + + + + The hardware address of the device. + + + + + + The object path of the companion device. + + + + + + The currently active channel. + + + + + + + A dictionary containing the FIXME: check changed parameters. + + + + Emitted when the wireless device's properties changed. + + + + diff --git a/tdecore/networkbackends/network-manager/introspection/nm-device-802-3-ethernet.xml b/tdecore/networkbackends/network-manager/introspection/nm-device-vlan.xml similarity index 84% rename from tdecore/networkbackends/network-manager/introspection/nm-device-802-3-ethernet.xml rename to 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 @@ - + @@ -9,15 +9,15 @@ - + - Design speed of the device. + Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not). - + - Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not). + The VLAN ID of this VLAN interface. diff --git a/tdecore/networkbackends/network-manager/introspection/nm-device-802-11-wireless.xml b/tdecore/networkbackends/network-manager/introspection/nm-device-wifi.xml similarity index 80% rename from tdecore/networkbackends/network-manager/introspection/nm-device-802-11-wireless.xml rename to 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 @@ + + + + + + Options of scan + + + + Request the device to scan + + + - The hardware address of the device. + The active hardware address of the device. + + + + + + The permanent hardware address of the device. + The operating mode of the wireless device. @@ -82,16 +102,16 @@ Null capability - syntactic sugar for no capabilities supported. Do not AND this with other capabilities! - The device supports the 40-bit WEP cypher. + The device supports the 40-bit WEP cipher. - The device supports the 104-bit WEP cypher. + The device supports the 104-bit WEP cipher. - The device supports the TKIP cypher. + The device supports the TKIP cipher. - The device supports the CCMP cypher. + The device supports the CCMP cipher. The device supports the WPA encryption/authentication protocol. 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 @@ + + + + + + + + + List of NSP object paths + + + + Get the list of NSPs visible to this device. + + + + + + Hardware address of the device. + + + + + + Center frequency (in KHz) of the radio channel the device is using to + communicate with the network when connected. Has no meaning when the + device is not connected. + + + + + + RSSI of the current radio link in dBm. This value indicates how strong + the raw received RF signal from the base station is, but does not + indicate the overall quality of the radio link. Has no meaning when the + device is not connected. + + + + + + CINR (Carrier to Interference + Noise Ratio) of the current radio link + in dB. CINR is a more accurate measure of radio link quality. Has no + meaning when the device is not connected. + + + + + + Average power of the last burst transmitted by the device, in units of + 0.5 dBm. i.e. a TxPower of -11 represents an actual device TX power of + -5.5 dBm. Has no meaning when the device is not connected. + + + + + + The ID of the serving base station as received from the network. Has + no meaning when the device is not connected. + + + + + + Object path of the NSP currently used by the WiMax device. + + + + + + + A dictionary mapping property names to variant boxed values. + + + + Emitted when the WiMax device's properties changed. + + + + + + + The object path of the newly found NSP. + + + + Emitted when a new NSP is found by the device. + + + + + + + The object path of the NSP that has disappeared. + + + + Emitted when an NSP disappears from view of the device. + + + + + diff --git a/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 @@ - 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. - The network interface offered by the device. + The name of the device's control (and often data) interface. + + + + + 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. @@ -17,6 +36,16 @@ The driver handling the device. + + + The version of the driver handling the device. + + + + + The firmware version for the device. + + Flags describing the capabilities of the device. @@ -32,31 +61,95 @@ The current state of the device. + + + The current state and reason for changing to that state. + + + + + 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. + + 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. + + + 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. + + + + + 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. + + + + + 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. + + Whether or not this device is managed by NetworkManager. - - - + + + 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. + + + + + If TRUE, indicates the device is likely missing firmware necessary for + its operation. + + + + + The general type of the network device; ie Ethernet, WiFi, etc. + + + + An array of object paths of every configured connection that is currently 'available' through this device. + + + + + Disconnects a device and prevents the device from automatically activating further connections without user intervention. + + - + The new state of the device. + + + The previous state of the device. + + + + + A reason for the state transition. + + @@ -65,52 +158,134 @@ The device is in an unknown state. - + + + The device is recognized but not managed by NetworkManager. + + + - The device is down. + The device cannot be used (carrier off, rfkill, etc). - + The device is not connected. - + The device is preparing to connect. - + The device is being configured. - + + + The device is awaiting secrets necessary to continue connection. + + + - The device is awaiting authorization credentials. + The IP settings of the device are being requested and configured. - + - The IP address of the device is being configured. + The device's IP connectivity ability is being determined. - + + + The device is waiting for secondary connections to be activated. + + + The device is active. - + + + The device's network connection is being torn down. + + + The device is in a failure state following an attempt to activate it. - + + + + + + The device type is unknown. + + + - The previous activation attempt on this device was cancelled. + The device is wired Ethernet device. + + + + + The device is an 802.11 WiFi device. + + + + Unused + + + Unused + + + + The device is Bluetooth device that provides PAN or DUN capabilities. + + + + + The device is an OLPC mesh networking device. + + + + + The device is an 802.16e Mobile WiMAX device. + + + + + The device is a modem supporting one or more of analog telephone, + CDMA/EVDO, GSM/UMTS/HSPA, or LTE standards to access a cellular or + wireline data network. + + + + + The device is an IP-capable InfiniBand interface. + + + + + The device is a bond master interface. + + + + + The device is a VLAN interface. + + + + + The device is an ADSL device supporting PPPoE and PPPoATM protocols. + Null capability. @@ -122,5 +297,281 @@ The device supports carrier detection. + + + + + The reason for the device state change is unknown. + + + + + The state change is normal. + + + + + The device is now managed. + + + + + The device is no longer managed. + + + + + The device could not be readied for configuration. + + + + + IP configuration could not be reserved (no available address, timeout, etc). + + + + + The IP configuration is no longer valid. + + + + + Secrets were required, but not provided. + + + + + The 802.1X supplicant disconnected from the access point or authentication server. + + + + + Configuration of the 802.1X supplicant failed. + + + + + The 802.1X supplicant quit or failed unexpectedly. + + + + + The 802.1X supplicant took too long to authenticate. + + + + + The PPP service failed to start within the allowed time. + + + + + The PPP service disconnected unexpectedly. + + + + + The PPP service quit or failed unexpectedly. + + + + + The DHCP service failed to start within the allowed time. + + + + + The DHCP service reported an unexpected error. + + + + + The DHCP service quit or failed unexpectedly. + + + + + The shared connection service failed to start. + + + + + The shared connection service quit or failed unexpectedly. + + + + + The AutoIP service failed to start. + + + + + The AutoIP service reported an unexpected error. + + + + + The AutoIP service quit or failed unexpectedly. + + + + + Dialing failed because the line was busy. + + + + + Dialing failed because there was no dial tone. + + + + + Dialing failed because there was carrier. + + + + + Dialing timed out. + + + + + Dialing failed. + + + + + Modem initialization failed. + + + + + Failed to select the specified GSM APN. + + + + + Not searching for networks. + + + + + Network registration was denied. + + + + + Network registration timed out. + + + + + Failed to register with the requested GSM network. + + + + + PIN check failed. + + + + + Necessary firmware for the device may be missing. + + + + + The device was removed. + + + + + NetworkManager went to sleep. + + + + + The device's active connection was removed or disappeared. + + + + + A user or client requested the disconnection. + + + + + The device's carrier/link changed. + + + + + The device's existing connection was assumed. + + + + + The 802.1x supplicant is now available. + + + + + The modem could not be found. + + + + + The Bluetooth connection timed out or failed. + + + + + GSM Modem's SIM Card not inserted. + + + + + GSM Modem's SIM Pin required. + + + + + GSM Modem's SIM Puk required. + + + + + GSM Modem's SIM wrong + + + + + InfiniBand device does not support connected mode. + + + + + A dependency of the connection failed. + + + + + Problem with the RFC 2684 Ethernet over ADSL bridge. + + + + + + + + The device state. + + + + + The reason for originally changing to the device state. + + + 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 @@ + + + + + + Options and configuration returned by the IPv4 DHCP server. + + + Configuration options returned by a DHCP server, if any. + + + + + + A dictionary mapping property names to variant boxed values + + + + + 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 @@ + + + + + + Options and configuration returned by the IPv6 DHCP server. + + + Configuration options returned by a DHCP server, if any. + + + + + + A dictionary mapping property names to variant boxed values + + + + + 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 @@ - - - - - - - Represents a single network connection configuration. - - - - Obtain the ID of this connection. - - - - - The ID of this connection. - - - - - - - Update the connection. - - - - - New connection properties. - - - - - - - Delete the connection. - - - - - - - Get the settings maps describing this object. - - - - - The nested settings maps describing this object. - - - - - - - Emitted when some settings changed. - - - - Contains the changed settings. - - - - - - - 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. - - - - - - - - Secrets have a separate interface so that they can be locked down. - - - - - Get the secrets encapsulated in this object. - - - - - - Name of the setting to return. - - - - - Array of strings of key names in the Setting for which NM thinks - a secrets may be required. - - - - - Indicates whether new secrets should be requested or if the request can be fulfilled from storage. - - - - - - Nested settings maps containing secrets. Each setting MUST contain at least the 'name' field, containing the name of the setting, and one or more secrets. - - - - - - - diff --git a/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 @@ - Tuples of IPv4 address/netmask/gateway. The gateway is optional, if not given should be 0. - - - The hostname associated with this IPv4 address. FIXME: what about multiple hostnames? + Array of tuples of IPv4 address/prefix/gateway. All 3 + elements of each tuple are in network byte order. Essentially: + [(addr, prefix, gateway), (addr, prefix, gateway), ...] + The nameservers in use. + + The Windows Internet Name Service servers associated with the connection. Each address is in network byte order. + A list of domains this address belongs to. - - The NIS domain this address belongs to. - - - The NIS servers associated with this address. + + 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), ...] + 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 @@ + + + + + + Tuples of IPv6 address/prefix/gateway. + + + The nameservers in use. + + + A list of domains this address belongs to. + + + Tuples of IPv6 route/prefix/next-hop/metric. + + + + 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 @@ - - - + @@ -21,17 +14,31 @@ + + + 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. + + + + + Interface name of the device to find. + + + + + Object path of the network device. + + + + Activate a connection using the supplied device. - - - The D-Bus service name of the settings service that provides this connection. - - The connection to activate the devices with. @@ -39,12 +46,19 @@ - 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. - 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. @@ -55,7 +69,6 @@ - Another connection is already activating or the same connection is already active. FIXME: check if the error name is correct. FIXME: split into 2 errors? @@ -65,11 +78,61 @@ + + + + + Adds a new connection using the given details (if any) as a template + (automatically filling in missing settings with the capabilities of the + given device and specific object), then activate the new connection. + Cannot be used for VPN connections at this time. + + + + Connection settings and properties; if incomplete missing settings will + be automatically completed using the given device and specific object. + + + + + The object path of device to be activated using the given connection. + + + + + The path of a connection-type-specific object this activation should use. + This parameter is currently ignored for wired and mobile broadband connections, + and the value of "/" should be used (ie, no specific object). For WiFi + connections, pass the object path of a specific AP from the card's scan + list, which will be used to complete the details of the newly added + connection. + + + + + Object path of the new connection that was just added. + + + + + The path of the active connection object representing this active connection. + + + + + + + The connection is invalid for this device. + + + + Deactivate an active connection. + The currently active connection to deactivate. @@ -79,8 +142,12 @@ + - 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. @@ -89,6 +156,91 @@ + + + + + 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. + + + + If FALSE, indicates that all networking should be disabled. If TRUE, + indicates that NetworkManager should begin managing network devices. + + + + + + + + + Returns the permissions a caller has for various authenticated operations + that NetworkManager provides, like Enable/Disable networking, changing + WiFi, WWAN, and WiMAX state, etc. + + + + 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. + + + + + + + Emitted when system authorization details change, indicating that + clients may wish to recheck permissions with GetPermissions. + + + + + + + Set logging verbosity and which operations are logged. + + + + One of [ERR, WARN, INFO, DEBUG]. + + + + + 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. + + + + + + + The overall networking state as determined by the NetworkManager daemon, + based on the state of network devices under it's management. + + + + + + + + Indicates if overall networking is currently enabled or not. See the + Enable() method. + + + Indicates if wireless is currently enabled or not. @@ -101,12 +253,42 @@ + + + Indicates if mobile broadband devices are currently enabled or not. + + + + + + Indicates if the mobile broadband hardware is currently enabled, i.e. the state of the RF kill switch. + + + + + + Indicates if WiMAX devices are currently enabled or not. + + + + + + Indicates if the WiMAX hardware is currently enabled, i.e. the state of the RF kill switch. + + + List of active connection object paths. + + + NetworkManager version. + + + The overall state of the NetworkManager daemon. @@ -163,65 +345,46 @@ - The NetworkManager daemon is in an unknown state. + Networking state is unknown. - + - The NetworkManager daemon is asleep and all interfaces managed by it are inactive. + Networking is inactive and all devices are disabled. - + - The NetworkManager daemon is connecting a device. FIXME: What does this mean when one device is active and another is connecting? + There is no active network connection. - + - The NetworkManager daemon is connected. + Network connections are being cleaned up. - + - The NetworkManager daemon is disconnected. + A network device is connecting to a network and there is no other + available network connection. - - - - - - - DEPRECATED. NetworkManager's state changed. Use the 'StateChanged' signal instead. - - + - The new state of NetworkManager. + A network device is connected, but there is only link-local connectivity. - - - - - - DEPRECATED. Control the NetworkManager daemon's sleep state. When asleep, all interfaces that it manages are deactivated. - - - - - - - DEPRECATED. Control the NetworkManager daemon's sleep state. When awake, all known interfaces are available to be activated. - - - - - - - DEPRECATED. The overall state of the NetworkManager daemon. - - - - + + + + A network device is connected, but there is only site-local connectivity. + + + + + A network device is connected, with global network connectivity. + + + diff --git a/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 @@ + + + + + + + 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. + + + + + Retrieve and return stored secrets, if any, or request new + secrets from the agent's user. + + + + + + Nested settings maps containing the connection for which + secrets are being requested. This may contain system-owned + secrets if the agent has successfully authenticated to + modify system network settings and the GetSecrets request + flags allow user interaction. + + + + + Object path of the connection for which secrets are being + requested. + + + + + Setting name for which secrets are being requested. + + + + + Array of strings of key names in the requested setting for + which NetworkManager thinks a secrets may be required, + 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. + + + + + Flags which modify the behavior of the secrets request. + If true, new secrets are assumed to be invalid or incorrect, + and the agent should ask the user for new secrets. If false, + existing secrets should be retrieved from storage and + returned without interrupting the user. + + + + + + Nested settings maps containing secrets. Each setting MUST + contain at least the 'name' field, containing the name of + the setting, and one or more secrets. + + + + + + + Flags modifying the behavior of GetSecrets request. + + + + No special behavior; by default no user interaction is allowed and + requests for secrets are fulfilled from persistent storage, or + if no secrets are available an error is returned. + + + + + Allows the request to interact with the user, possibly prompting + via UI for secrets if any are required, or if none are found in + persistent storage. + + + + + Explicitly prompt for new secrets from the user. This flag + signals that NetworkManager thinks any existing secrets are + invalid or wrong. This flag implies that interaction is allowed. + + + + + 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. + + + + + + + Cancel a pending GetSecrets request for secrets of the given + connection. Any matching request should be canceled. + + + + + + Object path of the connection for which, if secrets are being + requested, the request should be canceled. + + + + + Setting name for which secrets for this connection were + originally being requested. + + + + + + + Save given secrets to backing storage. + + + + + + Nested settings maps containing the entire connection + (including secrets), for which the agent should save the + secrets to backing storage. 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. + + + + + Object path of the connection for which the agent should + save secrets to backing storage. + + + + + + + Delete secrets from backing storage. + + + + + + Nested settings maps containing the connection properties + (sans secrets), for which the agent should delete the + secrets from backing storage. + + + + + Object path of the connection for which the agent should + delete secrets from backing storage. + + + + + + + diff --git a/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 @@ + + + + + + + Represents a single network connection configuration. + + + + + Update the connection with new settings and properties, replacing + all previous settings and properties. Secrets may be part of the + update request, and will be either stored in persistent storage or + given to a Secret Agent for storage, depending on the request. + + + + + + New connection settings, properties, and (optionally) secrets. + + + + + + + Delete the connection. + + + + + + + + Get the settings maps describing this network configuration. + This will never include any secrets required for connection + to the network, as those are often protected. Secrets must + be requested separately using the GetSecrets() call. + + + + + + The nested settings maps describing this object. + + + + + + + Get the secrets belonging to this network configuration. Only + secrets from persistent storage or a Secret Agent running in + the requestor's session will be returned. The user will never + be prompted for secrets as a result of this request. + + + + + + Name of the setting to return secrets for. If empty, all + all secrets will be returned. + + + + + + Nested settings maps containing secrets. + + + + + + + Emitted when any settings or permissions change. When handling + this signal, clients should re-read the connection using the + GetSettings method to get the changes and to ensure the client + still has permission to access the connection. + + + + + + Emitted when this connection is no longer available. This + happens when the connection is deleted or if it is no longer + accessable by any of the system's logged-in users. After + receipt of this signal, the object no longer exists. + + + + + + diff --git a/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 @@ - - + + - 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. @@ -18,9 +18,77 @@ + + + Retrieve the object path of a connection, given that connection's UUID. + + + + + The UUID to find the connection object path for. + + + + + The connection's object path. + + + + + + + Add new connection. + + + + + + Connection settings and properties. + + + + + Object path of the new connection that was just added. + + + + + + + Save the hostname to persistent configuration. + + + + + + The hostname to save to persistent configuration. If blank, the persistent hostname is cleared. + + + + + + + The machine hostname stored in persistent configuration. + + + + + + If true, adding and modifying connections is supported. + + + + + + + A dictionary mapping property names to variant boxed values + + + + - Emitted when a new connection has been configured. + Emitted when a new connection has been added. @@ -28,5 +96,7 @@ + + 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 @@ - - - - - - Represents an active connection to a Virtual Private Network. - - - - - - A dictionary mapping property names to variant boxed values - - - - - - The VPN-specific state of the connection. - - - The banner string of the VPN connection. - - - - - Emitted when the state of the VPN connection has changed. - - - - The new state of the VPN connection. - - - - - Reason code describing the change to the new state. - - - - - - - - The state of the VPN connection is unknown. - - - - - The VPN connection is preparing to connect. - - - - - The VPN connection needs authorization credentials. - - - - - The VPN connection is being established. FIXME: Should be CONNECTING or CONNECTED. - - - - - The VPN connection is getting an IP address. FIXME: Should be an -ING - - - - - The VPN connection is active. - - - - - The VPN connection failed. - - - - - The VPN connection is disconnected. - - - - - - - The reason for the VPN connection state change is unknown. - - - - - No reason was given for the VPN connection state change. - - - - - The VPN connection changed state because the user disconnected it. - - - - - The VPN connection changed state because the device it was using was disconnected. - - - - - The service providing the VPN connection was stopped. - - - - - The IP config of the VPN connection was invalid. - - - - - The connection attempt to the VPN service timed out. - - - - - A timeout occurred while starting the service providing the VPN connection. - - - - - Starting the service starting the service providing the VPN connection failed. - - - - - Necessary secrets for the VPN connection were not provided. - - - - - - 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 @@ - - - The D-Bus service name providing this connection. - - - The path of the connection. - - - A specific object associated with the active connection. - - - The D-Bus service name that provides a connection with which this active connection is shared. - - - The path of a connection provided by the D-Bus service SharedServiceName which which this connection is shared. - - - Array of object paths representing devices which are part of this active connection. - - - The state of this active connection. - - - Whether this active connection is the default connection, i.e. whether it currently owns the default route. - - - Represents an active connection to a Virtual Private Network. @@ -157,6 +130,16 @@ Necessary secrets for the VPN connection were not provided. + + + Authentication to the VPN server failed. + + + + + The connection was deleted from settings. + + 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 @@ - - - - - - - Establish a VPN connection. - - - - - String describing the connection type. - - - - - Object path of the network connection to establish the VPN connection on. - - - - - Object path of the device to establish the VPN connection on. - - - - - Object path of the newly created VPN connection. - - - - - - - Get the list of active VPN connections. - - - - - List of object paths of active VPN connections. - - - - - - - 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 @@ + + + Set generic connection details on the connection. + + + + + Generic configuration details for the connection. + + + + Set IPv4 details on the connection. @@ -62,7 +74,21 @@ - Ip4Config details for the conneciton. + Ip4Config details for the connection. You must call + SetConfig() before calling this. + + + + + + + Set IPv6 details on the connection. + + + + + Ip6Config details for the connection. You must call + SetConfig() before calling this. @@ -96,6 +122,17 @@ + + + The plugin obtained generic configuration information. + + + + The configuration information. + + + + The plugin obtained an IPv4 configuration. @@ -107,6 +144,17 @@ + + + The plugin obtained an IPv6 configuration. + + + + The IPv6 configuration. + + + + Emitted when the plugin receives a login banner from the VPN service. @@ -122,11 +170,30 @@ Emitted when a failure in the VPN plugin occurs. - + Reason code for the failure. + + + + + Login failed. + + + + + Connect failed. + + + + + Invalid IP configuration returned from the VPN plugin. + + + + 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 @@ + + + + + + + The name of the NSP. + + + The current signal quality of the NSP, in percent. + + + The network type of the NSP. + + + + + + A dictionary mapping property names to variant boxed values. + + + + + + + Network type of the NSP. + + + Unknown network. + + + Home network. + + + Partner network. + + + Roaming partner network. + + + + + +