From: Lech Perczak <lech.perczak@gmail.com>
Date: Mon, 19 Jul 2021 17:15:53 +0000 (+0200)
Subject: umbim: inherit "peerdns" option from parent interface
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c84bf89b3a8f6c93ad30a906b514edcf0077bb51;p=openwrt%2Fstaging%2Frmilecki.git

umbim: inherit "peerdns" option from parent interface

MBIM protocol handler should intherit "peerdns" options from parent
interface on sub-interfaces, otherwise upstream DNS servers are applied
regardless of configuration.

Signed-off-by: Lech Perczak <lech.perczak@gmail.com>
---

diff --git a/package/network/utils/umbim/files/lib/netifd/proto/mbim.sh b/package/network/utils/umbim/files/lib/netifd/proto/mbim.sh
index 3867411818a..133c6ef5e6a 100755
--- a/package/network/utils/umbim/files/lib/netifd/proto/mbim.sh
+++ b/package/network/utils/umbim/files/lib/netifd/proto/mbim.sh
@@ -187,7 +187,7 @@ _proto_mbim_setup() {
 			json_close_array
 			json_add_string gateway "$ipv4gateway"
 			json_add_array dns
-			json_add_string "" "$ipv4dnsserver"
+			[ "$peerdns" = 0 ] || json_add_string "" "$ipv4dnsserver"
 			json_close_array
 			proto_add_dynamic_defaults
 			json_close_object
@@ -204,7 +204,7 @@ _proto_mbim_setup() {
 			json_close_array
 			json_add_string ip6gw "$ipv6gateway"
 			json_add_array dns
-			json_add_string "" "$ipv6dnsserver"
+			[ "$peerdns" = 0 ] || json_add_string "" "$ipv6dnsserver"
 			json_close_array
 			proto_add_dynamic_defaults
 			json_close_object