--- lbbs/src/test_ssh_server.c	2025/06/04 10:05:07	1.2
+++ lbbs/src/test_ssh_server.c	2025/06/05 05:24:56	1.4
@@ -13,7 +13,7 @@
 #define USER "test"
 #define PASSWORD "123456"
 
-static ssh_channel channel;
+static ssh_channel SSH_channel;
 static int authenticated = 0;
 static int tries = 0;
 static int error = 0;
@@ -23,11 +23,11 @@ static int auth_password(ssh_session ses
 {
 	(void)userdata;
 
-	log_std("Authenticating user %s pwd %s\n", user, password);
+	log_common("Authenticating user %s pwd %s\n", user, password);
 	if (strcmp(user, USER) == 0 && strcmp(password, PASSWORD) == 0)
 	{
 		authenticated = 1;
-		log_std("Authenticated\n");
+		log_common("Authenticated\n");
 		return SSH_AUTH_SUCCESS;
 	}
 	if (tries >= 3)
@@ -52,7 +52,7 @@ static int pty_request(ssh_session sessi
 	(void)px;
 	(void)py;
 	(void)userdata;
-	log_std("Allocated terminal\n");
+	log_common("Allocated terminal\n");
 	return 0;
 }
 
@@ -61,9 +61,10 @@ static int shell_request(ssh_session ses
 	(void)session;
 	(void)channel;
 	(void)userdata;
-	log_std("Allocated shell\n");
+	log_common("Allocated shell\n");
 	return 0;
 }
+
 struct ssh_channel_callbacks_struct channel_cb = {
 	.channel_pty_request_function = pty_request,
 	.channel_shell_request_function = shell_request};
@@ -73,21 +74,21 @@ static ssh_channel new_session_channel(s
 	(void)session;
 	(void)userdata;
 
-	if (channel != NULL)
+	if (SSH_channel != NULL)
 		return NULL;
 
-	log_std("Allocated session channel\n");
-	channel = ssh_channel_new(session);
+	log_common("Allocated session channel\n");
+	SSH_channel = ssh_channel_new(session);
 	ssh_callbacks_init(&channel_cb);
-	ssh_set_channel_callbacks(channel, &channel_cb);
+	ssh_set_channel_callbacks(SSH_channel, &channel_cb);
 
-	return channel;
+	return SSH_channel;
 }
 
 int ssh_server(const char *hostaddr, unsigned int port)
 {
-	ssh_session session;
 	ssh_bind sshbind;
+	ssh_session session;
 	ssh_event event;
 
 	struct ssh_server_callbacks_struct cb = {
@@ -147,7 +148,7 @@ int ssh_server(const char *hostaddr, uns
 				event = ssh_event_new();
 				ssh_event_add_session(event, session);
 
-				while (!(authenticated && channel != NULL))
+				while (!(authenticated && SSH_channel != NULL))
 				{
 					if (error)
 						break;
@@ -167,17 +168,17 @@ int ssh_server(const char *hostaddr, uns
 				}
 				else
 				{
-					log_std("Authenticated and got a channel\n");
+					log_common("Authenticated and got a channel\n");
 				}
 
 				snprintf(buf, sizeof(buf), "Hello, welcome to the Sample SSH proxy.\r\nPlease select your destination: ");
-				ssh_channel_write(channel, buf, (uint32_t)strlen(buf));
+				ssh_channel_write(SSH_channel, buf, (uint32_t)strlen(buf));
 				do
 				{
-					i = ssh_channel_read(channel, buf, sizeof(buf), 0);
+					i = ssh_channel_read(SSH_channel, buf, sizeof(buf), 0);
 					if (i > 0)
 					{
-						ssh_channel_write(channel, buf, (uint32_t)i);
+						ssh_channel_write(SSH_channel, buf, (uint32_t)i);
 						if (strlen(host) + (size_t)i < sizeof(host))
 						{
 							strncat(host, buf, (size_t)i);
@@ -185,7 +186,7 @@ int ssh_server(const char *hostaddr, uns
 						if (strchr(host, '\x0d'))
 						{
 							*strchr(host, '\x0d') = '\0';
-							ssh_channel_write(channel, "\n", 1);
+							ssh_channel_write(SSH_channel, "\n", 1);
 							break;
 						}
 					}
@@ -196,8 +197,8 @@ int ssh_server(const char *hostaddr, uns
 					}
 				} while (i > 0);
 				snprintf(buf, sizeof(buf), "Trying to connect to \"%s\"\r\n", host);
-				ssh_channel_write(channel, buf, (uint32_t)strlen(buf));
-				log_std("%s", buf);
+				ssh_channel_write(SSH_channel, buf, (uint32_t)strlen(buf));
+				log_common("%s", buf);
 
 				ssh_disconnect(session);
 				ssh_free(session);
@@ -233,8 +234,8 @@ int main(int argc, char *argv[])
 		return -1;
 	}
 
-	log_std_redirect(STDOUT_FILENO);
-	log_err_redirect(STDERR_FILENO);
+	log_common_redir(STDOUT_FILENO);
+	log_error_redir(STDERR_FILENO);
 
 	ssh_server("0.0.0.0", 2322);