--- lbbs/src/bbs_main.c	2025/05/10 15:32:36	1.41
+++ lbbs/src/bbs_main.c	2025/06/07 08:33:08	1.65
@@ -16,7 +16,6 @@
 
 #include "bbs_main.h"
 #include "bbs.h"
-#include "welcome.h"
 #include "login.h"
 #include "user_priv.h"
 #include "common.h"
@@ -26,23 +25,188 @@
 #include "screen.h"
 #include "menu.h"
 #include "bbs_cmd.h"
+#include "section_list.h"
+#include "trie_dict.h"
 #include <unistd.h>
 #include <time.h>
 #include <string.h>
+#include <stdlib.h>
 
 int bbs_info()
 {
 	prints("欢迎光临 \033[1;33m%s \033[32m[%s]  \033[37m( %s )\r\n",
-		   BBS_name, BBS_server, app_version);
+		   BBS_name, BBS_server, APP_NAME_VER);
+
+	return iflush();
+}
+
+int bbs_welcome(void)
+{
+	char sql[SQL_BUFFER_LEN];
+
+	u_int32_t u_online = 0;
+	u_int32_t u_anonymous = 0;
+	u_int32_t u_total = 0;
+	u_int32_t max_u_online = 0;
+	u_int32_t u_login_count = 0;
+
+	MYSQL *db;
+	MYSQL_RES *rs;
+	MYSQL_ROW row;
+
+	db = db_open();
+	if (db == NULL)
+	{
+		return -1;
+	}
+
+	snprintf(sql, sizeof(sql),
+			 "SELECT COUNT(*) AS cc FROM "
+			 "(SELECT DISTINCT SID FROM user_online "
+			 "WHERE last_tm >= SUBDATE(NOW(), INTERVAL %d SECOND)) AS t1",
+			 BBS_user_off_line);
+	if (mysql_query(db, sql) != 0)
+	{
+		log_error("Query user_online error: %s\n", mysql_error(db));
+		mysql_close(db);
+		return -2;
+	}
+	if ((rs = mysql_store_result(db)) == NULL)
+	{
+		log_error("Get user_online data failed\n");
+		mysql_close(db);
+		return -2;
+	}
+	if ((row = mysql_fetch_row(rs)))
+	{
+		u_online = (u_int32_t)atoi(row[0]);
+	}
+	mysql_free_result(rs);
+
+	snprintf(sql, sizeof(sql),
+			 "SELECT COUNT(*) AS cc FROM "
+			 "(SELECT DISTINCT SID FROM user_online "
+			 "WHERE UID = 0 AND last_tm >= SUBDATE(NOW(), INTERVAL %d SECOND)) AS t1",
+			 BBS_user_off_line);
+	if (mysql_query(db, sql) != 0)
+	{
+		log_error("Query user_online error: %s\n", mysql_error(db));
+		mysql_close(db);
+		return -2;
+	}
+	if ((rs = mysql_store_result(db)) == NULL)
+	{
+		log_error("Get user_online data failed\n");
+		mysql_close(db);
+		return -2;
+	}
+	if ((row = mysql_fetch_row(rs)))
+	{
+		u_anonymous = (u_int32_t)atoi(row[0]);
+	}
+	mysql_free_result(rs);
+
+	snprintf(sql, sizeof(sql), "SELECT COUNT(UID) AS cc FROM user_list WHERE enable");
+	if (mysql_query(db, sql) != 0)
+	{
+		log_error("Query user_list error: %s\n", mysql_error(db));
+		mysql_close(db);
+		return -2;
+	}
+	if ((rs = mysql_store_result(db)) == NULL)
+	{
+		log_error("Get user_list data failed\n");
+		mysql_close(db);
+		return -2;
+	}
+	if ((row = mysql_fetch_row(rs)))
+	{
+		u_total = (u_int32_t)atoi(row[0]);
+	}
+	mysql_free_result(rs);
+
+	snprintf(sql, sizeof(sql), "SELECT ID FROM user_login_log ORDER BY ID LIMIT 1");
+	if (mysql_query(db, sql) != 0)
+	{
+		log_error("Query user_login_log error: %s\n", mysql_error(db));
+		mysql_close(db);
+		return -2;
+	}
+	if ((rs = mysql_store_result(db)) == NULL)
+	{
+		log_error("Get user_login_log data failed\n");
+		mysql_close(db);
+		return -2;
+	}
+	if ((row = mysql_fetch_row(rs)))
+	{
+		u_login_count = (u_int32_t)atoi(row[0]);
+	}
+	mysql_free_result(rs);
+
+	mysql_close(db);
+
+	// Log max user_online
+	FILE *fin, *fout;
+	if ((fin = fopen(VAR_MAX_USER_ONLINE, "r")) != NULL)
+	{
+		fscanf(fin, "%d", &max_u_online);
+		fclose(fin);
+	}
+	if (u_online > max_u_online)
+	{
+		max_u_online = u_online;
+		if ((fout = fopen(VAR_MAX_USER_ONLINE, "w")) == NULL)
+		{
+			log_error("Open max_user_online.dat failed\n");
+			return -3;
+		}
+		fprintf(fout, "%d\n", max_u_online);
+		fclose(fout);
+	}
+
+	// Count current user before login
+	u_online++;
+	u_anonymous++;
+
+	// Display logo
+	display_file(DATA_WELCOME, 1, 2);
+
+	// Display welcome message
+	prints("\r\033[1;35m欢迎光临\033[33m 【 %s 】 \033[35mBBS\r\n"
+		   "\033[32m目前上站人数 [\033[36m%d/%d\033[32m] "
+		   "匿名游客[\033[36m%d\033[32m] "
+		   "注册用户数[\033[36m%d/%d\033[32m]\r\n"
+		   "从 [\033[36m%s\033[32m] 起，最高人数记录："
+		   "[\033[36m%d\033[32m]，累计访问人次：[\033[36m%d\033[32m]\033[m\r\n",
+		   BBS_name, u_online, BBS_max_client, u_anonymous, u_total,
+		   BBS_max_user, BBS_start_dt, max_u_online, u_login_count);
 
 	iflush();
 
 	return 0;
 }
 
-int bbs_exit()
+int bbs_logout(void)
 {
-	display_file_ex(DATA_GOODBYE, 1, 0);
+	MYSQL *db;
+
+	db = db_open();
+	if (db == NULL)
+	{
+		return -1;
+	}
+
+	if (user_online_del(db) < 0)
+	{
+		return -2;
+	}
+
+	mysql_close(db);
+
+	display_file(DATA_GOODBYE, 1, 1);
+
+	log_common("User logout\n");
 
 	return 0;
 }
@@ -56,49 +220,59 @@ int bbs_center()
 
 	clearscr();
 
-	show_top("");
+	show_top("", BBS_name, "");
 	show_active_board();
 	show_bottom("");
-	display_menu(get_menu(&bbs_menu, "TOPMENU"));
+	display_menu(p_bbs_menu);
+	iflush();
 
 	while (!SYS_server_exit)
 	{
-		ch = igetch(0);
+		ch = igetch(100);
 
-		if (time(0) - t_last_action >= 10)
+		if (p_bbs_menu->choose_step == 0 && time(0) - t_last_action >= 10)
 		{
 			t_last_action = time(0);
+
 			show_active_board();
 			show_bottom("");
+			display_menu_cursor(p_bbs_menu, 1);
+			iflush();
 		}
 
 		switch (ch)
 		{
-		case KEY_NULL:
+		case KEY_NULL: // broken pipe
+			return 0;
 		case KEY_TIMEOUT:
 			if (time(0) - BBS_last_access_tm >= MAX_DELAY_TIME)
 			{
 				return 0;
 			}
 			continue;
+		case CR:
+			igetch_reset();
 		default:
-			switch (menu_control(&bbs_menu, ch))
+			switch (menu_control(p_bbs_menu, ch))
 			{
 			case EXITBBS:
 				return 0;
 			case REDRAW:
+				t_last_action = time(0);
 				clearscr();
-				show_top("");
+				show_top("", BBS_name, "");
 				show_active_board();
 				show_bottom("");
-				display_current_menu(&bbs_menu);
+				display_menu(p_bbs_menu);
 				break;
 			case NOREDRAW:
 			case UNKNOWN_CMD:
 			default:
 				break;
 			}
+			iflush();
 		}
+
 		BBS_last_access_tm = time(0);
 	}
 
@@ -107,42 +281,75 @@ int bbs_center()
 
 int bbs_main()
 {
-	int ret;
+	// Set data pools in shared memory readonly
+	if (set_trie_dict_shm_readonly() < 0)
+	{
+		goto cleanup;
+	}
+	if (set_article_block_shm_readonly() < 0)
+	{
+		goto cleanup;
+	}
+	if (set_section_list_shm_readonly() < 0)
+	{
+		goto cleanup;
+	}
+
+	// Load menu in shared memory
+	if (set_menu_shm_readonly(p_bbs_menu) < 0)
+	{
+		goto cleanup;
+	}
 
 	set_input_echo(0);
 
-	bbs_info();
+	// System info
+	if (bbs_info() < 0)
+	{
+		goto cleanup;
+	}
 
 	// Welcome
-	bbs_welcome();
+	if (bbs_welcome() < 0)
+	{
+		goto cleanup;
+	}
+
+	// User login
+	if (SSH_v2)
+	{
+		prints("\033[1m%s 欢迎使用ssh方式访问 \033[1;33m按任意键继续...\033[m", BBS_username);
+		iflush();
+		igetch_t(MAX_DELAY_TIME);
+	}
+	else if (bbs_login() < 0)
+	{
+		goto cleanup;
+	}
+
+	// Load article_view_log
 
-	// Login
-	ret = bbs_login();
-	if (ret < 0)
-		return -1;
-	log_std("User \"%s\"(%ld) login from %s:%d\n",
-			BBS_username, BBS_priv.uid, hostaddr_client, port_client);
 	clearscr();
 
 	// BBS Top 10
-	display_file_ex("./var/bbs_top.txt", 1, 1);
+	display_file(VAR_BBS_TOP, 1, 1);
 
 	// Main
 	bbs_center();
 
 	// Logout
-	bbs_exit();
-	log_std("User logout\n");
+	bbs_logout();
 
-	MYSQL *db = db_open();
-	if (db == NULL)
-	{
-		return -1;
-	}
-
-	user_online_del(db);
-
-	mysql_close(db);
+cleanup:
+	// Detach menu in shared memory
+	detach_menu_shm(p_bbs_menu);
+	free(p_bbs_menu);
+	p_bbs_menu = NULL;
+
+	// Detach data pools shm
+	detach_section_list_shm();
+	detach_article_block_shm();
+	detach_trie_dict_shm();
 
 	return 0;
 }