diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2018-11-14 12:49:45 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-03-05 13:19:43 +0100 |
| commit | 64bb88841fbc2d9a9dfee12775a18e5dc89ac16e (patch) | |
| tree | 96c2dacf0a79e6b0fc189a301b5549be4c2c2c90 /package/network/utils/uqmi/files | |
| parent | d3506d1bc160e4ce2833dff357f2a4b219772c77 (diff) | |
| download | upstream-64bb88841fbc2d9a9dfee12775a18e5dc89ac16e.tar.gz upstream-64bb88841fbc2d9a9dfee12775a18e5dc89ac16e.tar.bz2 upstream-64bb88841fbc2d9a9dfee12775a18e5dc89ac16e.zip | |
uqmi: inherit firewall zone membership to virtual sub interfaces
Fix an issue where subinterfaces were not added to the same
firewall zone as their parent.
Fixes: FS#2122
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'package/network/utils/uqmi/files')
| -rwxr-xr-x | package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh b/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh index 1da98db5ac..f4b30b87eb 100755 --- a/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh +++ b/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh @@ -298,6 +298,9 @@ proto_qmi_setup() { } proto_close_data proto_send_update "$interface" + + local zone="$(fw3 -q network "$interface" 2>/dev/null)" + [ -n "$pdh_6" ] && { if [ -z "$dhcpv6" -o "$dhcpv6" = 0 ]; then json_load "$(uqmi -s -d $device --set-client-id wds,$cid_6 --get-current-settings)" @@ -318,6 +321,11 @@ proto_qmi_setup() { proto_add_dns_server "$dns1_6" proto_add_dns_server "$dns2_6" } + [ -n "$zone" ] && { + proto_add_data + json_add_string zone "$zone" + proto_close_data + } proto_send_update "$interface" else json_init @@ -328,6 +336,7 @@ proto_qmi_setup() { proto_add_dynamic_defaults # RFC 7278: Extend an IPv6 /64 Prefix to LAN json_add_string extendprefix 1 + [ -n "$zone" ] && json_add_string zone "$zone" json_close_object ubus call network add_dynamic "$(json_dump)" fi @@ -340,6 +349,7 @@ proto_qmi_setup() { json_add_string proto "dhcp" [ -n "$ip4table" ] && json_add_string ip4table "$ip4table" proto_add_dynamic_defaults + [ -n "$zone" ] && json_add_string zone "$zone" json_close_object ubus call network add_dynamic "$(json_dump)" } |