netifd: stop using jshn_append

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

diff --git a/dummy/netifd-proto.sh b/dummy/netifd-proto.sh
index f1ddd1a..dba6cc4 100755 (executable)
--- 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"
@@ -43,6 +51,7 @@ proto_init_update() {
        local up="$2"
        local external="$3"
 
+       PROTO_KEEP=0
        PROTO_INIT=1
        PROTO_TUNNEL_OPEN=
        PROTO_IPADDR=
@@ -58,6 +67,10 @@ proto_init_update() {
        [ -n "$3" ] && json_add_boolean "address-external" "$external"
 }
 
+proto_set_keep() {
+       PROTO_KEEP="$1"
+}
+
 proto_close_nested() {
        [ -n "$PROTO_NESTED_OPEN" ] && json_close_object
        PROTO_NESTED_OPEN=
@@ -87,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() {
@@ -115,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() {
@@ -123,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_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_ip() {
+_proto_push_string() {
        json_add_string "" "$1"
 }
 
@@ -159,19 +208,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_nested
-       _proto_push_array "ipaddr" "$PROTO_IPADDR" _proto_push_ip
-       _proto_push_array "ip6addr" "$PROTO_IP6ADDR" _proto_push_ip
+       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"
 }
 
@@ -179,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() {
@@ -243,6 +294,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