proto-shell: prefix protocol callback functions with proto_

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

diff --git a/dummy/netifd-proto.sh b/dummy/netifd-proto.sh
index 48b1292..b04bc89 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() {
@@ -48,6 +48,8 @@ proto_init_update() {
        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"
@@ -108,11 +110,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 netmask "$mask"
        json_add_string gateway "$gw"
-       json_close_table
+       json_close_object
 }
 
 _proto_push_array() {
@@ -138,8 +140,8 @@ proto_send_update() {
 
        _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
+       _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"
@@ -182,6 +184,37 @@ proto_kill_command() {
        _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() {
        proto="$1"; shift
        cmd="$1"; shift
@@ -192,16 +225,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
                        }
                ;;