dropbear: add option to set receive window size

[openwrt/staging/lynxis.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 5c3345d40c3dda9eca2ed690c911741b3623b35c..2225113498a509403300e556a5da690e0b3959fb 100755 (executable)
--- a/package/network/services/dropbear/files/dropbear.init
+++ b/package/network/services/dropbear/files/dropbear.init
@@ -41,7 +41,9 @@ validate_section_dropbear()
                'Port:list(port):22' \
                'SSHKeepAlive:uinteger:300' \
                'IdleTimeout:uinteger:0' \
-               'mdns:uinteger:1'
+               'MaxAuthTries:uinteger:3' \
+               'RecvWindowSize:uinteger:0' \
+               'mdns:bool:1'
 }
 
 dropbear_instance()
@@ -49,7 +51,7 @@ dropbear_instance()
        local PasswordAuth enable Interface GatewayPorts \
                RootPasswordAuth RootLogin rsakeyfile \
                BannerFile Port SSHKeepAlive IdleTimeout \
-               mdns ipaddrs
+               MaxAuthTries RecvWindowSize mdns ipaddrs
 
        validate_section_dropbear "${1}" || {
                echo "validation failed"
@@ -78,6 +80,9 @@ dropbear_instance()
        append_ports "${ipaddrs}" "${Port}"
        [ "${IdleTimeout}" -ne 0 ] && procd_append_param command -I "${IdleTimeout}"
        [ "${SSHKeepAlive}" -ne 0 ] && procd_append_param command -K "${SSHKeepAlive}"
+       [ "${MaxAuthTries}" -ne 0 ] && procd_append_param command -T "${MaxAuthTries}"
+       [ "${RecvWindowSize}" -gt 0 -a "${RecvWindowSize}" -le 1048576 ] && \
+               procd_append_param command -W "${RecvWindowSize}"
        [ "${mdns}" -ne 0 ] && procd_add_mdns "ssh" "tcp" "$Port" "daemon=dropbear"
        procd_set_param respawn
        procd_close_instance
@@ -109,7 +114,9 @@ keygen()
 load_interfaces()
 {
        config_get interface "$1" Interface
-       interfaces=" ${interface} ${interfaces}"
+       config_get enable "$1" enable 1
+
+       [ "${enable}" = "1" ] && interfaces=" ${interface} ${interfaces}"
 }
 
 start_service()
@@ -127,18 +134,16 @@ service_triggers()
 {
        local interfaces
 
-       procd_open_trigger
        procd_add_config_trigger "config.change" "dropbear" /etc/init.d/dropbear reload
 
        config_load "${NAME}"
        config_foreach load_interfaces dropbear
 
-       [ -n "${interfaces}" ] & {
+       [ -n "${interfaces}" ] && {
                for n in $interfaces ; do
                        procd_add_interface_trigger "interface.*" $n /etc/init.d/dropbear reload
                done
        }
-       procd_close_trigger
 
        procd_add_validation validate_section_dropbear
 }