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

manager: utilize IWD_MODULE

Browse Source 
Converts manager into an IWD module.
This commit is contained in:
James Prestwood 2019-10-11 12:29:27 -07:00 committed by Denis Kenzior
parent 87c42bccf1
commit 2d8d47c9dd
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/iwd.h
View File

@ -30,9 +30,6 @@ struct l_genl *iwd_get_genl(void);
void netdev_shutdown(void); void netdev_shutdown(void);
bool manager_init(struct l_genl_family *in);
void manager_exit(void);
const char *iwd_get_iface_whitelist(void); const char *iwd_get_iface_whitelist(void);
const char *iwd_get_iface_blacklist(void); const char *iwd_get_iface_blacklist(void);

3
src/main.c
View File

@ -164,8 +164,6 @@ static void nl80211_appeared(const struct l_genl_family_info *info,
plugin_init(plugins, noplugins); plugin_init(plugins, noplugins);
manager_init(nl80211);
if (!wiphy_init(nl80211, phys, nophys)) if (!wiphy_init(nl80211, phys, nophys))
l_error("Unable to init wiphy functionality"); l_error("Unable to init wiphy functionality");
} }
@ -500,7 +498,6 @@ int main(int argc, char *argv[])
eap_exit(); eap_exit();
if (nl80211) { if (nl80211) {
manager_exit();
wiphy_exit(); wiphy_exit();
l_genl_family_free(nl80211); l_genl_family_free(nl80211);
} }

25
src/manager.c
View File

@ -584,8 +584,9 @@ static void manager_config_notify(struct l_genl_msg *msg, void *user_data)
} }
} }
bool manager_init(struct l_genl_family *in) static int manager_init(void)
{ {
struct l_genl *genl = iwd_get_genl();
const struct l_settings *config = iwd_get_config(); const struct l_settings *config = iwd_get_config();
struct l_genl_msg *msg; struct l_genl_msg *msg;
unsigned int wiphy_dump; unsigned int wiphy_dump;
@ -594,7 +595,7 @@ bool manager_init(struct l_genl_family *in)
const char *if_whitelist = iwd_get_iface_whitelist(); const char *if_whitelist = iwd_get_iface_whitelist();
const char *if_blacklist = iwd_get_iface_blacklist(); const char *if_blacklist = iwd_get_iface_blacklist();
nl80211 = in; nl80211 = l_genl_family_new(genl, NL80211_GENL_NAME);
if (if_whitelist) if (if_whitelist)
whitelist_filter = l_strsplit(if_whitelist, ','); whitelist_filter = l_strsplit(if_whitelist, ',');
@ -607,7 +608,7 @@ bool manager_init(struct l_genl_family *in)
if (!l_genl_family_register(nl80211, "config", manager_config_notify, if (!l_genl_family_register(nl80211, "config", manager_config_notify,
NULL, NULL)) { NULL, NULL)) {
l_error("Registering for config notifications failed"); l_error("Registering for config notifications failed");
return false; goto error;
} }
msg = l_genl_msg_new_sized(NL80211_CMD_GET_WIPHY, 128); msg = l_genl_msg_new_sized(NL80211_CMD_GET_WIPHY, 128);
@ -618,7 +619,7 @@ bool manager_init(struct l_genl_family *in)
if (!wiphy_dump) { if (!wiphy_dump) {
l_error("Initial wiphy information dump failed"); l_error("Initial wiphy information dump failed");
l_genl_msg_unref(msg); l_genl_msg_unref(msg);
return false; goto error;
} }
msg = l_genl_msg_new(NL80211_CMD_GET_INTERFACE); msg = l_genl_msg_new(NL80211_CMD_GET_INTERFACE);
@ -630,7 +631,7 @@ bool manager_init(struct l_genl_family *in)
l_error("Initial interface information dump failed"); l_error("Initial interface information dump failed");
l_genl_msg_unref(msg); l_genl_msg_unref(msg);
l_genl_family_cancel(nl80211, wiphy_dump); l_genl_family_cancel(nl80211, wiphy_dump);
return false; goto error;
} }
randomize_str = randomize_str =
@ -638,10 +639,17 @@ bool manager_init(struct l_genl_family *in)
if (randomize_str && !strcmp(randomize_str, "once")) if (randomize_str && !strcmp(randomize_str, "once"))
randomize = true; randomize = true;
return true; return 0;
error:
l_queue_destroy(pending_wiphys, NULL);
l_genl_family_free(nl80211);
nl80211 = NULL;
return -EIO;
} }
void manager_exit(void) static void manager_exit(void)
{ {
l_strfreev(whitelist_filter); l_strfreev(whitelist_filter);
l_strfreev(blacklist_filter); l_strfreev(blacklist_filter);
@ -649,6 +657,9 @@ void manager_exit(void)
l_queue_destroy(pending_wiphys, wiphy_setup_state_free); l_queue_destroy(pending_wiphys, wiphy_setup_state_free);
pending_wiphys = NULL; pending_wiphys = NULL;
l_genl_family_free(nl80211);
nl80211 = NULL; nl80211 = NULL;
randomize = false; randomize = false;
} }
IWD_MODULE(manager, manager_init, manager_exit);