mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-01-09 13:30:20 +01:00
f30cf17bf7
Move the 'carrier' property from NMDevice to NMDevice8023Ethernet; convert the libnm-glib NMDevice8023Ethernet to cached properties * introspection/nm-device-802-3-ethernet.xml - New 'Carrier' property - New 'PropertiesChanged' signal * introspection/nm-device.xml - Remove 'Carrier' property - Remove 'CarrierChanged' signal * src/nm-device-interface.c src/nm-device-interface.h - (nm_device_interface_init): remove 'carrier' property and 'carrier-changed' signal * src/nm-device.c src/nm-device.h - (nm_device_get_carrier, nm_device_set_carrier): remove - (nm_device_activate_stage5_ip_config_commit): don't bother updating the link here; wired device will handle that - (handle_dhcp_lease_change): don't bother updating link here - (get_property, nm_device_class_init): remove carrier property * src/nm-device-802-11-wireless.c - (real_update_link, nm_device_802_11_wireless_class_init): remove real_update_link(); wireless devices don't use carrier at all - (link_timeout_cb, supplicant_iface_state_cb_handler, supplicant_iface_connection_state_cb_handler, supplicant_mgr_state_cb_handler): remove anything to do with carrier * src/nm-device-802-3-ethernet.c src/nm-device-802-3-ethernet.h - (nm_device_802_3_ethernet_carrier_on, nm_device_802_3_ethernet_carrier_off, constructor): use set_carrier() instead of nm_device_set_carrier() - (device_state_changed): update link from sysfs on activation; replaces real_update_link() - (real_update_link): remove, replaced by device_state_changed() - (nm_device_802_3_ethernet_get_carrier, set_carrier): new functions - (nm_device_802_3_ethernet_get_speed): move up with other getters/setters - (real_get_generic_capabilities, real_can_interrupt_activation): use new get_carrier function - (get_property): add 'carrier' property - (nm_device_802_3_ethernet_class_init): add 'carrier' property and hook into property-changed signal helper * src/NetworkManagerPolicy.c - (device_carrier_changed): will only ever be called with a wired device - (device_added): only hook up to carrier-changed for wired devices * libnm-glib/nm-device.c libnm-glib/nm-device.h - (constructor, nm_device_class_init): remove carrier-changed signal - (device_carrier_changed_proxy): remove; unused - (nm_device_get_carrier): remove; carrier a property of wired devices * libnm-glib/nm-device-802-3-ethernet.c libnm-glib/nm-device-802-3-ethernet.h - Convert to cached properties like AP and Wireless objects - (nm_device_802_3_ethernet_get_hw_address): now returns a 'const char *' instead of a 'char *', return value should not be freed - (nm_device_802_3_ethernet_get_carrier): return current carrier status - (constructor): hook into properties-changed helper - (set_property, get_property): new functions - (nm_device_802_3_ethernet_class_init): export GObject properties * test/nm-tool.c - (detail_device): strdup the wired hardware address too since it's cached now * libnm-glib/libnm-glib-test.c - (dump_wired): strdup the wired hardware address too since it's cached now git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3428 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
128 lines
4.4 KiB
XML
128 lines
4.4 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">
|
|
<method name="Deactivate">
|
|
<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_device_deactivate"/>
|
|
<tp:docstring>
|
|
Deactivate the device, removing its routing table entry and IP address
|
|
</tp:docstring>
|
|
</method>
|
|
|
|
<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>
|
|
|
|
<!-- 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>
|