Merge pull request #552 from Telecominfraproject/main

Merging captive portal fixes and strict-forwarding rename
ucentral-schema: update to latest HEAD
2025-11-03 20:07:59 +00:00 · 2023-06-27 10:15:21 -04:00 · 2023-06-26 16:24:08 +02:00 · 2023-06-26 16:20:14 +02:00 · 2023-06-26 16:20:14 +02:00
3 changed files with 4 additions and 3 deletions
--- a/feeds/ucentral/spotfilter/files/spotfilter.init
+++ b/feeds/ucentral/spotfilter/files/spotfilter.init
@@ -13,6 +13,7 @@ add_interface() {
 	config_get_bool enabled "$cfg" "configure_spotfilter" 0
 	[ $enabled -eq 0 ] || /usr/bin/captive generate "$cfg" > /tmp/spotfilter-$cfg.json
 	ubus call spotfilter interface_add "$(cat /tmp/spotfilter-$cfg.json)"
+	sleep 5
 }

 reload_service() {
--- a/feeds/ucentral/ucentral-event/files/ucentral-event
+++ b/feeds/ucentral/ucentral-event/files/ucentral-event
@@ -178,7 +178,7 @@ function hostapd_add(path, obj) {

 	printf('%.J\n', hostapd[ifname]);

-	if (+hostapd[ifname].config.strict_isolation)
+	if (+hostapd[ifname].config.strict_forwarding)
 		ubus.call('bridger', 'set_device_config', {
 			name: ifname,
 			redirect: wan_ports[0]
--- a/feeds/ucentral/ucentral-schema/Makefile
+++ b/feeds/ucentral/ucentral-schema/Makefile
@@ -4,10 +4,10 @@ PKG_NAME:=ucentral-schema
 PKG_RELEASE:=1

 PKG_SOURCE_URL=https://github.com/Telecominfraproject/wlan-ucentral-schema.git
-PKG_MIRROR_HASH:=1078a039b63532d107def0fd635e31486a6e19690eb23e080c14e879e1e58332
+PKG_MIRROR_HASH:=f8acc28081f960c09839566689a7e31b87ff5fd0b79df80f759ea4e10e8ce2a6
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_DATE:=2022-05-29
-PKG_SOURCE_VERSION:=9637b4aa8776e9457f0376471e4591be3d5f2478
+PKG_SOURCE_VERSION:=11fffcf6c8dcbc32a85fa990b7c0d12dd35b0b76

 PKG_MAINTAINER:=John Crispin <john@phrozen.org>
 PKG_LICENSE:=BSD-3-Clause
Author	SHA1	Message	Date
jaspreetsachdev	83db79ea69	Merge pull request #552 from Telecominfraproject/main Merging captive portal fixes and strict-forwarding rename	2023-06-27 10:15:21 -04:00
John Crispin	cd461e555e	ucentral-schema: update to latest HEAD 9797d7e allow using a shared service->captive for multiple instances ad7eb8e rename strict-isolation -> strict-forwarding 43c44c1 force spotfilter off prior to config apply 11fffcf captive: fix credentials configuration Signed-off-by: John Crispin <john@phrozen.org>	2023-06-26 16:24:08 +02:00
John Crispin	9195806206	ucentral-event: rename strict-isolation -> strict-forwarding Signed-off-by: John Crispin <john@phrozen.org>	2023-06-26 16:20:14 +02:00
John Crispin	9621c21535	spotfilter: add a delay after setting up a captive portal Signed-off-by: John Crispin <john@phrozen.org>	2023-06-26 16:20:14 +02:00