X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=proto%2Fnetifd-proto.sh;h=376428141612e34a7e9438eca6d9dc66aa77de84;hp=f850216c3af5fcd1c15459ed56e586739d13fe28;hb=0e54c1a6088b7df98da521e4b60ac8b7e6429662;hpb=23cfcee20f43d824d61fadef48af84a83d5b8816 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 } ;;