dropbear: make missing variables local

[openwrt/staging/dedeckeh.git] / package / network / services / dropbear / files / dropbear.init

diff --git a/package/network/services/dropbear/files/dropbear.init b/package/network/services/dropbear/files/dropbear.init
index c909d2896543bd745ac929209e2111157a5e67e9..5206426ec30075e98c23ab7d159ecce9587b8b71 100755 (executable)
--- a/package/network/services/dropbear/files/dropbear.init
+++ b/package/network/services/dropbear/files/dropbear.init
@@ -5,86 +5,80 @@
 START=50
 STOP=50
 
-SERVICE_USE_PID=1
-
-NAME=dropbear
+USE_PROCD=1
 PROG=/usr/sbin/dropbear
+NAME=dropbear
 PIDCOUNT=0
 EXTRA_COMMANDS="killclients"
 EXTRA_HELP="   killclients Kill ${NAME} processes except servers and yourself"
 
-dropbear_start()
+append_ports()
 {
-       append_ports()
-       {
-               local ifname="$1"
-               local port="$2"
-
-               grep -qs "^ *$ifname:" /proc/net/dev || {
-                       append args "-p $port"
-                       return
-               }
+       local ifname="$1"
+       local port="$2"
 
-               for addr in $(
-                       ifconfig "$ifname" | sed -ne '
-                               /addr: *fe[89ab][0-9a-f]:/d
-                               s/.* addr: *\([0-9a-f:\.]*\).*/\1/p
-                       '
-               ); do
-                       append args "-p $addr:$port"
-               done
+       grep -qs "^ *$ifname:" /proc/net/dev || {
+               procd_append_param command -p "$port"
+               return
        }
 
+       for addr in $(
+               ifconfig "$ifname" | sed -ne '
+                       /addr: *fe[89ab][0-9a-f]:/d
+                       s/.* addr: *\([0-9a-f:\.]*\).*/\1/p
+               '
+       ); do
+               procd_append_param command -p "$addr:$port"
+       done
+}
 
-       local section="$1"
+validate_section_dropbear()
+{
+       uci_validate_section dropbear dropbear "${1}" \
+               'PasswordAuth:bool:1' \
+               'enable:bool:1' \
+               'Interface:string' \
+               'GatewayPorts:bool:0' \
+               'RootPasswordAuth:bool:1' \
+               'RootLogin:bool:1' \
+               'rsakeyfile:file' \
+               'dsskeyfile:file' \
+               'BannerFile:file' \
+               'Port:list(port):22' \
+               'SSHKeepAlive:uinteger:300' \
+               'IdleTimeout:uinteger:0'
+       return $?
+}
 
-       # check if section is enabled (default)
-       local enabled
-       config_get_bool enabled "${section}" enable 1
-       [ "${enabled}" -eq 0 ] && return 1
+dropbear_instance()
+{
+       local PasswordAuth enable Interface GatewayPorts \
+               RootPasswordAuth RootLogin rsakeyfile \
+               dsskeyfile BannerFile Port SSHKeepAlive IdleTimeout
 
-       # verbose parameter
-       local verbosed
-       config_get_bool verbosed "${section}" verbose 0
+       validate_section_dropbear "${1}" || {
+               echo "validation failed"
+               return 1
+       }
 
-       # increase pid file count to handle multiple instances correctly
+       [ "${enable}" = "0" ] && return 1
        PIDCOUNT="$(( ${PIDCOUNT} + 1))"
-
-       # prepare parameters (initialise with pid file)
        local pid_file="/var/run/${NAME}.${PIDCOUNT}.pid"
-       local args="-P $pid_file"
-       local val
-       # A) password authentication
-       config_get_bool val "${section}" PasswordAuth 1
-       [ "${val}" -eq 0 ] && append args "-s"
-       # B) listen interface and port
-       local port
-       local interface
-       config_get interface "${section}" Interface
-       config_get interface "${interface}" ifname "$interface"
-       config_get port "${section}" Port 22
-       append_ports "$interface" "$port"
-       # C) banner file
-       config_get val "${section}" BannerFile
-       [ -f "${val}" ] && append args "-b ${val}"
-       # D) gatewayports
-       config_get_bool val "${section}" GatewayPorts 0
-       [ "${val}" -eq 1 ] && append args "-a"
-       # E) root password authentication
-       config_get_bool val "${section}" RootPasswordAuth 1
-       [ "${val}" -eq 0 ] && append args "-g"
-       # F) root login
-       config_get_bool val "${section}" RootLogin 1
-       [ "${val}" -eq 0 ] && append args "-w"
-       # G) host keys
-       config_get val "${section}" rsakeyfile
-       [ -f "${val}" ] && append args "-r ${val}"
-       config_get val "${section}" dsskeyfile
-       [ -f "${val}" ] && append args "-d ${val}"
-
-       # execute program and return its exit code
-       [ "${verbosed}" -ne 0 ] && echo "${initscript}: section ${section} starting ${PROG} ${args}"
-       SERVICE_PID_FILE="$pid_file" service_start ${PROG} ${args}
+
+       procd_open_instance
+       procd_set_param command "$PROG" -F -P "$pid_file"
+       [ "${PasswordAuth}" -eq 0 ] && procd_append_param command -s
+       [ "${GatewayPorts}" -eq 1 ] && procd_append_param command -a
+       [ "${RootPasswordAuth}" -eq 0 ] && procd_append_param command -g
+       [ "${RootLogin}" -eq 0 ] && procd_append_param command -w
+       [ -n "${rsakeyfile}" ] && procd_append_param command -r "${rsakeyfile}"
+       [ -n "${dsskeyfile}" ] && procd_append_param command -d "${dsskeyfile}"
+       [ -n "${BannerFile}" ] && procd_append_param command -b "${BannerFile}"
+       [ -n "${Interface}" ] && network_get_device Interface "${Interface}"
+       append_ports "${Interface}" "${Port}"
+       [ "${IdleTimeout}" -ne 0 ] && procd_append_param command -I "${IdleTimeout}"
+       [ "${SSHKeepAlive}" -ne 0 ] && procd_append_param command -K "${SSHKeepAlive}"
+       procd_close_instance
 }
 
 keygen()
@@ -110,30 +104,22 @@ keygen()
        chmod 0700 /etc/dropbear
 }
 
-start()
+start_service()
 {
        [ -s /etc/dropbear/dropbear_rsa_host_key -a \
          -s /etc/dropbear/dropbear_dss_host_key ] || keygen
 
-       include /lib/network
-       scan_interfaces
+       . /lib/functions.sh
+       . /lib/functions/network.sh
+
        config_load "${NAME}"
-       config_foreach dropbear_start dropbear
+       config_foreach dropbear_instance dropbear
 }
 
-stop()
+service_triggers()
 {
-       local pid_file pid_files
-       
-       pid_files=`ls /var/run/${NAME}.*.pid 2>/dev/null`
-       
-       [ -z "$pid_files" ] && return 1
-       
-       for pid_file in $pid_files; do
-               SERVICE_PID_FILE="$pid_file" service_stop ${PROG} && {
-                       rm -f ${pid_file}
-               }
-       done
+       procd_add_reload_trigger "dropbear"
+       procd_add_validation validate_section_dropbear
 }
 
 killclients()