mirror/iopsys-feed
1
0
Fork 0
mirror of https://dev.iopsys.eu/feed/iopsys.git synced 2025-12-10 07:44:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

obuspa: Fix disconnection after set

Browse source
This commit is contained in:
Vivek Kumar Dutta 2024-09-25 11:39:51 +05:30
parent 598b5c8e4a
commit e39d51a37b
4 changed files with 31 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
obuspa/Makefile
View file

@ -5,7 +5,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=obuspa
PKG_VERSION:=9.0.0.2
PKG_VERSION:=9.0.0.3
LOCAL_DEV:=0
ifneq ($(LOCAL_DEV),1)
@ -114,7 +114,6 @@ define Package/obuspa/install
$(INSTALL_DIR) $(1)/etc/users/roles
$(INSTALL_DIR) $(1)/etc/uci-defaults
$(INSTALL_DIR) $(1)/etc/udhcpc.user.d
$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
$(INSTALL_BIN) $(PKG_BUILD_DIR)/obuspa $(1)/usr/sbin/
$(INSTALL_BIN) ./files/etc/init.d/obuspa $(1)/etc/init.d/
$(INSTALL_DATA) ./files/etc/config/obuspa $(1)/etc/config/
@ -125,8 +124,9 @@ define Package/obuspa/install
$(INSTALL_BIN) ./files/etc/uci-defaults/01-fix-upgrade-uci $(1)/etc/uci-defaults/
$(INSTALL_BIN) ./files/etc/uci-defaults/60-generate-ctrust-defaults $(1)/etc/uci-defaults/
$(INSTALL_BIN) ./files/etc/uci-defaults/obuspa-set-dhcp-option $(1)/etc/uci-defaults/
$(INSTALL_BIN) ./files/etc/uci-defaults/92-obuspa_firewall $(1)/etc/uci-defaults/
$(INSTALL_BIN) ./files/etc/firewall.usp $(1)/etc/
$(INSTALL_BIN) ./files/etc/udhcpc.user.d/udhcpc_obuspa_opt125.user $(1)/etc/udhcpc.user.d/udhcpc_obuspa_opt125.user
$(INSTALL_BIN) ./files/obuspa.hotplug $(1)/etc/hotplug.d/iface/21-obuspa
$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/libuspagentdm.so $(1) $(PKG_NAME)
ifeq ($(CONFIG_OBUSPA_ENABLE_TEST_CONTROLLER),y)
$(INSTALL_BIN) ./files/etc/uci-defaults/54-test-usp-remote $(1)/etc/uci-defaults/

16
obuspa/files/etc/firewall.usp Normal file
View file

@ -0,0 +1,16 @@
#!/bin/sh
log() {
echo "$*"|logger -t obuspa.firewall -p debug
}
config_load obuspa
config_get_bool enable_obuspa global enabled 1
if [ "$enable_obuspa" = "0" ]; then
return 0;
fi
sleep 1
log "ForceReconnect MQTT clients, due firewall reload"
obuspa -c operate "Device.MQTT.Client.*.ForceReconnect()"

12
obuspa/files/etc/uci-defaults/92-obuspa_firewall Normal file
View file

@ -0,0 +1,12 @@
#!/bin/sh
uci -q batch <<-EOT
delete firewall.usp
set firewall.usp=include
set firewall.usp.path=/etc/firewall.usp
set firewall.usp.reload=1
commit firewall
EOT
exit 0

44
obuspa/files/obuspa.hotplug
View file

@ -1,44 +0,0 @@
#!/bin/sh
log() {
echo "$*"|logger -t obuspa.hotplug -p debug
}
get_access_role() {
local mode lan_proto
lan_proto="$(uci -q get network.lan.proto)"
if [ "${lan_proto}" == "dhcp" ]; then
mode="extender"
else
mode="full_access"
fi
echo "$mode"
}
config_load obuspa
config_get_bool enable_obuspa global enabled 1
config_get intf global interface
if [ "$enable_obuspa" = "0" ]; then
return 0;
fi
if [ -z "${intf}" ]; then
role="$(get_access_role)"
if [ "${role}" = "extender" ]; then
intf="lan"
else
intf="wan"
fi
fi
[ "$ACTION" = "ifup" -a "${intf}" = "${INTERFACE}" ] && {
sleep 1
log "Sending WakeUp event, due to [${ACTION}] on ${intf}"
obuspa -c event Device.LocalAgent.WakeUp!
}