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 c27d562..f1ddd1a 100755 (executable)
--- a/dummy/netifd-proto.sh
+++ b/dummy/netifd-proto.sh
@@ -28,14 +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"
        _EXPORT_VAR=0
        _EXPORT_VARS=
-       eval "$1_setup \"$interface\" \"$ifname\""
+       eval "proto_$1_setup \"$interface\" \"$ifname\""
 }
 
 proto_init_update() {
@@ -44,10 +44,13 @@ 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_int action 0
        [ -n "$ifname" -a "*" != "$ifname" ] && json_add_string "ifname" "$ifname"
@@ -55,6 +58,32 @@ proto_init_update() {
        [ -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"
 
@@ -111,7 +140,7 @@ _proto_push_route() {
        json_add_object ""
        json_add_string target "$target"
        json_add_string netmask "$mask"
-       json_add_string gateway "$gw"
+       [ -n "$gw" ] && json_add_string gateway "$gw"
        json_close_object
 }
 
@@ -136,6 +165,7 @@ _proto_notify() {
 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 "routes" "$PROTO_ROUTE" _proto_push_route
@@ -204,6 +234,15 @@ proto_block_restart() {
        _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() {
        proto="$1"; shift
        cmd="$1"; shift
@@ -214,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
                        }
                ;;