X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=dummy%2Fnetifd-proto.sh;h=dba6cc4831671c88e243b6f2c16e3df25ac1dc72;hp=74265818218847a20dba28fbb8fd10f466ad150b;hb=91c0d4d5a67e95dc21cdb0fe7229ccb73d6975a7;hpb=264a79bad6862c39f90c521f5321be9ba2ea5f24

diff --git a/dummy/netifd-proto.sh b/dummy/netifd-proto.sh
index 7426581..dba6cc4 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"
@@ -92,27 +100,29 @@ 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() {
 	local address="$1"
 	local mask="$2"
+	local broadcast="$3"
+	local ptp="$4"
 
-	jshn_append PROTO_IPADDR "$address/$mask"
+	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() {
@@ -120,7 +130,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() {
@@ -128,10 +138,44 @@ proto_add_ipv6_route() {
 	local mask="$2"
 	local gw="$3"
 
-	jshn_append PROTO_ROUTE6 "$target/$mask/$gw"
+	append PROTO_ROUTE6 "$target/$mask/$gw"
+}
+
+_proto_push_ipv4_addr() {
+	local str="$1"
+	local address mask broadcast ptp
+
+	address="${str%%/*}"
+	str="${str#*/}"
+	mask="${str%%/*}"
+	str="${str#*/}"
+	broadcast="${str%%/*}"
+	str="${str#*/}"
+	ptp="$str"
+
+	json_add_object ""
+	json_add_string ipaddr "$address"
+	[ -n "$mask" ] && json_add_string mask "$mask"
+	[ -n "$broadcast" ] && json_add_string broadcast "$broadcast"
+	[ -n "$ptp" ] && json_add_string ptp "$ptp"
+	json_close_object
 }
 
-_proto_push_ip() {
+_proto_push_ipv6_addr() {
+	local str="$1"
+	local address mask
+
+	address="${str%%/*}"
+	str="${str#*/}"
+	mask="$str"
+
+	json_add_object ""
+	json_add_string ipaddr "$address"
+	[ -n "$mask" ] && json_add_string mask "$mask"
+	json_close_object
+}
+
+_proto_push_string() {
 	json_add_string "" "$1"
 }
 
@@ -173,12 +217,12 @@ proto_send_update() {
 
 	proto_close_nested
 	json_add_boolean keep "$PROTO_KEEP"
-	_proto_push_array "ipaddr" "$PROTO_IPADDR" _proto_push_ip
-	_proto_push_array "ip6addr" "$PROTO_IP6ADDR" _proto_push_ip
+	_proto_push_array "ipaddr" "$PROTO_IPADDR" _proto_push_ipv4_addr
+	_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 "dns" "$PROTO_DNS" _proto_push_ip
-	_proto_push_array "dns_search" "$PROTO_DNS_SEARCH" _proto_push_ip
+	_proto_push_array "dns" "$PROTO_DNS" _proto_push_string
+	_proto_push_array "dns_search" "$PROTO_DNS_SEARCH" _proto_push_string
 	_proto_notify "$interface"
 }
 
@@ -186,7 +230,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() {
@@ -254,10 +298,21 @@ proto_add_host_dependency() {
 	local interface="$1"
 	local host="$2"
 
+	# 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() {
+	local interface="$1"
 	json_init
-	json_add_int action 6
-	json_add_string host "$host"
-	_proto_notify "$interface" -S
+	json_add_int action 7
+	_proto_notify "$interface"
 }
 
 init_proto() {