mirror/openwrt
1
0
Fork 1
mirror of https://git.openwrt.org/openwrt/openwrt.git synced 2025-12-10 08:44:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

hostapd: fix logging of configuration content
Some checks failed
Build all core packages / Build all core packages for selected target (push) Has been cancelled
Details

Browse source 
This commit is an adoption of the fix for #14049 to
apply it for owrt-23.05.

Signed-off-by: Christian Korber <ck@dev.tdt.de>
Link: https://github.com/openwrt/openwrt/pull/17718
Link: https://github.com/openwrt/openwrt/pull/19658
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 242bca458f
commit 29f3f276a8
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

@ -1,6 +1,6 @@
--- a/hostapd/config_file.c --- a/hostapd/config_file.c
+++ b/hostapd/config_file.c +++ b/hostapd/config_file.c
@@ -4816,7 +4816,12 @@ struct hostapd_config * hostapd_config_r @@ -4816,7 +4816,14 @@ struct hostapd_config * hostapd_config_r
int errors = 0; int errors = 0;
size_t i; size_t i;
@ -11,6 +11,8 @@
+ } else { + } else {
+ f = fopen(fname, "r"); + f = fopen(fname, "r");
+ } + }
+ wpa_printf(MSG_INFO, "Configuration file: Reading configuration file '%s'",
+ fname);
if (f == NULL) { if (f == NULL) {
wpa_printf(MSG_ERROR, "Could not open configuration file '%s' " wpa_printf(MSG_ERROR, "Could not open configuration file '%s' "
"for reading.", fname); "for reading.", fname);
@ -31,3 +33,35 @@
if (f == NULL) { if (f == NULL) {
wpa_printf(MSG_ERROR, "Failed to open config file '%s', " wpa_printf(MSG_ERROR, "Failed to open config file '%s', "
"error: %s", name, strerror(errno)); "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;