procd: rename procd_add_network_trigger

[openwrt/openwrt.git] / package / system / procd / files / procd.sh

diff --git a/package/system/procd/files/procd.sh b/package/system/procd/files/procd.sh
index b65bf293d6b24f64ebf2b803fbe5aaac401ba8bd..67924a27491e062dc75375c9fdc52b2007e86dc3 100644 (file)
--- a/package/system/procd/files/procd.sh
+++ b/package/system/procd/files/procd.sh
@@ -17,6 +17,7 @@
 #     data: arbitrary name/value pairs for detecting config changes (table)
 #     file: configuration files (array)
 #     netdev: bound network device (detects ifindex changes)
+#     limits: resource limits (passed to the process)
 #
 #   No space separation is done for arrays/tables - use one function argument per command line argument
 #
@@ -49,6 +50,7 @@ _procd_wrapper() {
 _procd_ubus_call() {
        local cmd="$1"
 
+       [ -n "$PROCD_DEBUG" ] && json_dump >&2
        ubus call service "$cmd" "$(json_dump)"
        json_cleanup
 }
@@ -68,9 +70,7 @@ _procd_open_service() {
 
 _procd_close_service() {
        json_close_object
-       _procd_open_trigger
        service_triggers
-       _procd_close_trigger
        _procd_ubus_call set
 }
 
@@ -117,31 +117,41 @@ _procd_open_trigger() {
        json_add_array "triggers"
 }
 
+_procd_open_validate() {
+       json_add_array "validate"
+}
+
 _procd_set_param() {
        local type="$1"; shift
 
        case "$type" in
-               env|data)
+               env|data|limits)
                        _procd_add_table "$type" "$@"
                ;;
-               command|netdev|file|respawn)
+               command|netdev|file|respawn|watch)
                        _procd_add_array "$type" "$@"
                ;;
+               error)
+                       json_add_array "$type"
+                       json_add_string "" "$@"
+                       json_close_array
+               ;;
                nice)
                        json_add_int "$type" "$1"
                ;;
        esac
 }
 
-_procd_add_config_trigger() {
+_procd_add_interface_trigger() {
        json_add_array
-       _procd_add_array_data "config.change"
+       _procd_add_array_data "$1"
+       shift
 
        json_add_array
        _procd_add_array_data "if"
 
        json_add_array
-       _procd_add_array_data "eq" "package" "$1"
+       _procd_add_array_data "eq" "interface" "$1"
        shift
        json_close_array
 
@@ -154,31 +164,74 @@ _procd_add_config_trigger() {
        json_close_array
 }
 
-_procd_add_reload_trigger() {
+_procd_add_reload_interface_trigger() {
        local script=$(readlink "$initscript")
        local name=$(basename ${script:-$initscript})
 
-       _procd_add_config_trigger $1 /etc/init.d/$name reload
+       _procd_open_trigger
+       _procd_add_interface_trigger "interface.*" $1 /etc/init.d/$name reload
+       _procd_close_trigger
+}
+
+_procd_add_config_trigger() {
+       json_add_array
+       _procd_add_array_data "$1"
+       shift
+
+       json_add_array
+       _procd_add_array_data "if"
+
+       json_add_array
+       _procd_add_array_data "eq" "package" "$1"
+       shift
+       json_close_array
+
+       json_add_array
+       _procd_add_array_data "run_script" "$@"
+       json_close_array
+
+       json_close_array
+
+       json_close_array
 }
 
 _procd_add_reload_trigger() {
        local script=$(readlink "$initscript")
        local name=$(basename ${script:-$initscript})
+       local file
 
-       _procd_add_config_trigger $1 /etc/init.d/$name reload
+       _procd_open_trigger
+       for file in "$@"; do
+               _procd_add_config_trigger "config.change" "$file" /etc/init.d/$name reload
+       done
+       _procd_close_trigger
+}
+
+_procd_add_validation() {
+       _procd_open_validate
+       $@
+       _procd_close_validate
 }
 
 _procd_append_param() {
        local type="$1"; shift
+       local _json_no_warning=1
 
        json_select "$type"
+       [ $? = 0 ] || {
+               _procd_set_param "$type" "$@"
+               return
+       }
        case "$type" in
-               env|data)
+               env|data|limits)
                        _procd_add_table_data "$@"
                ;;
-               command|netdev|file|respawn)
+               command|netdev|file|respawn|watch)
                        _procd_add_array_data "$@"
                ;;
+               error)
+                       json_add_string "" "$@"
+               ;;
        esac
        json_select ..
 }
@@ -191,9 +244,13 @@ _procd_close_trigger() {
        json_close_array
 }
 
+_procd_close_validate() {
+       json_close_array
+}
+
 _procd_add_instance() {
        _procd_open_instance
-       _procd_set_command "$@"
+       _procd_set_param command "$@"
        _procd_close_instance
 }
 
@@ -207,16 +264,36 @@ _procd_kill() {
        _procd_ubus_call delete
 }
 
+uci_validate_section()
+{
+       local _package="$1"
+       local _type="$2"
+       local _name="$3"
+       local _error
+       shift; shift; shift
+       local _result=`/sbin/validate_data "$_package" "$_type" "$_name" "$@" 2> /dev/null`
+       _error=$?
+       eval "$_result"
+       [ "$_error" = "0" ] || `/sbin/validate_data "$_package" "$_type" "$_name" "$@" 1> /dev/null`
+       return $_error
+}
+
 _procd_wrapper \
        procd_open_service \
        procd_close_service \
        procd_add_instance \
        procd_add_config_trigger \
+       procd_add_interface_trigger \
        procd_add_reload_trigger \
+       procd_add_reload_interface_trigger \
+       procd_add_interface_reload \
        procd_open_trigger \
        procd_close_trigger \
        procd_open_instance \
        procd_close_instance \
+       procd_open_validate \
+       procd_close_validate \
        procd_set_param \
        procd_append_param \
+       procd_add_validation \
        procd_kill