Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2025-01-03 10:32:33 +01:00
Code Releases Activity

ap: add error out param to ap_start

Browse Source 
This allows the caller to extract a bit more information about what
exactly went wrong.
This commit is contained in:
James Prestwood 2020-10-26 11:05:41 -07:00 committed by Denis Kenzior
parent 3e69c33f74
commit b7e2a98628
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/ap.c
View File

@ -2033,12 +2033,17 @@ static void ap_mlme_notify(struct l_genl_msg *msg, void *user_data)
* to by its members (which also can't be static). * to by its members (which also can't be static).
*/ */
struct ap_state *ap_start(struct netdev *netdev, struct ap_config *config, struct ap_state *ap_start(struct netdev *netdev, struct ap_config *config,
const struct ap_ops *ops, void *user_data) const struct ap_ops *ops, int *err_out,
void *user_data)
{ {
struct ap_state *ap; struct ap_state *ap;
struct wiphy *wiphy = netdev_get_wiphy(netdev); struct wiphy *wiphy = netdev_get_wiphy(netdev);
struct l_genl_msg *cmd; struct l_genl_msg *cmd;
uint64_t wdev_id = netdev_get_wdev_id(netdev); uint64_t wdev_id = netdev_get_wdev_id(netdev);
int err = -EINVAL;
if (err_out)
*err_out = err;
if (L_WARN_ON(!config->ssid)) if (L_WARN_ON(!config->ssid))
return NULL; return NULL;
@ -2146,9 +2151,15 @@ struct ap_state *ap_start(struct netdev *netdev, struct ap_config *config,
goto error; goto error;
} }
if (err_out)
*err_out = 0;
return ap; return ap;
error: error:
if (err_out)
*err_out = err;
ap_reset(ap); ap_reset(ap);
l_genl_family_free(ap->nl80211); l_genl_family_free(ap->nl80211);
l_free(ap); l_free(ap);
@ -2382,6 +2393,7 @@ static struct l_dbus_message *ap_dbus_start(struct l_dbus *dbus,
struct ap_if_data *ap_if = user_data; struct ap_if_data *ap_if = user_data;
const char *ssid, *wpa2_passphrase; const char *ssid, *wpa2_passphrase;
struct ap_config *config; struct ap_config *config;
int err;
if (ap_if->ap && ap_if->ap->started) if (ap_if->ap && ap_if->ap->started)
return dbus_error_already_exists(message); return dbus_error_already_exists(message);
@ -2398,10 +2410,10 @@ static struct l_dbus_message *ap_dbus_start(struct l_dbus *dbus,
l_strlcpy(config->passphrase, wpa2_passphrase, l_strlcpy(config->passphrase, wpa2_passphrase,
sizeof(config->passphrase)); sizeof(config->passphrase));
ap_if->ap = ap_start(ap_if->netdev, config, &ap_dbus_ops, ap_if); ap_if->ap = ap_start(ap_if->netdev, config, &ap_dbus_ops, &err, ap_if);
if (!ap_if->ap) { if (!ap_if->ap) {
ap_config_free(config); ap_config_free(config);
return dbus_error_invalid_args(message); return dbus_error_from_errno(err, message);
} }
ap_if->pending = l_dbus_message_ref(message); ap_if->pending = l_dbus_message_ref(message);

3
src/ap.h
View File

@ -74,7 +74,8 @@ struct ap_ops {
void ap_config_free(struct ap_config *config); void ap_config_free(struct ap_config *config);
struct ap_state *ap_start(struct netdev *netdev, struct ap_config *config, struct ap_state *ap_start(struct netdev *netdev, struct ap_config *config,
const struct ap_ops *ops, void *user_data); const struct ap_ops *ops, int *err,
void *user_data);
void ap_shutdown(struct ap_state *ap, ap_stopped_func_t stopped_func, void ap_shutdown(struct ap_state *ap, ap_stopped_func_t stopped_func,
void *user_data); void *user_data);
void ap_free(struct ap_state *ap); void ap_free(struct ap_state *ap);

2
src/p2p.c
View File

@ -754,7 +754,7 @@ static void p2p_group_start(struct p2p_device *dev)
dev->capability.group_caps |= P2P_GROUP_CAP_GO; dev->capability.group_caps |= P2P_GROUP_CAP_GO;
dev->capability.group_caps |= P2P_GROUP_CAP_GROUP_FORMATION; dev->capability.group_caps |= P2P_GROUP_CAP_GROUP_FORMATION;
dev->group = ap_start(dev->conn_netdev, config, &p2p_go_ops, dev); dev->group = ap_start(dev->conn_netdev, config, &p2p_go_ops, NULL, dev);
if (!dev->group) { if (!dev->group) {
ap_config_free(config); ap_config_free(config);
p2p_connect_failed(dev); p2p_connect_failed(dev);