Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-12-22 04:32:37 +01:00
Code Releases Activity

device: Send .Aborted error if property set fails

Browse Source 
If a property setting is canceled before the callback is generated, then
generate an .Aborted error the the method return
This commit is contained in:
Denis Kenzior 2018-08-17 12:02:15 -05:00
parent 3a9b1f2e38
commit c530667ed1
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/device.c
View File

@ -2276,6 +2276,18 @@ struct set_generic_cb_data {
l_dbus_property_complete_cb_t complete; l_dbus_property_complete_cb_t complete;
}; };
static void set_generic_destroy(void *user_data)
{
struct set_generic_cb_data *cb_data = user_data;
/* Message hasn't been replied to, generate an Aborted error */
if (cb_data->message)
cb_data->complete(cb_data->dbus, cb_data->message,
dbus_error_aborted(cb_data->message));
l_free(cb_data);
}
static void set_powered_cb(struct netdev *netdev, int result, void *user_data) static void set_powered_cb(struct netdev *netdev, int result, void *user_data)
{ {
struct set_generic_cb_data *cb_data = user_data; struct set_generic_cb_data *cb_data = user_data;
@ -2285,6 +2297,7 @@ static void set_powered_cb(struct netdev *netdev, int result, void *user_data)
reply = dbus_error_failed(cb_data->message); reply = dbus_error_failed(cb_data->message);
cb_data->complete(cb_data->dbus, cb_data->message, reply); cb_data->complete(cb_data->dbus, cb_data->message, reply);
cb_data->message = NULL;
} }
static struct l_dbus_message *device_property_set_powered(struct l_dbus *dbus, static struct l_dbus_message *device_property_set_powered(struct l_dbus *dbus,
@ -2314,7 +2327,7 @@ static struct l_dbus_message *device_property_set_powered(struct l_dbus *dbus,
cb_data->complete = complete; cb_data->complete = complete;
r = netdev_set_powered(device->netdev, powered, set_powered_cb, r = netdev_set_powered(device->netdev, powered, set_powered_cb,
cb_data, l_free); cb_data, set_generic_destroy);
if (r < 0) { if (r < 0) {
l_free(cb_data); l_free(cb_data);
return dbus_error_from_errno(r, message); return dbus_error_from_errno(r, message);
@ -2345,6 +2358,7 @@ static void set_4addr_cb(struct netdev *netdev, int result, void *user_data)
reply = dbus_error_failed(cb_data->message); reply = dbus_error_failed(cb_data->message);
cb_data->complete(cb_data->dbus, cb_data->message, reply); cb_data->complete(cb_data->dbus, cb_data->message, reply);
cb_data->message = NULL;
l_dbus_property_changed(cb_data->dbus, device_get_path(cb_data->device), l_dbus_property_changed(cb_data->dbus, device_get_path(cb_data->device),
IWD_DEVICE_INTERFACE, "WDS"); IWD_DEVICE_INTERFACE, "WDS");
@ -2375,8 +2389,8 @@ static struct l_dbus_message *device_property_set_4addr(struct l_dbus *dbus,
cb_data->message = message; cb_data->message = message;
cb_data->complete = complete; cb_data->complete = complete;
if (netdev_set_4addr(device->netdev, use_4addr, set_4addr_cb, cb_data, if (netdev_set_4addr(device->netdev, use_4addr, set_4addr_cb,
l_free) < 0) cb_data, set_generic_destroy) < 0)
return dbus_error_failed(message); return dbus_error_failed(message);
return NULL; return NULL;