allow proto handlers to attach data items in notify

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

diff --git a/dummy/netifd-proto.sh b/dummy/netifd-proto.sh
index 85e8698..f1ddd1a 100755 (executable)
--- a/dummy/netifd-proto.sh
+++ b/dummy/netifd-proto.sh
@@ -28,12 +28,14 @@ add_default_handler() {
 
 _proto_do_teardown() {
        json_load "$data"
-       eval "$1_teardown \"$interface\" \"$ifname\""
+       eval "proto_$1_teardown \"$interface\" \"$ifname\""
 }
 
 _proto_do_setup() {
        json_load "$data"
-       eval "$1_setup \"$interface\" \"$ifname\""
+       _EXPORT_VAR=0
+       _EXPORT_VARS=
+       eval "proto_$1_setup \"$interface\" \"$ifname\""
 }
 
 proto_init_update() {
@@ -42,16 +44,58 @@ proto_init_update() {
        local external="$3"
 
        PROTO_INIT=1
+       PROTO_TUNNEL_OPEN=
        PROTO_IPADDR=
        PROTO_IP6ADDR=
        PROTO_ROUTE=
        PROTO_ROUTE6=
+       PROTO_DNS=
+       PROTO_DNS_SEARCH=
        json_init
-       json_add_string "ifname" "$ifname"
+       json_add_int action 0
+       [ -n "$ifname" -a "*" != "$ifname" ] && json_add_string "ifname" "$ifname"
        json_add_boolean "link-up" "$up"
        [ -n "$3" ] && json_add_boolean "address-external" "$external"
 }
 
+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_add_tunnel() {
+       proto_add_nested "tunnel"
+}
+
+proto_close_tunnel() {
+       proto_close_nested
+}
+
+proto_add_data() {
+       proto_add_nested "data"
+}
+
+proto_close_data() {
+       proto_close_nested
+}
+
+proto_add_dns_server() {
+       local address="$1"
+
+       jshn_append PROTO_DNS "$address"
+}
+
+proto_add_dns_search() {
+       local address="$1"
+
+       jshn_append PROTO_DNS_SEARCH "$address"
+}
+
 proto_add_ipv4_address() {
        local address="$1"
        local mask="$2"
@@ -93,11 +137,11 @@ _proto_push_route() {
        local mask="${str%%/*}"
        local gw="${str#*/}"
 
-       json_add_table ""
+       json_add_object ""
        json_add_string target "$target"
-       json_add_integer mask "$mask"
-       json_add_string gateway "$gw"
-       json_close_table
+       json_add_string netmask "$mask"
+       [ -n "$gw" ] && json_add_string gateway "$gw"
+       json_close_object
 }
 
 _proto_push_array() {
@@ -113,14 +157,90 @@ _proto_push_array() {
        json_close_array
 }
 
+_proto_notify() {
+       local interface="$1"
+       ubus 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
-       _proto_push_array "route" "$PROTO_ROUTE" _proto_push_route
-       _proto_push_array "route6" "$PROTO_ROUTE6" _proto_push_route
-       ubus call network.interface."$interface" notify_proto "$(json_dump)" &
+       _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_notify "$interface"
+}
+
+proto_export() {
+       local var="VAR${_EXPORT_VAR}"
+       _EXPORT_VAR="$(($_EXPORT_VAR + 1))"
+       export -- "$var=$1"
+       jshn_append _EXPORT_VARS "$var"
+}
+
+proto_run_command() {
+       local interface="$1"; shift
+
+       json_init
+       json_add_int action 1
+       json_add_array command
+       while [ $# -gt 0 ]; do
+               json_add_string "" "$1"
+               shift
+       done
+       json_close_array
+       [ -n "$_EXPORT_VARS" ] && {
+               json_add_array env
+               for var in $_EXPORT_VARS; do
+                       eval "json_add_string \"\" \"\${$var}\""
+               done
+               json_close_array
+       }
+       _proto_notify "$interface"
+}
+
+proto_kill_command() {
+       local interface="$1"; shift
+
+       json_init
+       json_add_int action 2
+       [ -n "$1" ] && json_add_int signal "$1"
+       _proto_notify "$interface"
+}
+
+proto_notify_error() {
+       local interface="$1"; shift
+
+       json_init
+       json_add_int action 3
+       json_add_array error
+       while [ $# -gt 0 ]; do
+               json_add_string "" "$1"
+               shift
+       done
+       json_close_array
+       _proto_notify "$interface"
+}
+
+proto_block_restart() {
+       local interface="$1"; shift
+
+       json_init
+       json_add_int action 4
+       _proto_notify "$interface"
+}
+
+proto_set_available() {
+       local interface="$1"
+       local state="$2"
+       json_init
+       json_add_int action 5
+       json_add_boolean available "$state"
+       _proto_notify "$interface"
 }
 
 init_proto() {
@@ -133,16 +253,15 @@ init_proto() {
                                no_device=0
                                available=0
 
-                               add_default_handler "$1_init_config"
+                               add_default_handler "proto_$1_init_config"
 
                                json_init
                                json_add_string "name" "$1"
-                               eval "$1_init"
-                               json_add_boolean no-device "$no_device"
-                               json_add_boolean available "$available"
                                json_add_array "config"
-                               eval "$1_init_config"
+                               eval "proto_$1_init_config"
                                json_close_array
+                               json_add_boolean no-device "$no_device"
+                               json_add_boolean available "$available"
                                json_dump
                        }
                ;;