mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-07-21 18:24:49 +00:00
2008-10-22 Dan Williams <dcbw@redhat.com>
* include/NetworkManager.h introspection/nm-device.xml - Add device state change reason for carrier changes * src/nm-device-ethernet.c - (set_carrier): use the carrier change reason when changing device state in response to carrier changes git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@4203 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
parent
f2cabde0f9
commit
f029b6f4e9
10
ChangeLog
10
ChangeLog
|
@ -1,3 +1,13 @@
|
||||||
|
2008-10-22 Dan Williams <dcbw@redhat.com>
|
||||||
|
|
||||||
|
* include/NetworkManager.h
|
||||||
|
introspection/nm-device.xml
|
||||||
|
- Add device state change reason for carrier changes
|
||||||
|
|
||||||
|
* src/nm-device-ethernet.c
|
||||||
|
- (set_carrier): use the carrier change reason when changing device
|
||||||
|
state in response to carrier changes
|
||||||
|
|
||||||
2008-10-21 Dan Williams <dcbw@redhat.com>
|
2008-10-21 Dan Williams <dcbw@redhat.com>
|
||||||
|
|
||||||
* src/NetworkManagerPolicy.c
|
* src/NetworkManagerPolicy.c
|
||||||
|
|
|
@ -337,6 +337,9 @@ typedef enum {
|
||||||
/* Device disconnected by user or client */
|
/* Device disconnected by user or client */
|
||||||
NM_DEVICE_STATE_REASON_USER_REQUESTED,
|
NM_DEVICE_STATE_REASON_USER_REQUESTED,
|
||||||
|
|
||||||
|
/* Carrier/link changed */
|
||||||
|
NM_DEVICE_STATE_REASON_CARRIER,
|
||||||
|
|
||||||
/* Unused */
|
/* Unused */
|
||||||
NM_DEVICE_STATE_REASON_LAST = 0xFFFF
|
NM_DEVICE_STATE_REASON_LAST = 0xFFFF
|
||||||
} NMDeviceStateReason;
|
} NMDeviceStateReason;
|
||||||
|
|
|
@ -339,6 +339,11 @@
|
||||||
<tp:docstring>
|
<tp:docstring>
|
||||||
A user or client requested the disconnection.
|
A user or client requested the disconnection.
|
||||||
</tp:docstring>
|
</tp:docstring>
|
||||||
|
</tp:enumvalue>
|
||||||
|
<tp:enumvalue suffix="CARRIER" value="40">
|
||||||
|
<tp:docstring>
|
||||||
|
The device's carrier/link changed.
|
||||||
|
</tp:docstring>
|
||||||
</tp:enumvalue>
|
</tp:enumvalue>
|
||||||
</tp:enum>
|
</tp:enum>
|
||||||
|
|
||||||
|
|
|
@ -190,10 +190,10 @@ set_carrier (NMDeviceEthernet *self, const gboolean carrier)
|
||||||
nm_info ("(%s): carrier now %s (device state %d)", nm_device_get_iface (NM_DEVICE (self)), carrier ? "ON" : "OFF", state);
|
nm_info ("(%s): carrier now %s (device state %d)", nm_device_get_iface (NM_DEVICE (self)), carrier ? "ON" : "OFF", state);
|
||||||
if (state == NM_DEVICE_STATE_UNAVAILABLE) {
|
if (state == NM_DEVICE_STATE_UNAVAILABLE) {
|
||||||
if (carrier)
|
if (carrier)
|
||||||
nm_device_state_changed (NM_DEVICE (self), NM_DEVICE_STATE_DISCONNECTED, NM_DEVICE_STATE_REASON_NONE);
|
nm_device_state_changed (NM_DEVICE (self), NM_DEVICE_STATE_DISCONNECTED, NM_DEVICE_STATE_REASON_CARRIER);
|
||||||
} else if (state >= NM_DEVICE_STATE_DISCONNECTED) {
|
} else if (state >= NM_DEVICE_STATE_DISCONNECTED) {
|
||||||
if (!carrier)
|
if (!carrier)
|
||||||
nm_device_state_changed (NM_DEVICE (self), NM_DEVICE_STATE_UNAVAILABLE, NM_DEVICE_STATE_REASON_NONE);
|
nm_device_state_changed (NM_DEVICE (self), NM_DEVICE_STATE_UNAVAILABLE, NM_DEVICE_STATE_REASON_CARRIER);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue