--- lbbs/src/bbs_net.c	2025/11/30 10:05:16	1.84
+++ lbbs/src/bbs_net.c	2025/12/18 01:39:32	1.93
@@ -54,39 +54,39 @@ enum _bbs_net_constant_t
 	STATION_PER_LINE = 4,
 	USERNAME_MAX_LEN = 20,
 	PASSWORD_MAX_LEN = 20,
+	SSH_CONNECT_TIMEOUT = 5, // seconds
 };
 
 struct _bbsnet_conf
 {
-	char host1[20];
-	char host2[40];
-	char ip[40];
-	in_port_t port;
+	char org_name[40];
+	char site_name[40];
+	char host_name[IP_ADDR_LEN];
+	char port[6];
 	int8_t use_ssh;
 	char charset[CHARSET_MAX_LEN + 1];
 } bbsnet_conf[MAXSTATION];
 
 static MENU_SET bbsnet_menu;
 
+static void unload_bbsnet_conf(void);
+
 static int load_bbsnet_conf(const char *file_config)
 {
 	FILE *fp;
 	MENU *p_menu;
 	MENU_ITEM *p_menu_item;
 	MENU_ITEM_ID menu_item_id;
-	char t[256], *t1, *t2, *t3, *t4, *t5, *t6, *saveptr;
+	char line[LINE_BUFFER_LEN], *t1, *t2, *t3, *t4, *t5, *t6, *saveptr;
+	int port;
 
-	fp = fopen(file_config, "r");
-	if (fp == NULL)
-	{
-		return -1;
-	}
+	unload_bbsnet_conf();
 
 	bbsnet_menu.p_menu_pool = calloc(1, sizeof(MENU));
 	if (bbsnet_menu.p_menu_pool == NULL)
 	{
 		log_error("calloc(p_menu_pool) error\n");
-		return -3;
+		return -1;
 	}
 	bbsnet_menu.menu_count = 1;
 
@@ -94,7 +94,8 @@ static int load_bbsnet_conf(const char *
 	if (bbsnet_menu.p_menu_item_pool == NULL)
 	{
 		log_error("calloc(p_menu_item_pool) error\n");
-		return -3;
+		unload_bbsnet_conf();
+		return -1;
 	}
 	bbsnet_menu.menu_item_count = MAXSTATION;
 
@@ -105,10 +106,17 @@ static int load_bbsnet_conf(const char *
 	p_menu->title.show = 0;
 	p_menu->screen_show = 0;
 
+	fp = fopen(file_config, "r");
+	if (fp == NULL)
+	{
+		unload_bbsnet_conf();
+		return -2;
+	}
+
 	menu_item_id = 0;
-	while (fgets(t, 255, fp) && menu_item_id < MAXSTATION)
+	while (fgets(line, sizeof(line), fp) && menu_item_id < MAXSTATION)
 	{
-		t1 = strtok_r(t, MENU_CONF_DELIM, &saveptr);
+		t1 = strtok_r(line, MENU_CONF_DELIM, &saveptr);
 		t2 = strtok_r(NULL, MENU_CONF_DELIM, &saveptr);
 		t3 = strtok_r(NULL, MENU_CONF_DELIM, &saveptr);
 		t4 = strtok_r(NULL, MENU_CONF_DELIM, &saveptr);
@@ -116,18 +124,27 @@ static int load_bbsnet_conf(const char *
 		t6 = strtok_r(NULL, MENU_CONF_DELIM, &saveptr);
 
 		if (t1 == NULL || t2 == NULL || t3 == NULL || t4 == NULL ||
-			t5 == NULL || t6 == NULL || t[0] == '#' || t[0] == '*')
+			t5 == NULL || t6 == NULL || line[0] == '#' || line[0] == '*')
 		{
 			continue;
 		}
 
-		strncpy(bbsnet_conf[menu_item_id].host1, t2, sizeof(bbsnet_conf[menu_item_id].host1) - 1);
-		bbsnet_conf[menu_item_id].host1[sizeof(bbsnet_conf[menu_item_id].host1) - 1] = '\0';
-		strncpy(bbsnet_conf[menu_item_id].host2, t1, sizeof(bbsnet_conf[menu_item_id].host2) - 1);
-		bbsnet_conf[menu_item_id].host2[sizeof(bbsnet_conf[menu_item_id].host2) - 1] = '\0';
-		strncpy(bbsnet_conf[menu_item_id].ip, t3, sizeof(bbsnet_conf[menu_item_id].ip) - 1);
-		bbsnet_conf[menu_item_id].ip[sizeof(bbsnet_conf[menu_item_id].ip) - 1] = '\0';
-		bbsnet_conf[menu_item_id].port = (in_port_t)(t4 ? atoi(t4) : 23);
+		strncpy(bbsnet_conf[menu_item_id].site_name, t2, sizeof(bbsnet_conf[menu_item_id].site_name) - 1);
+		bbsnet_conf[menu_item_id].site_name[sizeof(bbsnet_conf[menu_item_id].site_name) - 1] = '\0';
+		strncpy(bbsnet_conf[menu_item_id].org_name, t1, sizeof(bbsnet_conf[menu_item_id].org_name) - 1);
+		bbsnet_conf[menu_item_id].org_name[sizeof(bbsnet_conf[menu_item_id].org_name) - 1] = '\0';
+		strncpy(bbsnet_conf[menu_item_id].host_name, t3, sizeof(bbsnet_conf[menu_item_id].host_name) - 1);
+		bbsnet_conf[menu_item_id].host_name[sizeof(bbsnet_conf[menu_item_id].host_name) - 1] = '\0';
+		port = atoi(t4);
+		if (port <= 0 || port > 65535)
+		{
+			log_error("Invalid port value %d of menu item %d\n", port, menu_item_id);
+			fclose(fp);
+			unload_bbsnet_conf();
+			return -3;
+		}
+		strncpy(bbsnet_conf[menu_item_id].port, t4, sizeof(bbsnet_conf[menu_item_id].port) - 1);
+		bbsnet_conf[menu_item_id].port[sizeof(bbsnet_conf[menu_item_id].port) - 1] = '\0';
 		bbsnet_conf[menu_item_id].use_ssh = (toupper(t5[0]) == 'Y');
 		strncpy(bbsnet_conf[menu_item_id].charset, t6, sizeof(bbsnet_conf[menu_item_id].charset) - 1);
 		bbsnet_conf[menu_item_id].charset[sizeof(bbsnet_conf[menu_item_id].charset) - 1] = '\0';
@@ -136,7 +153,9 @@ static int load_bbsnet_conf(const char *
 		if (p_menu_item == NULL)
 		{
 			log_error("get_menu_item_by_id(%d) return NULL pointer\n", menu_item_id);
-			return -1;
+			fclose(fp);
+			unload_bbsnet_conf();
+			return -3;
 		}
 
 		p_menu_item->row = (int16_t)(2 + menu_item_id / STATION_PER_LINE);
@@ -148,8 +167,8 @@ static int load_bbsnet_conf(const char *
 		p_menu_item->name[0] =
 			(char)(menu_item_id < MAXSTATION / 2 ? 'A' + menu_item_id : 'a' + menu_item_id);
 		p_menu_item->name[1] = '\0';
-		snprintf(p_menu_item->text, sizeof(p_menu_item->text), "%c. %s",
-				 p_menu_item->name[0], bbsnet_conf[menu_item_id].host1);
+		snprintf(p_menu_item->text, sizeof(p_menu_item->text), "\033[1;36m%c.\033[m %s",
+				 p_menu_item->name[0], bbsnet_conf[menu_item_id].site_name);
 
 		p_menu->items[p_menu->item_count] = menu_item_id;
 		p_menu->item_count++;
@@ -171,10 +190,17 @@ static void unload_bbsnet_conf(void)
 	bbsnet_menu.menu_count = 0;
 	bbsnet_menu.menu_item_count = 0;
 
-	free(bbsnet_menu.p_menu_pool);
-	bbsnet_menu.p_menu_pool = NULL;
-	free(bbsnet_menu.p_menu_item_pool);
-	bbsnet_menu.p_menu_item_pool = NULL;
+	if (bbsnet_menu.p_menu_pool)
+	{
+		free(bbsnet_menu.p_menu_pool);
+		bbsnet_menu.p_menu_pool = NULL;
+	}
+
+	if (bbsnet_menu.p_menu_item_pool)
+	{
+		free(bbsnet_menu.p_menu_item_pool);
+		bbsnet_menu.p_menu_item_pool = NULL;
+	}
 }
 
 static void process_bar(int n, int len)
@@ -182,7 +208,11 @@ static void process_bar(int n, int len)
 	char buf[LINE_BUFFER_LEN];
 	char buf2[LINE_BUFFER_LEN];
 
-	if (len > LINE_BUFFER_LEN)
+	if (len <= 0)
+	{
+		len = 1;
+	}
+	else if (len > LINE_BUFFER_LEN)
 	{
 		len = LINE_BUFFER_LEN - 1;
 	}
@@ -207,12 +237,14 @@ static void process_bar(int n, int len)
 
 static int bbsnet_connect(int n)
 {
-	int sock, ret, loop, error;
+	int sock = -1;
+	int ret;
+	int loop;
+	int error;
 	int sock_connected = 0;
-	int flags_sock;
-	int flags_stdin;
-	int flags_stdout;
-	int len;
+	int flags_sock = -1;
+	int flags_stdin = -1;
+	int flags_stdout = -1;
 	struct sockaddr_in sin;
 	char input_buf[LINE_BUFFER_LEN];
 	char output_buf[LINE_BUFFER_LEN];
@@ -226,13 +258,13 @@ static int bbsnet_connect(int n)
 	int output_conv_len = 0;
 	int input_conv_offset = 0;
 	int output_conv_offset = 0;
-	iconv_t input_cd = NULL;
-	iconv_t output_cd = NULL;
-	char tocode[32];
+	iconv_t input_cd = (iconv_t)(-1);
+	iconv_t output_cd = (iconv_t)(-1);
+	char tocode[CHARSET_MAX_LEN + 20];
 
 #ifdef HAVE_SYS_EPOLL_H
 	struct epoll_event ev, events[MAX_EVENTS];
-	int epollfd;
+	int epollfd = -1;
 #else
 	struct pollfd pfds[3];
 #endif
@@ -242,13 +274,14 @@ static int bbsnet_connect(int n)
 	int stdout_write_wait = 0;
 	int sock_read_wait = 0;
 	int sock_write_wait = 0;
-	struct hostent *p_host = NULL;
+	struct addrinfo hints, *res = NULL;
 	int tos;
-	char remote_addr[IP_ADDR_LEN];
+	char remote_addr[INET_ADDRSTRLEN];
 	int remote_port;
-	char local_addr[IP_ADDR_LEN];
+	char local_addr[INET_ADDRSTRLEN];
 	int local_port;
 	socklen_t sock_len;
+	time_t t_begin;
 	time_t t_used = time(NULL);
 	struct tm *tm_used;
 	int ch;
@@ -257,7 +290,7 @@ static int bbsnet_connect(int n)
 	ssh_session session = NULL;
 	ssh_channel channel = NULL;
 	int ssh_process_config = 0;
-	int ssh_log_level = SSH_LOG_PROTOCOL;
+	int ssh_log_level = SSH_LOG_NOLOG;
 
 	if (user_online_update("BBS_NET") < 0)
 	{
@@ -277,7 +310,7 @@ static int bbsnet_connect(int n)
 		}
 
 		moveto(1, 1);
-		prints("通过SSH方式连接[%s]...", bbsnet_conf[n].host1);
+		prints("通过SSH方式连接[%s]...", bbsnet_conf[n].site_name);
 		moveto(2, 1);
 		prints("请输入用户名: ");
 		iflush();
@@ -307,66 +340,107 @@ static int bbsnet_connect(int n)
 
 	moveto(1, 1);
 	prints("\033[1;32m正在测试往 %s (%s) 的连接，请稍候... \033[m\r\n",
-		   bbsnet_conf[n].host1, bbsnet_conf[n].ip);
+		   bbsnet_conf[n].site_name, bbsnet_conf[n].host_name);
 	iflush();
 
-	p_host = gethostbyname(bbsnet_conf[n].ip);
+	memset(&hints, 0, sizeof(hints));
+	hints.ai_family = AF_INET;
+	hints.ai_socktype = SOCK_STREAM;
+	hints.ai_protocol = IPPROTO_TCP;
 
-	if (p_host == NULL)
+	if ((ret = getaddrinfo(BBS_address, NULL, &hints, &res)) != 0)
 	{
-		prints("\033[1;31m查找主机名失败！\033[m\r\n");
-		press_any_key();
-		return -1;
+		log_error("getaddrinfo() error (%d)\n", ret);
+		goto cleanup;
 	}
 
-	sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+	if (inet_ntop(AF_INET, &(((struct sockaddr_in *)res->ai_addr)->sin_addr.s_addr), local_addr, sizeof(local_addr)) == NULL)
+	{
+		log_error("inet_ntop() error (%d)\n", errno);
+		goto cleanup;
+	}
+	local_port = ntohs(((struct sockaddr_in *)res->ai_addr)->sin_port);
 
+	sock = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
 	if (sock < 0)
 	{
-		prints("\033[1;31m无法创建socket！\033[m\r\n");
-		press_any_key();
-		return -1;
+		log_error("socket() error (%d)\n", errno);
+		goto cleanup;
+	}
+
+	if (bind(sock, res->ai_addr, res->ai_addrlen) < 0)
+	{
+		log_error("bind(%s:%u) error (%d)\n", local_addr, local_port, errno);
+		goto cleanup;
 	}
 
-	sin.sin_family = AF_INET;
-	sin.sin_addr.s_addr = (BBS_address[0] != '\0' ? inet_addr(BBS_address) : INADDR_ANY);
-	sin.sin_port = 0;
+	freeaddrinfo(res);
+	res = NULL;
 
-	if (bind(sock, (struct sockaddr *)&sin, sizeof(sin)) < 0)
+	memset(&hints, 0, sizeof(hints));
+	hints.ai_family = AF_INET;
+	hints.ai_flags = AI_NUMERICSERV;
+	hints.ai_socktype = SOCK_STREAM;
+	hints.ai_protocol = IPPROTO_TCP;
+
+	if ((ret = getaddrinfo(bbsnet_conf[n].host_name, bbsnet_conf[n].port, &hints, &res)) != 0)
 	{
-		log_error("Bind address %s:%u failed (%d)\n",
-				  inet_ntoa(sin.sin_addr), ntohs(sin.sin_port), errno);
-		return -2;
+		log_error("getaddrinfo() error (%d)\n", ret);
+		prints("\033[1;31m查找主机名失败！\033[m\r\n");
+		press_any_key();
+		goto cleanup;
 	}
 
-	memset(&sin, 0, sizeof(sin));
-	sin.sin_family = AF_INET;
-	sin.sin_addr = *(struct in_addr *)p_host->h_addr_list[0];
-	sin.sin_port = htons(bbsnet_conf[n].port);
-
-	strncpy(remote_addr, inet_ntoa(sin.sin_addr), sizeof(remote_addr) - 1);
-	remote_addr[sizeof(remote_addr) - 1] = '\0';
-	remote_port = ntohs(sin.sin_port);
+	if (inet_ntop(AF_INET, &(((struct sockaddr_in *)res->ai_addr)->sin_addr.s_addr), remote_addr, sizeof(remote_addr)) == NULL)
+	{
+		log_error("inet_ntop() error (%d)\n", errno);
+		goto cleanup;
+	}
+	remote_port = ntohs(((struct sockaddr_in *)res->ai_addr)->sin_port);
 
 	prints("\033[1;32m穿梭进度条提示您当前已使用的时间，按\033[1;33mCtrl+C\033[1;32m中断。\033[m\r\n");
 	process_bar(0, MAX_PROCESS_BAR_LEN);
 
 	// Set socket as non-blocking
-	flags_sock = fcntl(sock, F_GETFL, 0);
-	fcntl(sock, F_SETFL, flags_sock | O_NONBLOCK);
+	if ((flags_sock = fcntl(sock, F_GETFL, 0)) == -1)
+	{
+		log_error("fcntl(F_GETFL) error (%d)\n", errno);
+		goto cleanup;
+	}
+	if ((fcntl(sock, F_SETFL, flags_sock | O_NONBLOCK)) == -1)
+	{
+		log_error("fcntl(F_SETFL) error (%d)\n", errno);
+		goto cleanup;
+	}
 
 	// Set STDIN/STDOUT as non-blocking
-	flags_stdin = fcntl(STDIN_FILENO, F_GETFL, 0);
-	flags_stdout = fcntl(STDOUT_FILENO, F_GETFL, 0);
-	fcntl(STDIN_FILENO, F_SETFL, flags_stdin | O_NONBLOCK);
-	fcntl(STDOUT_FILENO, F_SETFL, flags_stdout | O_NONBLOCK);
+	if ((flags_stdin = fcntl(STDIN_FILENO, F_GETFL, 0)) == -1)
+	{
+		log_error("fcntl(F_GETFL) error (%d)\n", errno);
+		goto cleanup;
+	}
+	if ((flags_stdout = fcntl(STDOUT_FILENO, F_GETFL, 0)) == -1)
+	{
+		log_error("fcntl(F_GETFL) error (%d)\n", errno);
+		goto cleanup;
+	}
+	if ((fcntl(STDIN_FILENO, F_SETFL, flags_stdin | O_NONBLOCK)) == -1)
+	{
+		log_error("fcntl(F_SETFL) error (%d)\n", errno);
+		goto cleanup;
+	}
+	if ((fcntl(STDOUT_FILENO, F_SETFL, flags_stdout | O_NONBLOCK)) == -1)
+	{
+		log_error("fcntl(F_SETFL) error (%d)\n", errno);
+		goto cleanup;
+	}
 
 #ifdef HAVE_SYS_EPOLL_H
 	epollfd = epoll_create1(0);
 	if (epollfd < 0)
 	{
 		log_error("epoll_create1() error (%d)\n", errno);
-		return -1;
+		goto cleanup;
 	}
 
 	ev.events = EPOLLOUT | EPOLLET;
@@ -388,7 +462,7 @@ static int bbsnet_connect(int n)
 
 	while (!SYS_server_exit)
 	{
-		if ((ret = connect(sock, (struct sockaddr *)&sin, sizeof(sin))) < 0)
+		if ((ret = connect(sock, res->ai_addr, res->ai_addrlen)) < 0)
 		{
 			if (errno == EAGAIN || errno == EALREADY || errno == EINPROGRESS)
 			{
@@ -404,10 +478,8 @@ static int bbsnet_connect(int n)
 			else
 			{
 				log_error("connect(socket) error (%d)\n", errno);
-
 				prints("\033[1;31m连接失败！\033[m\r\n");
 				press_any_key();
-
 				goto cleanup;
 			}
 		}
@@ -453,10 +525,10 @@ static int bbsnet_connect(int n)
 				if (pfds[i].fd == sock && (pfds[i].revents & POLLOUT))
 #endif
 				{
-					len = sizeof(error);
-					if (getsockopt(sock, SOL_SOCKET, SO_ERROR, &error, (socklen_t *)&len) < 0)
+					socklen_t len = sizeof(error);
+					if (getsockopt(sock, SOL_SOCKET, SO_ERROR, &error, &len) < 0)
 					{
-						log_error("getsockopt() error (%d) !\n", error);
+						log_error("getsockopt() error (%d) !\n", errno);
 						goto cleanup;
 					}
 					if (error == 0)
@@ -490,7 +562,6 @@ static int bbsnet_connect(int n)
 	{
 		prints("\033[1;31m连接失败！\033[m\r\n");
 		press_any_key();
-
 		goto cleanup;
 	}
 
@@ -522,7 +593,8 @@ static int bbsnet_connect(int n)
 
 		if (ssh_options_set(session, SSH_OPTIONS_FD, &sock) < 0 ||
 			ssh_options_set(session, SSH_OPTIONS_PROCESS_CONFIG, &ssh_process_config) < 0 ||
-			ssh_options_set(session, SSH_OPTIONS_HOST, bbsnet_conf[n].ip) < 0 ||
+			ssh_options_set(session, SSH_OPTIONS_KNOWNHOSTS, SSH_KNOWN_HOSTS_FILE) < 0 ||
+			ssh_options_set(session, SSH_OPTIONS_HOST, bbsnet_conf[n].host_name) < 0 ||
 			ssh_options_set(session, SSH_OPTIONS_USER, remote_user) < 0 ||
 			ssh_options_set(session, SSH_OPTIONS_HOSTKEYS, "+ssh-rsa") < 0 ||
 			ssh_options_set(session, SSH_OPTIONS_LOG_VERBOSITY, &ssh_log_level) < 0)
@@ -531,23 +603,59 @@ static int bbsnet_connect(int n)
 			goto cleanup;
 		}
 
-		while (!SYS_server_exit)
+		ssh_set_blocking(session, 0);
+
+		t_begin = time(NULL);
+		ret = SSH_ERROR;
+		while (!SYS_server_exit && time(NULL) - t_begin < SSH_CONNECT_TIMEOUT)
 		{
 			ret = ssh_connect(session);
 			if (ret == SSH_OK)
 			{
 				break;
 			}
-			else if (ret == SSH_ERROR)
+			else if (ret == SSH_AGAIN)
+			{
+				// log_error("ssh_connect() error: SSH_AGAIN\n");
+			}
+			else // if (ret == SSH_ERROR)
 			{
-				log_error("ssh_connect() error\n");
+				log_error("ssh_connect() error: SSH_ERROR\n");
 				goto cleanup;
 			}
 		}
+		if (ret != SSH_OK)
+		{
+			prints("\033[1;31m连接超时！\033[m\r\n");
+			press_any_key();
+			goto cleanup;
+		}
 
-		ssh_set_blocking(session, 0);
+		ret = ssh_session_is_known_server(session);
+		switch (ret)
+		{
+		case SSH_KNOWN_HOSTS_NOT_FOUND:
+		case SSH_KNOWN_HOSTS_UNKNOWN:
+			if (ssh_session_update_known_hosts(session) != SSH_OK)
+			{
+				log_error("ssh_session_update_known_hosts(%s) error\n", bbsnet_conf[n].host_name);
+				prints("\033[1;31m无法添加服务器证书\033[m\r\n");
+				press_any_key();
+				goto cleanup;
+			}
+			log_common("SSH key of (%s) is added into %s\n", bbsnet_conf[n].host_name, SSH_KNOWN_HOSTS_FILE);
+		case SSH_KNOWN_HOSTS_OK:
+			break;
+		case SSH_KNOWN_HOSTS_CHANGED:
+		case SSH_KNOWN_HOSTS_OTHER:
+			log_error("ssh_session_is_known_server(%s) error: %d\n", bbsnet_conf[n].host_name, ret);
+			prints("\033[1;31m服务器证书已变更\033[m\r\n");
+			press_any_key();
+			goto cleanup;
+		}
 
-		for (int i = 0; !SYS_server_exit;)
+		ret = SSH_AUTH_ERROR;
+		while (!SYS_server_exit && time(NULL) - t_begin < SSH_CONNECT_TIMEOUT)
 		{
 			ret = ssh_userauth_password(session, NULL, remote_pass);
 			if (ret == SSH_AUTH_SUCCESS)
@@ -556,38 +664,27 @@ static int bbsnet_connect(int n)
 			}
 			else if (ret == SSH_AUTH_AGAIN)
 			{
-#ifdef _DEBUG
-				log_error("ssh_userauth_password() error: SSH_AUTH_AGAIN\n");
-#endif
+				// log_error("ssh_userauth_password() error: SSH_AUTH_AGAIN\n");
 			}
 			else if (ret == SSH_AUTH_ERROR)
 			{
-				log_error("ssh_userauth_password() error: %d\n", ret);
+				log_error("ssh_userauth_password() error: SSH_AUTH_ERROR\n");
 				goto cleanup;
 			}
 			else // if (ret == SSH_AUTH_DENIED)
 			{
+				log_error("ssh_userauth_password() error: SSH_AUTH_DENIED\n");
 				prints("\033[1;31m身份验证失败！\033[m\r\n");
-				i++;
-				if (i < BBS_login_retry_times)
-				{
-					prints("请输入密码: ");
-					iflush();
-					if (str_input(remote_pass, sizeof(remote_pass), NOECHO) < 0)
-					{
-						goto cleanup;
-					}
-					if (remote_pass[0] == '\0')
-					{
-						goto cleanup;
-					}
-				}
-				else
-				{
-					goto cleanup;
-				}
+				press_any_key();
+				goto cleanup;
 			}
 		}
+		if (ret != SSH_AUTH_SUCCESS)
+		{
+			prints("\033[1;31m连接超时！\033[m\r\n");
+			press_any_key();
+			goto cleanup;
+		}
 
 		channel = ssh_channel_new(session);
 		if (channel == NULL)
@@ -596,47 +693,80 @@ static int bbsnet_connect(int n)
 			goto cleanup;
 		}
 
-		while (!SYS_server_exit)
+		ret = SSH_ERROR;
+		while (!SYS_server_exit && time(NULL) - t_begin < SSH_CONNECT_TIMEOUT)
 		{
 			ret = ssh_channel_open_session(channel);
 			if (ret == SSH_OK)
 			{
 				break;
 			}
-			else if (ret == SSH_ERROR)
+			else if (ret == SSH_AGAIN)
 			{
-				log_error("ssh_channel_open_session() error\n");
+				// log_error("ssh_channel_open_session() error: SSH_AGAIN\n");
+			}
+			else // if (ret == SSH_ERROR)
+			{
+				log_error("ssh_channel_open_session() error: SSH_ERROR\n");
 				goto cleanup;
 			}
 		}
+		if (ret != SSH_OK)
+		{
+			prints("\033[1;31m连接超时！\033[m\r\n");
+			press_any_key();
+			goto cleanup;
+		}
 
-		while (!SYS_server_exit)
+		ret = SSH_ERROR;
+		while (!SYS_server_exit && time(NULL) - t_begin < SSH_CONNECT_TIMEOUT)
 		{
 			ret = ssh_channel_request_pty(channel);
 			if (ret == SSH_OK)
 			{
 				break;
 			}
-			else if (ret == SSH_ERROR)
+			else if (ret == SSH_AGAIN)
 			{
-				log_error("ssh_channel_request_pty() error\n");
+				// log_error("ssh_channel_request_pty() error: SSH_AGAIN\n");
+			}
+			else // if (ret == SSH_ERROR)
+			{
+				log_error("ssh_channel_request_pty() error: SSH_ERROR\n");
 				goto cleanup;
 			}
 		}
+		if (ret != SSH_OK)
+		{
+			prints("\033[1;31m连接超时！\033[m\r\n");
+			press_any_key();
+			goto cleanup;
+		}
 
-		while (!SYS_server_exit)
+		ret = SSH_ERROR;
+		while (!SYS_server_exit && time(NULL) - t_begin < SSH_CONNECT_TIMEOUT)
 		{
 			ret = ssh_channel_request_shell(channel);
 			if (ret == SSH_OK)
 			{
 				break;
 			}
-			else if (ret == SSH_ERROR)
+			else if (ret == SSH_AGAIN)
+			{
+				// log_error("ssh_channel_request_shell() error: SSH_AGAIN\n");
+			}
+			else // if (ret == SSH_ERROR)
 			{
-				log_error("ssh_channel_request_shell() error\n");
+				log_error("ssh_channel_request_shell() error: SSH_ERROR\n");
 				goto cleanup;
 			}
 		}
+		if (ret != SSH_OK)
+		{
+			prints("\033[1;31m连接超时！\033[m\r\n");
+			press_any_key();
+			goto cleanup;
+		}
 	}
 
 	prints("\033[1;31m连接成功！\033[m\r\n");
@@ -659,7 +789,6 @@ static int bbsnet_connect(int n)
 	if (output_cd == (iconv_t)(-1))
 	{
 		log_error("iconv_open(%s->%s) error: %d\n", bbsnet_conf[n].charset, tocode, errno);
-		iconv_close(input_cd);
 		goto cleanup;
 	}
 
@@ -688,14 +817,18 @@ static int bbsnet_connect(int n)
 	{
 		if (SSH_v2 && ssh_channel_is_closed(SSH_channel))
 		{
+#ifdef _DEBUG
 			log_error("SSH channel is closed\n");
+#endif
 			loop = 0;
 			break;
 		}
 
 		if (bbsnet_conf[n].use_ssh && ssh_channel_is_closed(channel))
 		{
+#ifdef _DEBUG
 			log_error("Remote SSH channel is closed\n");
+#endif
 			loop = 0;
 			break;
 		}
@@ -790,7 +923,9 @@ static int bbsnet_connect(int n)
 					ret = ssh_channel_read_nonblocking(SSH_channel, input_buf + input_buf_len, sizeof(input_buf) - (uint32_t)input_buf_len, 0);
 					if (ret == SSH_ERROR)
 					{
+#ifdef _DEBUG
 						log_error("ssh_channel_read_nonblocking() error: %s\n", ssh_get_error(SSH_session));
+#endif
 						loop = 0;
 						break;
 					}
@@ -893,7 +1028,9 @@ static int bbsnet_connect(int n)
 					ret = ssh_channel_write(channel, input_conv + input_conv_offset, (uint32_t)(input_conv_len - input_conv_offset));
 					if (ret == SSH_ERROR)
 					{
+#ifdef _DEBUG
 						log_error("ssh_channel_write() error: %s\n", ssh_get_error(session));
+#endif
 						loop = 0;
 						break;
 					}
@@ -915,7 +1052,9 @@ static int bbsnet_connect(int n)
 					}
 					else
 					{
+#ifdef _DEBUG
 						log_error("write(socket) error (%d)\n", errno);
+#endif
 						loop = 0;
 						break;
 					}
@@ -953,7 +1092,9 @@ static int bbsnet_connect(int n)
 													   (uint32_t)(sizeof(output_buf) - (size_t)output_buf_len), 0);
 					if (ret == SSH_ERROR)
 					{
+#ifdef _DEBUG
 						log_error("ssh_channel_read_nonblocking() error: %s\n", ssh_get_error(session));
+#endif
 						loop = 0;
 						break;
 					}
@@ -986,7 +1127,9 @@ static int bbsnet_connect(int n)
 					}
 					else
 					{
+#ifdef _DEBUG
 						log_error("read(socket) error (%d)\n", errno);
+#endif
 						loop = 0;
 						break;
 					}
@@ -1027,7 +1170,9 @@ static int bbsnet_connect(int n)
 					ret = ssh_channel_write(SSH_channel, output_conv + output_conv_offset, (uint32_t)(output_conv_len - output_conv_offset));
 					if (ret == SSH_ERROR)
 					{
+#ifdef _DEBUG
 						log_error("ssh_channel_write() error: %s\n", ssh_get_error(SSH_session));
+#endif
 						loop = 0;
 						break;
 					}
@@ -1049,7 +1194,9 @@ static int bbsnet_connect(int n)
 					}
 					else
 					{
+#ifdef _DEBUG
 						log_error("write(STDOUT) error (%d)\n", errno);
+#endif
 						loop = 0;
 						break;
 					}
@@ -1078,12 +1225,18 @@ static int bbsnet_connect(int n)
 		}
 	}
 
-	iconv_close(input_cd);
-	iconv_close(output_cd);
-
 cleanup:
+	if (input_cd != (iconv_t)(-1))
+	{
+		iconv_close(input_cd);
+	}
+	if (output_cd != (iconv_t)(-1))
+	{
+		iconv_close(output_cd);
+	}
+
 #ifdef HAVE_SYS_EPOLL_H
-	if (close(epollfd) < 0)
+	if (epollfd != -1 && close(epollfd) < 0)
 	{
 		log_error("close(epoll) error (%d)\n");
 	}
@@ -1091,26 +1244,42 @@ cleanup:
 
 	if (bbsnet_conf[n].use_ssh)
 	{
-		ssh_channel_free(channel);
-		ssh_disconnect(session);
-		ssh_free(session);
+		if (channel != NULL)
+		{
+			ssh_channel_free(channel);
+		}
+		if (session != NULL)
+		{
+			ssh_disconnect(session);
+			ssh_free(session);
+		}
 	}
 
 	// Restore STDIN/STDOUT flags
-	fcntl(STDIN_FILENO, F_SETFL, flags_stdin);
-	fcntl(STDOUT_FILENO, F_SETFL, flags_stdout);
+	if (flags_stdin != -1 && fcntl(STDIN_FILENO, F_SETFL, flags_stdin) == -1)
+	{
+		log_error("fcntl(F_SETFL) error (%d)\n", errno);
+	}
+	if (flags_stdout != -1 && fcntl(STDOUT_FILENO, F_SETFL, flags_stdout) == -1)
+	{
+		log_error("fcntl(F_SETFL) error (%d)\n", errno);
+	}
 
-	if (close(sock) == -1)
+	if (sock != -1 && close(sock) == -1)
 	{
 		log_error("Close socket failed\n");
 	}
 
+	if (res)
+	{
+		freeaddrinfo(res);
+	}
+
 	t_used = time(NULL) - t_used;
 	tm_used = gmtime(&t_used);
 
 	log_common("BBSNET disconnect, %d days %d hours %d minutes %d seconds used\n",
-			   tm_used->tm_mday - 1, tm_used->tm_hour, tm_used->tm_min,
-			   tm_used->tm_sec);
+			   tm_used->tm_yday, tm_used->tm_hour, tm_used->tm_min, tm_used->tm_sec);
 
 	BBS_last_access_tm = time(NULL);
 
@@ -1148,14 +1317,16 @@ static int bbsnet_selchange()
 
 	moveto(20, 1);
 	clrtoeol();
-	prints("|\033[1m单位: \033[1;33m%s\033[m%*s  站名: \033[1;33m%s\033[m",
-		   bbsnet_conf[i].host2, 20 - str_length(bbsnet_conf[i].host2, 1), "", bbsnet_conf[i].host1);
+	prints("|\033[1m单位: \033[1;33m%s\033[m%*s  站名: \033[1;33m%s\033[m%*s  类型: \033[1;33m%s\033[m",
+		   bbsnet_conf[i].org_name, 20 - str_length(bbsnet_conf[i].org_name, 1), "",
+		   bbsnet_conf[i].site_name, 20 - str_length(bbsnet_conf[i].site_name, 1), "",
+		   (bbsnet_conf[i].use_ssh ? "SSH" : "Telnet"));
 	moveto(20, 80);
 	prints("|");
 	moveto(21, 1);
 	clrtoeol();
-	prints("|\033[1m连往: \033[1;33m%-20s\033[m  端口: \033[1;33m%-5d\033[m            类型: \033[1;33m%s\033[m",
-		   bbsnet_conf[i].ip, bbsnet_conf[i].port, (bbsnet_conf[i].use_ssh ? "SSH" : "Telnet"));
+	prints("|\033[1m连往: \033[1;33m%-20s\033[m  端口: \033[1;33m%-5s\033[m                 编码: \033[1;33m%s\033[m",
+		   bbsnet_conf[i].host_name, bbsnet_conf[i].port, bbsnet_conf[i].charset);
 	moveto(21, 80);
 	prints("|");
 	iflush();
@@ -1167,7 +1338,14 @@ int bbs_net()
 {
 	int ch, i;
 
-	load_bbsnet_conf(CONF_BBSNET);
+	if (load_bbsnet_conf(CONF_BBSNET) < 0)
+	{
+		clearscr();
+		moveto(1, 1);
+		prints("加载穿梭配置失败！");
+		press_any_key();
+		return -1;
+	}
 
 	bbsnet_refresh();
 	display_menu(&bbsnet_menu);
@@ -1185,7 +1363,9 @@ int bbs_net()
 		switch (ch)
 		{
 		case KEY_NULL: // broken pipe
+#ifdef _DEBUG
 			log_error("KEY_NULL\n");
+#endif
 			goto cleanup;
 		case KEY_TIMEOUT:
 			if (time(NULL) - BBS_last_access_tm >= BBS_max_user_idle_time)