enum { PROT_RAW, PROT_TELNET, PROT_SSH } protocol;
int close_on_exit;
int warn_on_close;
enum { PROT_RAW, PROT_TELNET, PROT_SSH } protocol;
int close_on_exit;
int warn_on_close;
+ int ping_interval; /* in seconds */
/* SSH options */
char remote_cmd[512];
int nopty;
/* SSH options */
char remote_cmd[512];
int nopty;
}
write_setting_i (sesskey, "CloseOnExit", !!cfg->close_on_exit);
write_setting_i (sesskey, "WarnOnClose", !!cfg->warn_on_close);
}
write_setting_i (sesskey, "CloseOnExit", !!cfg->close_on_exit);
write_setting_i (sesskey, "WarnOnClose", !!cfg->warn_on_close);
- write_setting_i (sesskey, "PingInterval", cfg->ping_interval);
+ write_setting_i (sesskey, "PingInterval", cfg->ping_interval / 60); /* minutes */
+ write_setting_i (sesskey, "PingIntervalSecs", cfg->ping_interval % 60); /* seconds */
write_setting_s (sesskey, "TerminalType", cfg->termtype);
write_setting_s (sesskey, "TerminalSpeed", cfg->termspeed);
{
write_setting_s (sesskey, "TerminalType", cfg->termtype);
write_setting_s (sesskey, "TerminalSpeed", cfg->termspeed);
{
gppi (sesskey, "CloseOnExit", 1, &cfg->close_on_exit);
gppi (sesskey, "WarnOnClose", 1, &cfg->warn_on_close);
gppi (sesskey, "CloseOnExit", 1, &cfg->close_on_exit);
gppi (sesskey, "WarnOnClose", 1, &cfg->warn_on_close);
- gppi (sesskey, "PingInterval", 0, &cfg->ping_interval);
+ {
+ /* This is two values for backward compatibility with 0.50/0.51 */
+ int pingmin, pingsec;
+ gppi (sesskey, "PingInterval", 0, &pingmin);
+ gppi (sesskey, "PingIntervalSecs", 0, &pingsec);
+ cfg->ping_interval = pingmin*60 + pingsec;
+ }
gpps (sesskey, "TerminalType", "xterm", cfg->termtype,
sizeof(cfg->termtype));
gpps (sesskey, "TerminalSpeed", "38400,38400", cfg->termspeed,
gpps (sesskey, "TerminalType", "xterm", cfg->termtype,
sizeof(cfg->termtype));
gpps (sesskey, "TerminalSpeed", "38400,38400", cfg->termspeed,
}
beginbox(&cp, "Sending of null packets to keep session active",
IDC_BOX_CONNECTION2, IDC_BOXT_CONNECTION2);
}
beginbox(&cp, "Sending of null packets to keep session active",
IDC_BOX_CONNECTION2, IDC_BOXT_CONNECTION2);
- staticedit(&cp, "Minutes between &keepalives (0 to turn off)",
+ staticedit(&cp, "Seconds between &keepalives (0 to turn off)",
IDC_PINGSTATIC, IDC_PINGEDIT, 25);
endbox(&cp);
IDC_PINGSTATIC, IDC_PINGEDIT, 25);
endbox(&cp);
{
time_t now;
time(&now);
{
time_t now;
time(&now);
- if (now-last_movement > cfg.ping_interval * 60 - 10)
+ if (now-last_movement > cfg.ping_interval)
{
back->special(TS_PING);
last_movement = now;
{
back->special(TS_PING);
last_movement = now;