mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2025-12-25 23:30:07 +01:00
54aac18883
* include/NetworkManager.h - Remove the DOWN and CANCELLED device states - Add UNMANAGED and UNAVAILABLE device states - Document the device states * introspection/nm-device.xml src/nm-device-interface.c src/nm-device-interface.h - Add the 'managed' property * test/nm-tool.c - (detail_device): print out device state * src/NetworkManagerSystem.h src/backends/NetworkManagerArch.c src/backends/NetworkManagerDebian.c src/backends/NetworkManagerFrugalware.c src/backends/NetworkManagerGentoo.c src/backends/NetworkManagerMandriva.c src/backends/NetworkManagerPaldo.c src/backends/NetworkManagerRedHat.c src/backends/NetworkManagerSlackware.c src/backends/NetworkManagerSuSE.c - (nm_system_device_get_system_config, nm_system_device_get_disabled nm_system_device_free_system_config): remove; they were unused and their functionality should be re-implemented in each distro's system settings service plugin * src/nm-gsm-device.c src/nm-gsm-device.h src/nm-cdma-device.c src/nm-cdma-device.h - (*_new): take the 'managed' argument * src/nm-device.c - (nm_device_set_address): remove, fold into nm_device_bring_up() - (nm_device_init): start in unmanaged state, not disconnected - (constructor): don't start device until the system settings service has had a chance to figure out if the device is managed or not - (nm_device_deactivate, nm_device_bring_up, nm_device_bring_down): don't set device state here, let callers handle that as appropriate - (nm_device_dispose): don't touch the device if it's not managed - (set_property, get_property, nm_device_class_init): implement the 'managed' property - (nm_device_state_changed): bring the device up if its now managed, and deactivate it if it used to be active - (nm_device_get_managed, nm_device_set_managed): do the right thing with the managed state * src/nm-hal-manager.c - (wired_device_creator, wireless_device_creator, modem_device_creator): take initial managed state and pass it along to device constructors - (create_device_and_add_to_list): get managed state and pass to type creators * src/nm-device-802-11-wireless.c - (real_can_activate): fold in most of nm_device_802_11_wireless_can_activate() - (can_scan): can't scan in UNAVAILABLE or UNMANAGED - (link_timeout_cb): instead of deactivating, change device state and let the device state handler to it - (real_update_hw_address): clean up - (state_changed_cb): when entering UNAVAILABLE state, schedule an idle handler to transition to DISCONNECTED if the device isn't rfkilled * src/nm-device-802-3-ethernet.c - (set_carrier): move above callers and get rid of prototype - (device_state_changed): when entering UNAVAILABLE state, schedule an idle handler to transition to DISCONNECTED if the device has a carrier - (real_update_hw_address): clean up - (link_timeout_cb, ppp_state_changed): change state instead of calling deactivation directly as deactivation doesn't change state anymore * src/NetworkManagerPolicy.c - (schedule_activate_check): yay, remove wireless_enabled hack since the NMManager and wireless devices work that out themselves now - (device_state_changed): change to a switch and update for new device states - (device_carrier_changed): remove; device handles this now through state changes - (device_added): don't care about carrier any more; the initial activation check will happen when the device transitions to DISCONNECTED * src/nm-manager.c - (dispose): clear unmanaged devices - (handle_unmanaged_devices): update unmanaged device list and toggle the managed property on each device when needed - (system_settings_properties_changed_cb): handle signals from the system settings service - (system_settings_get_unmanaged_devices_cb): handle callback from getting the unmanaged device list method call - (query_unmanaged_devices): ask the system settings service for its list of unmanaged devices - (nm_manager_name_owner_changed, initial_get_connections): get unmanaged devices - (manager_set_wireless_enabled): push rfkill state down to wireless devices directly and let them handle the necessary state transitions - (manager_device_state_changed): update for new device states - (nm_manager_add_device): set initial rfkill state on wireless devices - (nm_manager_remove_device): don't touch the device if it's unmanaged - (nm_manager_activate_connection): return error if the device is unmanaged - (nm_manager_sleep): handle new device states correctly; don't change the state of unavailable/unmanaged devices * libnm-glib/nm-device-802-11-wireless.c - (state_changed_cb): update for new device states git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3540 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
126 lines
4.3 KiB
XML
126 lines
4.3 KiB
XML
<?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">
|
|
<property name="Udi" type="s" access="read">
|
|
<tp:docstring>
|
|
HAL UDI for the device.
|
|
</tp:docstring>
|
|
</property>
|
|
<property name="Interface" type="s" access="read">
|
|
<tp:docstring>
|
|
The network interface offered by the device.
|
|
</tp:docstring>
|
|
</property>
|
|
<property name="Driver" type="s" access="read">
|
|
<tp:docstring>
|
|
The driver handling 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.
|
|
</tp:docstring>
|
|
</property>
|
|
<property name="Ip4Address" type="i" access="read">
|
|
<tp:docstring>
|
|
The IPv4 address bound to the device. FIXME: what about devices with >1 IP address?
|
|
</tp:docstring>
|
|
</property>
|
|
<property name="State" type="u" access="read" tp:type="NM_DEVICE_STATE">
|
|
<tp:docstring>
|
|
The current state of the device.
|
|
</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="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">
|
|
<tp:docstring>
|
|
</tp:docstring>
|
|
</property>
|
|
|
|
|
|
<signal name="StateChanged">
|
|
<arg name="state" type="u" tp:type="NM_DEVICE_STATE">
|
|
<tp:docstring>
|
|
The new state of the device.
|
|
</tp:docstring>
|
|
</arg>
|
|
</signal>
|
|
|
|
<tp:enum name="NM_DEVICE_STATE" type="u">
|
|
<tp:enumvalue suffix="UNKNOWN" value="0">
|
|
<tp:docstring>
|
|
The device is in an unknown state.
|
|
</tp:docstring>
|
|
</tp:enumvalue>
|
|
<tp:enumvalue suffix="DOWN" value="1">
|
|
<tp:docstring>
|
|
The device is down.
|
|
</tp:docstring>
|
|
</tp:enumvalue>
|
|
<tp:enumvalue suffix="DISCONNECTED" value="2">
|
|
<tp:docstring>
|
|
The device is not connected.
|
|
</tp:docstring>
|
|
</tp:enumvalue>
|
|
<tp:enumvalue suffix="PREPARE" value="3">
|
|
<tp:docstring>
|
|
The device is preparing to connect.
|
|
</tp:docstring>
|
|
</tp:enumvalue>
|
|
<tp:enumvalue suffix="CONFIG" value="4">
|
|
<tp:docstring>
|
|
The device is being configured.
|
|
</tp:docstring>
|
|
</tp:enumvalue>
|
|
<tp:enumvalue suffix="NEED_AUTH" value="5">
|
|
<tp:docstring>
|
|
The device is awaiting authorization credentials.
|
|
</tp:docstring>
|
|
</tp:enumvalue>
|
|
<tp:enumvalue suffix="IP_CONFIG" value="6">
|
|
<tp:docstring>
|
|
The IP address of the device is being configured.
|
|
</tp:docstring>
|
|
</tp:enumvalue>
|
|
<tp:enumvalue suffix="ACTIVATED" value="7">
|
|
<tp:docstring>
|
|
The device is active.
|
|
</tp:docstring>
|
|
</tp:enumvalue>
|
|
<tp:enumvalue suffix="FAILED" value="8">
|
|
<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:docstring>
|
|
The previous activation attempt on this device was cancelled.
|
|
</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>
|
|
</tp:flag>
|
|
<tp:flag suffix="NM_SUPPORTED" value="0x1">
|
|
<tp:docstring>The device is supported by NetworkManager.</tp:docstring>
|
|
</tp:flag>
|
|
<tp:flag suffix="CARRIER_DETECT" value="0x2">
|
|
<tp:docstring>The device supports carrier detection.</tp:docstring>
|
|
</tp:flag>
|
|
</tp:flags>
|
|
</interface>
|
|
</node>
|