92379080ea
This adds From:, Date: and Subject: to patches, allowing one to run 'git am' to import the patches to a hostapd git repository. From: and Date: fields were taken from the OpenWrt commit where the patches were first introduced. Most of the Subject: also followed suit, except for: - 300-noscan.patch: Took the description from the LuCI web interface - 350-nl80211_del_beacon_bss.patch: Used the file name The order of the files in the patch was changed to match what git format-patch does. Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
42 lines
1.3 KiB
Diff
42 lines
1.3 KiB
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
Date: Fri, 26 May 2023 10:23:59 +0200
|
|
Subject: [PATCH] Add ucode support, use ucode for the main ubus object #2
|
|
|
|
This implements vastly improved dynamic configuration reload support.
|
|
It can handle configuration changes on individual wifi interfaces, as well
|
|
as adding/removing interfaces.
|
|
|
|
--- a/hostapd/config_file.c
|
|
+++ b/hostapd/config_file.c
|
|
@@ -5065,7 +5065,12 @@ struct hostapd_config * hostapd_config_r
|
|
int errors = 0;
|
|
size_t i;
|
|
|
|
- f = fopen(fname, "r");
|
|
+ if (!strncmp(fname, "data:", 5)) {
|
|
+ f = fmemopen((void *)(fname + 5), strlen(fname + 5), "r");
|
|
+ fname = "<inline>";
|
|
+ } else {
|
|
+ f = fopen(fname, "r");
|
|
+ }
|
|
if (f == NULL) {
|
|
wpa_printf(MSG_ERROR, "Could not open configuration file '%s' "
|
|
"for reading.", fname);
|
|
--- a/wpa_supplicant/config_file.c
|
|
+++ b/wpa_supplicant/config_file.c
|
|
@@ -326,8 +326,13 @@ struct wpa_config * wpa_config_read(cons
|
|
while (cred_tail && cred_tail->next)
|
|
cred_tail = cred_tail->next;
|
|
|
|
+ if (!strncmp(name, "data:", 5)) {
|
|
+ f = fmemopen((void *)(name + 5), strlen(name + 5), "r");
|
|
+ name = "<inline>";
|
|
+ } else {
|
|
+ f = fopen(name, "r");
|
|
+ }
|
|
wpa_printf(MSG_DEBUG, "Reading configuration file '%s'", name);
|
|
- f = fopen(name, "r");
|
|
if (f == NULL) {
|
|
wpa_printf(MSG_ERROR, "Failed to open config file '%s', "
|
|
"error: %s", name, strerror(errno));
|