netifd-proto.sh: execute proto_add_host_dependency() actions in subshell to retain...

[project/netifd.git] / dummy / netifd-proto.sh

diff --git a/dummy/netifd-proto.sh b/dummy/netifd-proto.sh
index 7482a83..297e904 100755 (executable)
--- a/dummy/netifd-proto.sh
+++ b/dummy/netifd-proto.sh
@@ -43,6 +43,7 @@ proto_init_update() {
        local up="$2"
        local external="$3"
 
+       PROTO_KEEP=0
        PROTO_INIT=1
        PROTO_TUNNEL_OPEN=
        PROTO_IPADDR=
@@ -58,17 +59,34 @@ proto_init_update() {
        [ -n "$3" ] && json_add_boolean "address-external" "$external"
 }
 
-proto_add_tunnel() {
-       proto_close_tunnel
+proto_set_keep() {
+       PROTO_KEEP="$1"
+}
+
+proto_close_nested() {
+       [ -n "$PROTO_NESTED_OPEN" ] && json_close_object
+       PROTO_NESTED_OPEN=
+}
+
+proto_add_nested() {
+       PROTO_NESTED_OPEN=1
+       json_add_object "$1"
+}
 
-       PROTO_TUNNEL_OPEN=1
-       json_add_object "tunnel"
+proto_add_tunnel() {
+       proto_add_nested "tunnel"
 }
 
 proto_close_tunnel() {
-       [ -n "$PROTO_TUNNEL_OPEN" ] || return
-       json_close_object
-       PROTO_TUNNEL_OPEN=
+       proto_close_nested
+}
+
+proto_add_data() {
+       proto_add_nested "data"
+}
+
+proto_close_data() {
+       proto_close_nested
 }
 
 proto_add_dns_server() {
@@ -86,8 +104,10 @@ proto_add_dns_search() {
 proto_add_ipv4_address() {
        local address="$1"
        local mask="$2"
+       local broadcast="$3"
+       local ptp="$4"
 
-       jshn_append PROTO_IPADDR "$address/$mask"
+       jshn_append PROTO_IPADDR "$address/$mask/$broadcast/$ptp"
 }
 
 proto_add_ipv6_address() {
@@ -113,7 +133,41 @@ proto_add_ipv6_route() {
        jshn_append PROTO_ROUTE6 "$target/$mask/$gw"
 }
 
-_proto_push_ip() {
+_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_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"
 }
 
@@ -146,19 +200,21 @@ _proto_push_array() {
 
 _proto_notify() {
        local interface="$1"
-       ubus call network.interface."$interface" notify_proto "$(json_dump)"
+       local options="$2"
+       ubus $options call network.interface."$interface" notify_proto "$(json_dump)"
 }
 
 proto_send_update() {
        local interface="$1"
 
-       proto_close_tunnel
-       _proto_push_array "ipaddr" "$PROTO_IPADDR" _proto_push_ip
-       _proto_push_array "ip6addr" "$PROTO_IP6ADDR" _proto_push_ip
+       proto_close_nested
+       json_add_boolean keep "$PROTO_KEEP"
+       _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"
 }
 
@@ -230,6 +286,27 @@ proto_set_available() {
        _proto_notify "$interface"
 }
 
+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 7
+       _proto_notify "$interface"
+}
+
 init_proto() {
        proto="$1"; shift
        cmd="$1"; shift