X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=dummy%2Fnetifd-proto.sh;h=323322b37b7acfaaa0cda587bc2e0932e3eb2b68;hb=4c08f23dfe3ddeb4949d80d84cc20d8117a54898;hp=365c4338f7ccaf38cf3cbf568243a6b01f7cfcf3;hpb=3d49dba94c7a2ebaa8626acf81ca74a22c7784f7;p=project%2Fnetifd.git

diff --git a/dummy/netifd-proto.sh b/dummy/netifd-proto.sh
index 365c433..323322b 100755
--- a/dummy/netifd-proto.sh
+++ b/dummy/netifd-proto.sh
@@ -1,5 +1,13 @@
 . /usr/share/libubox/jshn.sh
 
+append() {
+	local var="$1"
+	local value="$2"
+	local sep="${3:- }"
+
+	eval "export -- \"$var=\${$var:+\${$var}\${value:+\$sep}}\$value\""
+}
+
 proto_config_add_generic() {
 	json_add_array ""
 	json_add_string "" "$1"
@@ -50,6 +58,7 @@ proto_init_update() {
 	PROTO_IP6ADDR=
 	PROTO_ROUTE=
 	PROTO_ROUTE6=
+	PROTO_PREFIX6=
 	PROTO_DNS=
 	PROTO_DNS_SEARCH=
 	json_init
@@ -92,13 +101,13 @@ proto_close_data() {
 proto_add_dns_server() {
 	local address="$1"
 
-	jshn_append PROTO_DNS "$address"
+	append PROTO_DNS "$address"
 }
 
 proto_add_dns_search() {
 	local address="$1"
 
-	jshn_append PROTO_DNS_SEARCH "$address"
+	append PROTO_DNS_SEARCH "$address"
 }
 
 proto_add_ipv4_address() {
@@ -107,14 +116,14 @@ proto_add_ipv4_address() {
 	local broadcast="$3"
 	local ptp="$4"
 
-	jshn_append PROTO_IPADDR "$address/$mask/$broadcast/$ptp"
+	append PROTO_IPADDR "$address/$mask/$broadcast/$ptp"
 }
 
 proto_add_ipv6_address() {
 	local address="$1"
 	local mask="$2"
 
-	jshn_append PROTO_IP6ADDR "$address/$mask"
+	append PROTO_IP6ADDR "$address/$mask"
 }
 
 proto_add_ipv4_route() {
@@ -122,7 +131,7 @@ proto_add_ipv4_route() {
 	local mask="$2"
 	local gw="$3"
 
-	jshn_append PROTO_ROUTE "$target/$mask/$gw"
+	append PROTO_ROUTE "$target/$mask/$gw"
 }
 
 proto_add_ipv6_route() {
@@ -130,7 +139,20 @@ proto_add_ipv6_route() {
 	local mask="$2"
 	local gw="$3"
 
-	jshn_append PROTO_ROUTE6 "$target/$mask/$gw"
+	append PROTO_ROUTE6 "$target/$mask/$gw"
+}
+
+proto_add_ipv6_prefix() {
+	local prefix="$1"
+	local valid="$2"
+	local preferred="$3"
+
+	if [ -z "$valid" ]; then
+		append PROTO_PREFIX6 "$prefix"
+	else
+		[ -z "$preferred" ] && preferred="$valid"
+		append PROTO_PREFIX6 "$prefix,$valid,$preferred"
+	fi
 }
 
 _proto_push_ipv4_addr() {
@@ -213,6 +235,7 @@ proto_send_update() {
 	_proto_push_array "ip6addr" "$PROTO_IP6ADDR" _proto_push_ipv6_addr
 	_proto_push_array "routes" "$PROTO_ROUTE" _proto_push_route
 	_proto_push_array "routes6" "$PROTO_ROUTE6" _proto_push_route
+	_proto_push_array "ip6prefix" "$PROTO_PREFIX6" _proto_push_string
 	_proto_push_array "dns" "$PROTO_DNS" _proto_push_string
 	_proto_push_array "dns_search" "$PROTO_DNS_SEARCH" _proto_push_string
 	_proto_notify "$interface"
@@ -222,7 +245,7 @@ proto_export() {
 	local var="VAR${_EXPORT_VAR}"
 	_EXPORT_VAR="$(($_EXPORT_VAR + 1))"
 	export -- "$var=$1"
-	jshn_append _EXPORT_VARS "$var"
+	append _EXPORT_VARS "$var"
 }
 
 proto_run_command() {
@@ -290,10 +313,14 @@ proto_add_host_dependency() {
 	local interface="$1"
 	local host="$2"
 
-	json_init
-	json_add_int action 6
-	json_add_string host "$host"
-	_proto_notify "$interface" -S
+	# execute in subshell to not taint callers env
+	# see tickets #11046, #11545, #11570
+	(
+		json_init
+		json_add_int action 6
+		json_add_string host "$host"
+		_proto_notify "$interface" -S
+	)
 }
 
 proto_setup_failed() {