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

wired: Add support for utilizing STATE_DIRECTORY environment

Browse Source
This commit is contained in:
Marcel Holtmann 2019-09-08 19:54:00 +02:00
parent 49c4f46efc
commit 8e3acef914
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
wired/network.c
View File

@ -42,6 +42,7 @@ struct network {
static struct l_queue *network_list; static struct l_queue *network_list;
static struct l_dir_watch *storage_watch; static struct l_dir_watch *storage_watch;
static char *storage_path;
static char *network_name_from_filename(const char *filename) static char *network_name_from_filename(const char *filename)
{ {
@ -125,7 +126,7 @@ struct l_settings *network_lookup_security(const char *network)
struct l_settings *conf; struct l_settings *conf;
char *path; char *path;
path = l_strdup_printf("%s/%s%s", WIRED_STORAGEDIR, network, path = l_strdup_printf("%s/%s%s", storage_path, network,
STORAGEFILE_SUFFIX); STORAGEFILE_SUFFIX);
l_debug("Loading %s", path); l_debug("Loading %s", path);
@ -174,11 +175,27 @@ bool network_init(void)
{ {
DIR *dir; DIR *dir;
struct dirent *dirent; struct dirent *dirent;
const char *state_dir;
char **state_dirs;
dir = opendir(WIRED_STORAGEDIR); state_dir = getenv("STATE_DIRECTORY");
if (!state_dir)
state_dir = WIRED_STORAGEDIR;
l_debug("Using state directory %s", state_dir);
state_dirs = l_strsplit(state_dir, ':');
if (!state_dirs[0]) {
l_strv_free(state_dirs);
return false;
}
storage_path = l_strdup(state_dirs[0]);
l_strv_free(state_dirs);
dir = opendir(storage_path);
if (!dir) { if (!dir) {
l_info("Unable to open %s: %s", WIRED_STORAGEDIR, l_info("Unable to open %s: %s", storage_path, strerror(errno));
strerror(errno));
return false; return false;
} }
@ -203,7 +220,7 @@ bool network_init(void)
closedir(dir); closedir(dir);
storage_watch = l_dir_watch_new(WIRED_STORAGEDIR, storage_watch = l_dir_watch_new(storage_path,
network_storage_watch_cb, NULL, network_storage_watch_cb, NULL,
network_storage_watch_destroy); network_storage_watch_destroy);
@ -216,4 +233,6 @@ void network_exit(void)
l_queue_destroy(network_list, network_free); l_queue_destroy(network_list, network_free);
network_list = NULL; network_list = NULL;
l_free(storage_path);
} }