From 0e54c1a6088b7df98da521e4b60ac8b7e6429662 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 10 Sep 2011 14:40:25 +0200
Subject: proto-shell: parse shell handler metadata

---
 proto/netifd-proto.sh | 17 ++++++++++++-----
 proto/ppp.sh          |  8 ++++++++
 2 files changed, 20 insertions(+), 5 deletions(-)

(limited to 'proto')

diff --git a/proto/netifd-proto.sh b/proto/netifd-proto.sh
index f850216..3764281 100755
--- a/proto/netifd-proto.sh
+++ b/proto/netifd-proto.sh
@@ -1,15 +1,22 @@
 . /usr/share/libubox/jshn.sh
 
+proto_config_add_generic() {
+	json_add_array ""
+	json_add_string "" "$1"
+	json_add_int "" "$2"
+	json_close_array
+}
+
 proto_config_add_int() {
-	json_add_int "$1" 5
+	proto_config_add_generic "$1" 5
 }
 
 proto_config_add_string() {
-	json_add_int "$1" 3
+	proto_config_add_generic "$1" 3
 }
 
 proto_config_add_boolean() {
-	json_add_int "$1" 7
+	proto_config_add_generic "$1" 7
 }
 
 add_default_handler() {
@@ -30,9 +37,9 @@ case "$1" in
 			json_add_string "name" "$1"
 			eval "$1_init"
 			json_add_boolean immediate "$immediate"
-			json_add_object "config"
+			json_add_array "config"
 			eval "$1_init_config"
-			json_close_object
+			json_close_array
 			json_dump
 		}
 	;;
diff --git a/proto/ppp.sh b/proto/ppp.sh
index 76df2f3..8dd97c0 100755
--- a/proto/ppp.sh
+++ b/proto/ppp.sh
@@ -8,6 +8,14 @@ ppp_init_config() {
 	proto_config_add_int "keepalive"
 }
 
+ppp_setup() {
+	return
+}
+
+ppp_teardown() {
+	return
+}
+
 ppp_init() {
 	return
 }
-- 
cgit v1.2.3