maple/istoreos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hostapd: fix logging of configuration content

Browse Source 
This commit is an adoption of the fix for #14049 to
apply it for openwrt-24.10.

Signed-off-by: Christian Korber <ck@dev.tdt.de>
Link: https://github.com/openwrt/openwrt/pull/17718
Link: https://github.com/openwrt/openwrt/pull/19660
Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
Christian Korber 2025-05-21 14:36:00 +02:00 committed by Robert Marko
parent b2116dbce4
commit 33728aa96c
1 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
package/network/services/hostapd/patches/701-reload_config_inline.patch
View File

@ -8,7 +8,7 @@ as adding/removing interfaces.
--- a/hostapd/config_file.c
+++ b/hostapd/config_file.c
@@ -5207,7 +5207,12 @@ struct hostapd_config * hostapd_config_r
@@ -5207,7 +5207,14 @@ struct hostapd_config * hostapd_config_r
int errors = 0;
size_t i;
@ -19,6 +19,8 @@ as adding/removing interfaces.
+ } else {
+ f = fopen(fname, "r");
+ }
+ wpa_printf(MSG_INFO, "Configuration file: Reading configuration file '%s'",
+ fname);
if (f == NULL) {
wpa_printf(MSG_ERROR, "Could not open configuration file '%s' "
"for reading.", fname);
@ -39,3 +41,35 @@ as adding/removing interfaces.
if (f == NULL) {
wpa_printf(MSG_ERROR, "Failed to open config file '%s', "
"error: %s", name, strerror(errno));
--- a/hostapd/main.c
+++ b/hostapd/main.c
@@ -406,7 +406,11 @@ hostapd_interface_init(struct hapd_inter
struct hostapd_iface *iface;
int k;
- wpa_printf(MSG_DEBUG, "Configuration file: %s", config_fname);
+ if (!strncmp(config_fname, "data:", 5)) {
+ wpa_printf(MSG_DEBUG, "Configuration file: %s", "<inline>");
+ } else {
+ wpa_printf(MSG_DEBUG, "Configuration file: %s", config_fname);
+ }
iface = hostapd_init(interfaces, config_fname);
if (!iface)
return NULL;
--- a/src/ap/hostapd.c
+++ b/src/ap/hostapd.c
@@ -2893,7 +2893,12 @@ hostapd_interface_init_bss(struct hapd_i
}
}
- wpa_printf(MSG_INFO, "Configuration file: %s (phy %s)%s",
- config_fname, phy, iface ? "" : " --> new PHY");
+ if (!strncmp(config_fname, "data:", 5)) {
+ wpa_printf(MSG_INFO, "Configuration file: %s (phy %s)%s",
+ "<inline>", phy, iface ? "" : " --> new PHY");
+ } else {
+ wpa_printf(MSG_INFO, "Configuration file: %s (phy %s)%s",
+ config_fname, phy, iface ? "" : " --> new PHY");
+ }
if (iface) {
struct hostapd_config *conf;