Mercurial > dropbear
diff svr-runopts.c @ 641:2b1bb792cd4d dropbear-tfm
- Update tfm changes to current default tip
author | Matt Johnston <matt@ucc.asn.au> |
---|---|
date | Mon, 21 Nov 2011 19:52:28 +0800 |
parents | e27d7fb23376 |
children | 675bbd630f5d |
line wrap: on
line diff
--- a/svr-runopts.c Mon Nov 21 19:19:57 2011 +0800 +++ b/svr-runopts.c Mon Nov 21 19:52:28 2011 +0800 @@ -43,11 +43,11 @@ " before user login\n" " (default: none)\n" #ifdef DROPBEAR_DSS - "-d dsskeyfile Use dsskeyfile for the dss host key\n" + "-d dsskeyfile Use dsskeyfile for the DSS host key\n" " (default: %s)\n" #endif #ifdef DROPBEAR_RSA - "-r rsakeyfile Use rsakeyfile for the rsa host key\n" + "-r rsakeyfile Use rsakeyfile for the RSA host key\n" " (default: %s)\n" #endif "-F Don't fork into background\n" @@ -81,8 +81,8 @@ "-i Start for inetd\n" #endif "-W <receive_window_buffer> (default %d, larger may be faster, max 1MB)\n" - "-K <keepalive> (0 is never, default %d)\n" - "-I <idle_timeout> (0 is never, default %d)\n" + "-K <keepalive> (0 is never, default %d, in seconds)\n" + "-I <idle_timeout> (0 is never, default %d, in seconds)\n" #ifdef DEBUG_TRACE "-v verbose (compiled with DEBUG_TRACE)\n" #endif @@ -125,6 +125,9 @@ #ifdef ENABLE_SVR_REMOTETCPFWD svr_opts.noremotetcp = 0; #endif +#ifndef DISABLE_ZLIB + opts.enable_compress = 1; +#endif /* not yet opts.ipv4 = 1; opts.ipv6 = 1; @@ -296,15 +299,19 @@ } if (keepalive_arg) { - if (m_str_to_uint(keepalive_arg, &opts.keepalive_secs) == DROPBEAR_FAILURE) { + unsigned int val; + if (m_str_to_uint(keepalive_arg, &val) == DROPBEAR_FAILURE) { dropbear_exit("Bad keepalive '%s'", keepalive_arg); } + opts.keepalive_secs = val; } if (idle_timeout_arg) { - if (m_str_to_uint(idle_timeout_arg, &opts.idle_timeout_secs) == DROPBEAR_FAILURE) { + unsigned int val; + if (m_str_to_uint(idle_timeout_arg, &val) == DROPBEAR_FAILURE) { dropbear_exit("Bad idle_timeout '%s'", idle_timeout_arg); } + opts.idle_timeout_secs = val; } }