From cb454de3e1ebe8213cae448cd50292f3d843bbd7 Mon Sep 17 00:00:00 2001 From: Hannu Nyman Date: Sat, 9 Jan 2021 19:02:30 +0200 Subject: [PATCH] luci-mod-status: realtime graph - find suffixed libiwinfo.so Change the libiwinfo filename handling to match the current version suffixed .so file. Copy solution from bc121a5a4 Fixes #4721 Signed-off-by: Hannu Nyman --- modules/luci-mod-status/src/luci-bwc.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/modules/luci-mod-status/src/luci-bwc.c b/modules/luci-mod-status/src/luci-bwc.c index 6f7016ec9d..b7682f9e21 100644 --- a/modules/luci-mod-status/src/luci-bwc.c +++ b/modules/luci-mod-status/src/luci-bwc.c @@ -253,7 +253,21 @@ static void umap_file(struct file_map *m) static void * iw_open(void) { - return dlopen("/usr/lib/libiwinfo.so", RTLD_LAZY); + void *iwlib = NULL; + glob_t paths; + int i; + + if (glob("/usr/lib/libiwinfo.so*", 0, NULL, &paths) != 0) + return NULL; + + for (i = 0; i < paths.gl_pathc && !iwlib; i++) + iwlib = dlopen(paths.gl_pathv[i], RTLD_LAZY | RTLD_LOCAL); + + globfree(&paths); + + if (!iwlib) + return NULL; + return iwlib; } static int iw_update( -- 2.30.2