aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services/dropbear
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-03-29 17:05:35 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-03-29 17:05:35 +0000
commit31c24e7253ae989e3e134db4194c0e9fdf2da965 (patch)
tree2c43817554cd176de779467df4bd83d8722a808b /package/network/services/dropbear
parent49be87f44ec229ba03f57d0f777e6ecfe6e79d88 (diff)
downloadmaster-187ad058-31c24e7253ae989e3e134db4194c0e9fdf2da965.tar.gz
master-187ad058-31c24e7253ae989e3e134db4194c0e9fdf2da965.tar.bz2
master-187ad058-31c24e7253ae989e3e134db4194c0e9fdf2da965.zip
dropbear: add options SSHKeepAlive and IdleTimeout.
Without timeout mechanism, if ssh client disconnected without sending FIN or RST, forked dropbear servers would hang there for KEX_RETRY_TIMEOUT seconds (8 hours). TCP keepalive is not implemented in dropbear yet, thus the name SSHKeepAlive. 300 seconds in this patch is selected from the default value of ServerAliveInterval for Debian ssh client (See man ssh_config). Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40299 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network/services/dropbear')
-rwxr-xr-xpackage/network/services/dropbear/files/dropbear.init6
1 files changed, 5 insertions, 1 deletions
diff --git a/package/network/services/dropbear/files/dropbear.init b/package/network/services/dropbear/files/dropbear.init
index 93dc3d9694..19aab3653b 100755
--- a/package/network/services/dropbear/files/dropbear.init
+++ b/package/network/services/dropbear/files/dropbear.init
@@ -44,7 +44,9 @@ validate_section_dropbear()
'rsakeyfile:file' \
'dsskeyfile:file' \
'BannerFile:file' \
- 'Port:list(port):22'
+ 'Port:list(port):22' \
+ 'SSHKeepAlive:uinteger:300' \
+ 'IdleTimeout:uinteger:0'
return $?
}
@@ -74,6 +76,8 @@ dropbear_instance()
[ -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
}