X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/f4ec081845e8411db28bda8e91f6ce83f0a0703f..05bea829b8868f5db4ac048897e944ed05dfc457:/config.c

diff --git a/config.c b/config.c
index 50548eee..cbf31698 100644
--- a/config.c
+++ b/config.c
@@ -885,6 +885,18 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
 		      "Always append to the end of it", I(LGXF_APN),
 		      "Ask the user every time", I(LGXF_ASK), NULL);
 
+    if ((midsession && protocol == PROT_SSH) ||
+	(!midsession && backends[3].name != NULL)) {
+	s = ctrl_getset(b, "Session/Logging", "ssh",
+			"Options specific to SSH packet logging");
+	ctrl_checkbox(s, "Omit known password fields", 'k',
+		      HELPCTX(logging_ssh_omit_password),
+		      dlg_stdcheckbox_handler, I(offsetof(Config,logomitpass)));
+	ctrl_checkbox(s, "Omit session data", 'd',
+		      HELPCTX(logging_ssh_omit_data),
+		      dlg_stdcheckbox_handler, I(offsetof(Config,logomitdata)));
+    }
+
     /*
      * The Terminal panel.
      */
@@ -1292,6 +1304,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 +1440,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)));
     }