dynamic-vlan: add support for multiple wan ports

the code did not handle devices that have more than one uplink
device.

Fixes: WIFI-9954
Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
John Crispin
2022-07-11 12:41:18 +02:00
parent d9a8e771ae
commit c06923a022
2 changed files with 7 additions and 3 deletions

View File

@@ -4,10 +4,10 @@ PKG_NAME:=dynamic-vlan
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE_URL=https://github.com/blogic/dynamic-vlan.git PKG_SOURCE_URL=https://github.com/blogic/dynamic-vlan.git
PKG_MIRROR_HASH:=448890cdf182bd1b47edffca242e607594d0d17f6f5017a6fd021aab79f3c351 PKG_MIRROR_HASH:=2129d5e4b397afad76825a042dab6fb57c63e57c686d354f3d0d77a5754ab760
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_DATE:=2021-06-04 PKG_SOURCE_DATE:=2021-06-04
PKG_SOURCE_VERSION:=55d78d3e7215b601084980d922349bcfdcf9cf20 PKG_SOURCE_VERSION:=7202189d1b710c52f8ddc3c7040821708c3f438b
PKG_MAINTAINER:=John Crispin <john@phrozen.org> PKG_MAINTAINER:=John Crispin <john@phrozen.org>
PKG_LICENSE:=BSD-3-Clause PKG_LICENSE:=BSD-3-Clause

View File

@@ -7,8 +7,12 @@ PROG=/usr/sbin/dynamic-vlan
start_service() { start_service() {
wan=$(cat /etc/board.json | jsonfilter -e '@.network.wan.device') wan=$(cat /etc/board.json | jsonfilter -e '@.network.wan.device')
[ -z "$wan" ] && eval $(jsonfilter -i /etc/board.json -e 'wan=@.network.wan.ports.*')
procd_open_instance procd_open_instance
procd_set_param command "$PROG" $wan procd_set_param command "$PROG"
for w in $wan; do
procd_append_param command $w
done
procd_set_param respawn procd_set_param respawn
procd_close_instance procd_close_instance
} }