Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-26 10:39:23 +01:00
Code Releases Activity

ap: Send a specific error message on async AP start failure

Browse Source 
We generate the DBus error reply type from the errno only when
ap_start() was failing synchronously, now also send the errno through
the callbacks so that we can also return a specific DBus reply when
failing asynchronously.  Thea AP autotest relies on receiving the
AlreadyExists DBus error.
This commit is contained in:
Andrew Zaborowski 2021-05-28 02:47:34 +02:00 committed by Denis Kenzior
parent ff2840f95f
commit a6002562ef
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/ap.c
View File

@ -2054,9 +2054,11 @@ static void do_debug(const char *str, void *user_data)
l_info("%s%s", prefix, str); l_info("%s%s", prefix, str);
} }
static void ap_start_failed(struct ap_state *ap) static void ap_start_failed(struct ap_state *ap, int err)
{ {
ap->ops->handle_event(AP_EVENT_START_FAILED, NULL, ap->user_data); struct ap_event_start_failed_data data = { err };
ap->ops->handle_event(AP_EVENT_START_FAILED, &data, ap->user_data);
ap_reset(ap); ap_reset(ap);
l_genl_family_free(ap->nl80211); l_genl_family_free(ap->nl80211);
@ -2071,22 +2073,18 @@ static void ap_start_cb(struct l_genl_msg *msg, void *user_data)
if (l_genl_msg_get_error(msg) < 0) { if (l_genl_msg_get_error(msg) < 0) {
l_error("START_AP failed: %i", l_genl_msg_get_error(msg)); l_error("START_AP failed: %i", l_genl_msg_get_error(msg));
ap_start_failed(ap, l_genl_msg_get_error(msg));
goto failed; return;
} }
if (ap->netconfig_dhcp && !l_dhcp_server_start(ap->netconfig_dhcp)) { if (ap->netconfig_dhcp && !l_dhcp_server_start(ap->netconfig_dhcp)) {
l_error("DHCP server failed to start"); l_error("DHCP server failed to start");
goto failed; ap_start_failed(ap, -EINVAL);
return;
} }
ap->started = true; ap->started = true;
ap->ops->handle_event(AP_EVENT_STARTED, NULL, ap->user_data); ap->ops->handle_event(AP_EVENT_STARTED, NULL, ap->user_data);
return;
failed:
ap_start_failed(ap);
} }
static struct l_genl_msg *ap_build_cmd_start_ap(struct ap_state *ap) static struct l_genl_msg *ap_build_cmd_start_ap(struct ap_state *ap)
@ -2201,12 +2199,12 @@ static void ap_ifaddr4_added_cb(int error, uint16_t type, const void *data,
if (error) { if (error) {
l_error("Failed to set IP address"); l_error("Failed to set IP address");
ap_start_failed(ap); ap_start_failed(ap, error);
return; return;
} }
if (!ap_start_send(ap)) if (!ap_start_send(ap))
ap_start_failed(ap); ap_start_failed(ap, -EIO);
} }
static bool ap_parse_new_station_ies(const void *data, uint16_t len, static bool ap_parse_new_station_ies(const void *data, uint16_t len,
@ -2378,10 +2376,12 @@ static void ap_mlme_notify(struct l_genl_msg *msg, void *user_data)
switch (l_genl_msg_get_command(msg)) { switch (l_genl_msg_get_command(msg)) {
case NL80211_CMD_STOP_AP: case NL80211_CMD_STOP_AP:
if (ap->start_stop_cmd_id) { if (ap->start_stop_cmd_id) {
struct ap_event_start_failed_data data = { -ECANCELED };
l_genl_family_cancel(ap->nl80211, l_genl_family_cancel(ap->nl80211,
ap->start_stop_cmd_id); ap->start_stop_cmd_id);
ap->start_stop_cmd_id = 0; ap->start_stop_cmd_id = 0;
ap->ops->handle_event(AP_EVENT_START_FAILED, NULL, ap->ops->handle_event(AP_EVENT_START_FAILED, &data,
ap->user_data); ap->user_data);
} else if (ap->started) { } else if (ap->started) {
ap->started = false; ap->started = false;
@ -3164,13 +3164,17 @@ static void ap_if_event_func(enum ap_event_type type, const void *event_data,
switch (type) { switch (type) {
case AP_EVENT_START_FAILED: case AP_EVENT_START_FAILED:
{
const struct ap_event_start_failed_data *data = event_data;
if (L_WARN_ON(!ap_if->pending)) if (L_WARN_ON(!ap_if->pending))
break; break;
reply = dbus_error_failed(ap_if->pending); reply = dbus_error_from_errno(data->error, ap_if->pending);
dbus_pending_reply(&ap_if->pending, reply); dbus_pending_reply(&ap_if->pending, reply);
ap_if->ap = NULL; ap_if->ap = NULL;
break; break;
}
case AP_EVENT_STARTED: case AP_EVENT_STARTED:
if (L_WARN_ON(!ap_if->pending)) if (L_WARN_ON(!ap_if->pending))

4
src/ap.h
View File

@ -35,6 +35,10 @@ enum ap_event_type {
AP_EVENT_PBC_MODE_EXIT, AP_EVENT_PBC_MODE_EXIT,
}; };
struct ap_event_start_failed_data {
int error;
};
struct ap_event_station_added_data { struct ap_event_station_added_data {
const uint8_t *mac; const uint8_t *mac;
const uint8_t *assoc_ies; const uint8_t *assoc_ies;