From 64bb88841fbc2d9a9dfee12775a18e5dc89ac16e Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 14 Nov 2018 12:49:45 +0100 Subject: 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 Signed-off-by: Koen Vandeputte --- package/network/utils/comgt/files/ncm.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'package/network/utils/comgt') diff --git a/package/network/utils/comgt/files/ncm.sh b/package/network/utils/comgt/files/ncm.sh index 60b39655ec..9aaaa25f37 100644 --- a/package/network/utils/comgt/files/ncm.sh +++ b/package/network/utils/comgt/files/ncm.sh @@ -146,12 +146,18 @@ proto_ncm_setup() { proto_close_data proto_send_update "$interface" + local zone="$(fw3 -q network "$interface" 2>/dev/null)" + [ "$pdptype" = "IP" -o "$pdptype" = "IPV4V6" ] && { json_init json_add_string name "${interface}_4" json_add_string ifname "@$interface" json_add_string proto "dhcp" proto_add_dynamic_defaults + [ -n "$zone" ] && { + json_add_string zone "$zone" + } + json_close_object ubus call network add_dynamic "$(json_dump)" } @@ -162,6 +168,10 @@ proto_ncm_setup() { json_add_string proto "dhcpv6" json_add_string extendprefix 1 proto_add_dynamic_defaults + [ -n "$zone" ] && { + json_add_string zone "$zone" + } + json_close_object ubus call network add_dynamic "$(json_dump)" } -- cgit v1.2.3