X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/f4ec081845e8411db28bda8e91f6ce83f0a0703f..6c13524378a7fa7571c0585a37efc8c635a82dab:/config.c

diff --git a/config.c b/config.c
index 50548eee..146fb58b 100644
--- a/config.c
+++ b/config.c
@@ -1292,6 +1292,10 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
 			  'n', HELPCTX(connection_nodelay),
 			  dlg_stdcheckbox_handler,
 			  I(offsetof(Config,tcp_nodelay)));
+	    ctrl_checkbox(s, "Enable TCP keepalives (SO_KEEPALIVE option)",
+			  'p', HELPCTX(connection_tcpkeepalive),
+			  dlg_stdcheckbox_handler,
+			  I(offsetof(Config,tcp_keepalives)));
 	}
 
     }
@@ -1424,12 +1428,12 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
 			      I(offsetof(Config, passive_telnet)),
 			      "Passive", I(1), "Active", I(0), NULL);
 	}
-	ctrl_checkbox(s, "Keyboard sends telnet Backspace and Interrupt", 'k',
+	ctrl_checkbox(s, "Keyboard sends Telnet special commands", 'k',
 		      HELPCTX(telnet_specialkeys),
 		      dlg_stdcheckbox_handler,
 		      I(offsetof(Config,telnet_keyboard)));
-	ctrl_checkbox(s, "Return key sends telnet New Line instead of ^M",
-		      NO_SHORTCUT, HELPCTX(telnet_newline),
+	ctrl_checkbox(s, "Return key sends Telnet New Line instead of ^M",
+		      'm', HELPCTX(telnet_newline),
 		      dlg_stdcheckbox_handler,
 		      I(offsetof(Config,telnet_newline)));
     }