--- lbbs/src/bbs_net.c	2025/12/16 15:20:56	1.90
+++ lbbs/src/bbs_net.c	2025/12/18 01:39:32	1.93
@@ -62,7 +62,7 @@ struct _bbsnet_conf
 	char org_name[40];
 	char site_name[40];
 	char host_name[IP_ADDR_LEN];
-	in_port_t port;
+	char port[6];
 	int8_t use_ssh;
 	char charset[CHARSET_MAX_LEN + 1];
 } bbsnet_conf[MAXSTATION];
@@ -143,7 +143,8 @@ static int load_bbsnet_conf(const char *
 			unload_bbsnet_conf();
 			return -3;
 		}
-		bbsnet_conf[menu_item_id].port = (in_port_t)port;
+		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';
@@ -273,11 +274,11 @@ 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;
@@ -342,43 +343,60 @@ static int bbsnet_connect(int n)
 		   bbsnet_conf[n].site_name, bbsnet_conf[n].host_name);
 	iflush();
 
-	p_host = gethostbyname(bbsnet_conf[n].host_name);
+	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();
+		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();
+		log_error("socket() error (%d)\n", 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;
-
-	if (bind(sock, (struct sockaddr *)&sin, sizeof(sin)) < 0)
+	if (bind(sock, res->ai_addr, res->ai_addrlen) < 0)
 	{
-		log_error("Bind address %s:%u failed (%d)\n",
-				  inet_ntoa(sin.sin_addr), ntohs(sin.sin_port), errno);
+		log_error("bind(%s:%u) error (%d)\n", local_addr, local_port, errno);
 		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);
+	freeaddrinfo(res);
+	res = NULL;
+
+	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("getaddrinfo() error (%d)\n", ret);
+		prints("\033[1;31m查找主机名失败！\033[m\r\n");
+		press_any_key();
+		goto cleanup;
+	}
 
-	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);
@@ -444,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)
 			{
@@ -460,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;
 			}
 		}
@@ -546,7 +562,6 @@ static int bbsnet_connect(int n)
 	{
 		prints("\033[1;31m连接失败！\033[m\r\n");
 		press_any_key();
-
 		goto cleanup;
 	}
 
@@ -802,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;
 		}
@@ -904,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;
 					}
@@ -1007,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;
 					}
@@ -1029,7 +1052,9 @@ static int bbsnet_connect(int n)
 					}
 					else
 					{
+#ifdef _DEBUG
 						log_error("write(socket) error (%d)\n", errno);
+#endif
 						loop = 0;
 						break;
 					}
@@ -1067,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;
 					}
@@ -1100,7 +1127,9 @@ static int bbsnet_connect(int n)
 					}
 					else
 					{
+#ifdef _DEBUG
 						log_error("read(socket) error (%d)\n", errno);
+#endif
 						loop = 0;
 						break;
 					}
@@ -1141,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;
 					}
@@ -1163,7 +1194,9 @@ static int bbsnet_connect(int n)
 					}
 					else
 					{
+#ifdef _DEBUG
 						log_error("write(STDOUT) error (%d)\n", errno);
+#endif
 						loop = 0;
 						break;
 					}
@@ -1237,6 +1270,11 @@ cleanup:
 		log_error("Close socket failed\n");
 	}
 
+	if (res)
+	{
+		freeaddrinfo(res);
+	}
+
 	t_used = time(NULL) - t_used;
 	tm_used = gmtime(&t_used);
 
@@ -1287,7 +1325,7 @@ static int bbsnet_selchange()
 	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",
+	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("|");
@@ -1325,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)