Nanako/openwrt-app-actions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

luci-app-ap-modem: fix wan interface on pppoe

Browse Source
This commit is contained in:
jjm2473
2023-04-05 16:59:25 +08:00
parent fccaaca61e
commit cf6f44b154
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/luci-app-ap-modem/Makefile
View File

@@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_VERSION:=1.0.1-20230403
PKG_VERSION:=1.0.2-20230405
PKG_RELEASE:=
PKG_MAINTAINER:=jjm2473 <jjm2473@gmail.com>

15
applications/luci-app-ap-modem/root/etc/init.d/ap_modem
View File

@@ -36,6 +36,11 @@ generate_config() {
echo "network.lan.device != br-lan in uci" >&2
return 1
}
local wan_dev="`uci -q get network.wan.device`"
[[ -z "$wan_dev" ]] && {
echo "get network.wan.device in uci failed" >&2
return 1
}
local lan_dev=`find_uci_section network device name 'br-lan' | head -1`
[[ -z "$lan_dev" ]] && {
echo "network.device.name=br-lan not found in uci" >&2
@@ -85,16 +90,20 @@ EOF
uci -q batch <<-EOF >/dev/null
set network.vap_wan=interface
set network.vap_wan.proto=static
set network.vap_wan.device=@wan
set network.vap_wan.device=$wan_dev
set network.vap_wan.defaultroute=0
set network.vap_wan.delegate=0
EOF
fi
# firewall
uci -q get "firewall.$wan_zone.network" | grep -Fwq 'vap_lan' || uci -q batch <<-EOF >/dev/null
local fw_wan_net="`uci -q get firewall.$wan_zone.network`"
echo "$fw_wan_net" | grep -Fwq 'vap_lan' || uci -q batch <<-EOF >/dev/null
add_list firewall.$wan_zone.network=vap_lan
commit firewall
EOF
echo "$fw_wan_net" | grep -Fwq 'vap_wan' || uci -q batch <<-EOF >/dev/null
add_list firewall.$wan_zone.network=vap_wan
EOF
uci commit firewall
# ip
local bip