--- lbbs/src/test_ssh_server.c	2025/06/05 14:48:15	1.5
+++ lbbs/src/test_ssh_server.c	2025/09/22 05:06:44	1.10
@@ -1,14 +1,32 @@
+/***************************************************************************
+					test_ssh_server.c  -  description
+							 -------------------
+	Copyright            : (C) 2004-2025 by Leaflet
+	Email                : leaflet@leafok.com
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 3 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+// This test was written based on libssh example/proxy.c
+
 #include "log.h"
 #include <stdio.h>
+#include <libssh/callbacks.h>
 #include <libssh/libssh.h>
 #include <libssh/server.h>
-#include <libssh/callbacks.h>
 
 #ifndef BUF_SIZE
 #define BUF_SIZE 2048
 #endif
 
-#define SSH_HOST_KEYFILE "../conf/ssh_host_rsa_key"
+#define SSH_HOST_RSA_KEYFILE "../conf/ssh_host_rsa_key"
 
 #define USER "test"
 #define PASSWORD "123456"
@@ -96,11 +114,13 @@ int ssh_server(const char *hostaddr, uns
 		.auth_password_function = auth_password,
 		.channel_open_request_session_function = new_session_channel};
 
+	long int ssh_timeout = 0;
+
 	char buf[BUF_SIZE];
 	char host[128] = "";
 	int i, r;
 
-	int ssh_log_level = SSH_LOG_FUNCTIONS;
+	int ssh_log_level = SSH_LOG_PROTOCOL;
 
 	ssh_init();
 
@@ -108,8 +128,9 @@ int ssh_server(const char *hostaddr, uns
 
 	if (ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_BINDADDR, hostaddr) < 0 ||
 		ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_BINDPORT, &port) < 0 ||
-		ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_HOSTKEY, SSH_HOST_KEYFILE) < 0 ||
+		ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_HOSTKEY, SSH_HOST_RSA_KEYFILE) < 0 ||
 		ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_HOSTKEY_ALGORITHMS, "ssh-rsa,rsa-sha2-512,rsa-sha2-256,ecdsa-sha2-nistp256") < 0 ||
+		ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_PUBKEY_ACCEPTED_KEY_TYPES, "ssh-rsa,rsa-sha2-512,rsa-sha2-256,ecdsa-sha2-nistp256") < 0 ||
 		ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_KEY_EXCHANGE, "curve25519-sha256@libssh.org,ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,diffie-hellman-group-exchange-sha256,diffie-hellman-group16-sha512,diffie-hellman-group18-sha512,diffie-hellman-group14-sha256,diffie-hellman-group14-sha1") < 0 ||
 		ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_HMAC_C_S, "umac-64-etm@openssh.com,umac-128-etm@openssh.com,hmac-sha2-256-etm@openssh.com,hmac-sha2-512-etm@openssh.com,hmac-sha1-etm@openssh.com,umac-64@openssh.com,umac-128@openssh.com,hmac-sha2-256,hmac-sha2-512,hmac-sha1") < 0 ||
 		ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_HMAC_S_C, "umac-64-etm@openssh.com,umac-128-etm@openssh.com,hmac-sha2-256-etm@openssh.com,hmac-sha2-512-etm@openssh.com,hmac-sha1-etm@openssh.com,umac-64@openssh.com,umac-128@openssh.com,hmac-sha2-256,hmac-sha2-512,hmac-sha1") < 0 ||
@@ -144,10 +165,19 @@ int ssh_server(const char *hostaddr, uns
 				ssh_callbacks_init(&cb);
 				ssh_set_server_callbacks(session, &cb);
 
+				ssh_timeout = 60; // second
+				if (ssh_options_set(session, SSH_OPTIONS_TIMEOUT, &ssh_timeout) < 0)
+				{
+					log_error("Error setting SSH options: %s\n", ssh_get_error(session));
+					ssh_disconnect(session);
+					_exit(1);
+				}
+
 				if (ssh_handle_key_exchange(session))
 				{
 					log_error("ssh_handle_key_exchange: %s\n", ssh_get_error(session));
-					return 1;
+					ssh_disconnect(session);
+					_exit(1);
 				}
 				ssh_set_auth_methods(session, SSH_AUTH_METHOD_PASSWORD | SSH_AUTH_METHOD_GSSAPI_MIC);
 
@@ -177,6 +207,14 @@ int ssh_server(const char *hostaddr, uns
 					log_common("Authenticated and got a channel\n");
 				}
 
+				ssh_timeout = 0;
+				if (ssh_options_set(session, SSH_OPTIONS_TIMEOUT, &ssh_timeout) < 0)
+				{
+					log_error("Error setting SSH options: %s\n", ssh_get_error(session));
+					ssh_disconnect(session);
+					_exit(1);
+				}
+
 				snprintf(buf, sizeof(buf), "Hello, welcome to the Sample SSH proxy.\r\nPlease select your destination: ");
 				ssh_channel_write(SSH_channel, buf, (uint32_t)strlen(buf));
 				do