X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=dummy%2Fnetifd-proto.sh;h=b04bc89a4d26d227349594aff8a5fb382863d4a5;hp=0f703a2abf749eced6cbff4784f44bf72373a0ec;hb=a12081aa986c4cc878bf0480a5d0ffb986aed0c5;hpb=52c36d741c05db2350ad1d240f6bd5d72237d8fd

diff --git a/dummy/netifd-proto.sh b/dummy/netifd-proto.sh
index 0f703a2..b04bc89 100755
--- 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() {
@@ -46,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"
@@ -106,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() {
@@ -136,13 +140,20 @@ 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"
 }
 
+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
 
@@ -153,6 +164,14 @@ proto_run_command() {
 		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"
 }
 
@@ -165,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
@@ -175,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
 			}
 		;;