diff --git a/CHANGES b/CHANGES
index 91494b4671718647459a624208846992c095bc06..16810ee4f467cf6c0829922e5bf6be4cf55bbd0a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -16,7 +16,7 @@
to end up at host3 via the other two, using SSH TCP forwarding. It's a bit
like onion-routing. All connections are established from the local machine.
The comma-separated syntax can also be used for scp/rsync, eg
- scp -S dbclient matt@martello,root@wrt,canyons:/tmp/dump .
+ rsync -a -e dbclient m@gateway,m2@host,martello:/home/matt/ ~/backup/
to bounce through a few hosts.
- Allow restrictions on authorized_keys logins such as restricting commands
diff --git a/cli-runopts.c b/cli-runopts.c
index e7b1ed915640b73f58c9573b62cbb441c9de507d..9c10fc363651ed299a0513dcd7aad8eaa2570bc6 100644
--- a/cli-runopts.c
+++ b/cli-runopts.c
@@ -75,6 +75,7 @@ static void printhelp() {
#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"
#ifdef ENABLE_CLI_NETCAT
"-B <endhost:endport> Netcat-alike forwarding\n"
#endif
@@ -85,7 +86,7 @@ static void printhelp() {
"-v verbose (compiled with DEBUG_TRACE)\n"
#endif
,DROPBEAR_VERSION, cli_opts.progname,
- DEFAULT_RECV_WINDOW, DEFAULT_KEEPALIVE);
+ DEFAULT_RECV_WINDOW, DEFAULT_KEEPALIVE, DEFAULT_IDLE_TIMEOUT);
}
@@ -110,6 +111,7 @@ void cli_getopts(int argc, char ** argv) {
char* recv_window_arg = NULL;
char* keepalive_arg = NULL;
+ char* idle_timeout_arg = NULL;
/* see printhelp() for options */
cli_opts.progname = argv[0];
@@ -261,6 +263,9 @@ void cli_getopts(int argc, char ** argv) {
case 'K':
next = &keepalive_arg;
break;
+ case 'I':
+ next = &idle_timeout_arg;
+ break;
#ifdef DEBUG_TRACE
case 'v':
debug_trace = 1;
@@ -369,6 +374,12 @@ void cli_getopts(int argc, char ** argv) {
}
}
+ if (idle_timeout_arg) {
+ if (m_str_to_uint(idle_timeout_arg, &opts.idle_timeout_secs) == DROPBEAR_FAILURE) {
+ dropbear_exit("Bad idle_timeout '%s'", idle_timeout_arg);
+ }
+ }
+
#ifdef ENABLE_CLI_NETCAT
if (cli_opts.cmd && cli_opts.netcat_host) {
dropbear_log(LOG_INFO, "Ignoring command '%s' in netcat mode", cli_opts.cmd);
diff --git a/common-channel.c b/common-channel.c
index 93a76d17b730030c492eb01158e908e1743434c0..95fce78454b1c19ed489d6bf36475c497fc393f8 100644
--- a/common-channel.c
+++ b/common-channel.c
@@ -691,7 +691,7 @@ void common_recv_msg_channel_data(struct Channel *channel, int fd,
dropbear_exit("received data after eof");
}
- if (fd < 0) {
+ if (fd < 0) {
/* If we have encountered failed write, the far side might still
* be sending data without having yet received our close notification.
* We just drop the data. */
diff --git a/common-session.c b/common-session.c
index b5f4aae958b8ab0535b768b8461f5238ca7f01e9..b48d2108aa09d0521941810c00f9b24750c634b1 100644
--- a/common-session.c
+++ b/common-session.c
@@ -63,6 +63,7 @@ void common_session_init(int sock_in, int sock_out, char* remotehost) {
ses.maxfd = MAX(sock_in, sock_out);
ses.connect_time = 0;
+ ses.last_trx_packet_time = 0;
ses.last_packet_time = 0;
if (pipe(ses.signal_pipe) < 0) {
@@ -258,7 +259,7 @@ void session_identification() {
ses.remoteclosed();
}
- /* If they send more than 50 lines, something is wrong */
+ /* If they send more than 50 lines, something is wrong */
for (i = 0; i < 50; i++) {
len = ident_readln(ses.sock_in, linebuf, sizeof(linebuf));
@@ -283,11 +284,11 @@ void session_identification() {
memcpy(ses.remoteident, linebuf, len);
}
- /* Shall assume that 2.x will be backwards compatible. */
- if (strncmp(ses.remoteident, "SSH-2.", 6) != 0
- && strncmp(ses.remoteident, "SSH-1.99-", 9) != 0) {
- dropbear_exit("Incompatible remote version '%s'", ses.remoteident);
- }
+ /* Shall assume that 2.x will be backwards compatible. */
+ if (strncmp(ses.remoteident, "SSH-2.", 6) != 0
+ && strncmp(ses.remoteident, "SSH-1.99-", 9) != 0) {
+ dropbear_exit("Incompatible remote version '%s'", ses.remoteident);
+ }
TRACE(("remoteident: %s", ses.remoteident))
@@ -399,9 +400,14 @@ static void checktimeouts() {
}
if (opts.keepalive_secs > 0
- && now - ses.last_packet_time >= opts.keepalive_secs) {
+ && now - ses.last_trx_packet_time >= opts.keepalive_secs) {
send_msg_ignore();
}
+
+ if (opts.idle_timeout_secs > 0 && ses.last_packet_time > 0
+ && now - ses.last_packet_time >= opts.idle_timeout_secs) {
+ dropbear_close("Idle timeout");
+ }
}
static long select_timeout() {
@@ -414,6 +420,8 @@ static long select_timeout() {
ret = MIN(AUTH_TIMEOUT, ret);
if (opts.keepalive_secs > 0)
ret = MIN(opts.keepalive_secs, ret);
+ if (opts.idle_timeout_secs > 0)
+ ret = MIN(opts.idle_timeout_secs, ret);
return ret;
}
diff --git a/options.h b/options.h
index 642b997813e0026daef4d67ca7ee11dbacce6f80..12be4bbd307b1536c84d7f76568376e809392767 100644
--- a/options.h
+++ b/options.h
@@ -149,9 +149,9 @@ etc) slower (perhaps by 50%). Recommended for most small systems. */
* but there's an interface via a PAM module - don't bother using it otherwise.
* You can't enable both PASSWORD and PAM. */
-#define ENABLE_SVR_PASSWORD_AUTH
+/*#define ENABLE_SVR_PASSWORD_AUTH*/
/* PAM requires ./configure --enable-pam */
-/*#define ENABLE_SVR_PAM_AUTH*/
+#define ENABLE_SVR_PAM_AUTH
#define ENABLE_SVR_PUBKEY_AUTH
/* Wether to ake public key options in authorized_keys file into account */
@@ -258,6 +258,10 @@ etc) slower (perhaps by 50%). Recommended for most small systems. */
be overridden at runtime with -K. 0 disables keepalives */
#define DEFAULT_KEEPALIVE 0
+/* Ensure that data is received within IDLE_TIMEOUT seconds. This can
+be overridden at runtime with -I. 0 disables idle timeouts */
+#define DEFAULT_IDLE_TIMEOUT 0
+
/* The default path. This will often get replaced by the shell */
#define DEFAULT_PATH "/usr/bin:/bin"
diff --git a/packet.c b/packet.c
index e00be653236691b82eaa9fc0c8090d748577f85d..870d5d818337b9246f85463c071adbda280f27c4 100644
--- a/packet.c
+++ b/packet.c
@@ -72,6 +72,7 @@ void write_packet() {
}
}
+ ses.last_trx_packet_time = time(NULL);
ses.last_packet_time = time(NULL);
if (written == 0) {
diff --git a/process-packet.c b/process-packet.c
index d96c1cb6f7f6e03daef62434169b711ad0fd6161..fe4a543dc0ac53a1c039ec8dbb42f043c44d4249 100644
--- a/process-packet.c
+++ b/process-packet.c
@@ -70,6 +70,7 @@ void process_packet() {
dropbear_close("Disconnect received");
}
+ ses.last_packet_time = time(NULL);
/* This applies for KEX, where the spec says the next packet MUST be
* NEWKEYS */
diff --git a/runopts.h b/runopts.h
index cc39ee485e14b96e817d72cf5e95d0416e839444..7851b07c791f3fc24d73283cabd31eb5735206ff 100644
--- a/runopts.h
+++ b/runopts.h
@@ -38,6 +38,7 @@ typedef struct runopts {
#endif
unsigned int recv_window;
unsigned int keepalive_secs;
+ unsigned int idle_timeout_secs;
} runopts;
diff --git a/session.h b/session.h
index 09c7e3aaa4b5703695a84be47b3a07bba27c97cf..1106db495c9b6a39f7d489ac0e7caae18d7d4442 100644
--- a/session.h
+++ b/session.h
@@ -148,12 +148,16 @@ struct sshsession {
unsigned char lastpacket; /* What the last received packet type was */
- int signal_pipe[2]; /* stores endpoints of a self-pipe used for
+ int signal_pipe[2]; /* stores endpoints of a self-pipe used for
race-free signal handling */
- time_t last_packet_time; /* time of the last packet transmission, for
+ time_t last_trx_packet_time; /* time of the last packet transmission, for
keepalive purposes */
+ time_t last_packet_time; /* time of the last packet transmission or receive, for
+ idle timeout purposes */
+
+
/* KEX/encryption related */
struct KEXState kexstate;
struct key_context *keys;
diff --git a/svr-runopts.c b/svr-runopts.c
index d8cfecf048a8acd7b40ac279ba0a1f7cedd8a2a7..4f1355a6b9e1f88ba6737d284b44cc1f684c67c3 100644
--- a/svr-runopts.c
+++ b/svr-runopts.c
@@ -82,6 +82,7 @@ static void printhelp(const char * progname) {
#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"
#ifdef DEBUG_TRACE
"-v verbose (compiled with DEBUG_TRACE)\n"
#endif
@@ -93,7 +94,7 @@ static void printhelp(const char * progname) {
RSA_PRIV_FILENAME,
#endif
DROPBEAR_MAX_PORTS, DROPBEAR_DEFPORT, DROPBEAR_PIDFILE,
- DEFAULT_RECV_WINDOW, DEFAULT_KEEPALIVE);
+ DEFAULT_RECV_WINDOW, DEFAULT_KEEPALIVE, DEFAULT_IDLE_TIMEOUT);
}
void svr_getopts(int argc, char ** argv) {
@@ -103,6 +104,7 @@ void svr_getopts(int argc, char ** argv) {
int nextisport = 0;
char* recv_window_arg = NULL;
char* keepalive_arg = NULL;
+ char* idle_timeout_arg = NULL;
/* see printhelp() for options */
svr_opts.rsakeyfile = NULL;
@@ -134,7 +136,8 @@ void svr_getopts(int argc, char ** argv) {
svr_opts.usingsyslog = 1;
#endif
opts.recv_window = DEFAULT_RECV_WINDOW;
- opts.keepalive_secs = DEFAULT_KEEPALIVE;
+ opts.keepalive_secs = DEFAULT_KEEPALIVE;
+ opts.idle_timeout_secs = DEFAULT_IDLE_TIMEOUT;
#ifdef ENABLE_SVR_REMOTETCPFWD
opts.listen_fwd_all = 0;
@@ -218,6 +221,9 @@ void svr_getopts(int argc, char ** argv) {
case 'K':
next = &keepalive_arg;
break;
+ case 'I':
+ next = &idle_timeout_arg;
+ break;
#if defined(ENABLE_SVR_PASSWORD_AUTH) || defined(ENABLE_SVR_PAM_AUTH)
case 's':
svr_opts.noauthpass = 1;
@@ -253,7 +259,7 @@ void svr_getopts(int argc, char ** argv) {
svr_opts.addresses[0] = m_strdup(DROPBEAR_DEFADDRESS);
svr_opts.portcount = 1;
}
-
+
if (svr_opts.dsskeyfile == NULL) {
svr_opts.dsskeyfile = DSS_PRIV_FILENAME;
}
@@ -294,6 +300,12 @@ void svr_getopts(int argc, char ** argv) {
dropbear_exit("Bad keepalive '%s'", keepalive_arg);
}
}
+
+ if (idle_timeout_arg) {
+ if (m_str_to_uint(idle_timeout_arg, &opts.idle_timeout_secs) == DROPBEAR_FAILURE) {
+ dropbear_exit("Bad idle_timeout '%s'", idle_timeout_arg);
+ }
+ }
}
static void addportandaddress(char* spec) {