--- lbbs/src/net_server.c	2025/06/17 01:24:21	1.60
+++ lbbs/src/net_server.c	2025/06/25 02:49:20	1.67
@@ -14,38 +14,36 @@
  *                                                                         *
  ***************************************************************************/
 
-#define _XOPEN_SOURCE 500
-#define _POSIX_C_SOURCE 200809L
-#define _GNU_SOURCE
-
-#include "net_server.h"
-#include "common.h"
-#include "bbs_main.h"
 #include "bbs.h"
-#include "log.h"
+#include "bbs_main.h"
+#include "common.h"
+#include "database.h"
+#include "file_loader.h"
 #include "io.h"
 #include "init.h"
-#include "menu.h"
-#include "database.h"
+#include "log.h"
 #include "login.h"
-#include "file_loader.h"
+#include "menu.h"
+#include "net_server.h"
+#include "section_list.h"
 #include "section_list_loader.h"
 #include <errno.h>
 #include <fcntl.h>
-#include <string.h>
 #include <signal.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
-#include <sys/syscall.h>
-#include <sys/socket.h>
-#include <sys/wait.h>
-#include <sys/epoll.h>
 #include <arpa/inet.h>
-#include <netinet/in.h>
-#include <systemd/sd-daemon.h>
+#include <libssh/callbacks.h>
 #include <libssh/libssh.h>
 #include <libssh/server.h>
-#include <libssh/callbacks.h>
+#include <netinet/in.h>
+#include <sys/epoll.h>
+#include <sys/socket.h>
+#include <sys/syscall.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <systemd/sd-daemon.h>
 
 struct process_sockaddr_t
 {
@@ -261,7 +259,7 @@ int net_server(const char *hostaddr, in_
 	int nfds, epollfd;
 	siginfo_t siginfo;
 	int sd_notify_stopping = 0;
-	MENU_SET *p_bbs_menu_new;
+	MENU_SET bbs_menu_new;
 	int i, j;
 	pid_t pid;
 	int ssh_log_level = SSH_LOG_NOLOG;
@@ -273,6 +271,7 @@ int net_server(const char *hostaddr, in_
 	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_ALGORITHMS, "ssh-rsa,rsa-sha2-512,rsa-sha2-256") < 0 ||
 		ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_LOG_VERBOSITY, &ssh_log_level) < 0)
 	{
 		log_error("Error setting SSH bind options: %s\n", ssh_get_error(sshbind));
@@ -421,28 +420,32 @@ int net_server(const char *hostaddr, in_
 				log_error("Reload conf failed\n");
 			}
 
-			p_bbs_menu_new = calloc(1, sizeof(MENU_SET));
-			if (p_bbs_menu_new == NULL)
+			// acquire rw lock of all sections to avoid conflict with menu reload in data loader process
+			ret = section_list_rw_lock(NULL);
+			if (ret < 0)
 			{
-				log_error("OOM: calloc(MENU_SET)\n");
-			}
-			else if (load_menu(p_bbs_menu_new, CONF_MENU) < 0)
-			{
-				unload_menu(p_bbs_menu_new);
-				free(p_bbs_menu_new);
-				p_bbs_menu_new = NULL;
-
-				log_error("Reload menu failed\n");
+				log_error("section_list_rw_lock(NULL) error\n");
 			}
 			else
 			{
-				unload_menu(p_bbs_menu);
-				free(p_bbs_menu);
-
-				p_bbs_menu = p_bbs_menu_new;
-				p_bbs_menu_new = NULL;
+				if (load_menu(&bbs_menu_new, CONF_MENU) < 0)
+				{
+					unload_menu(&bbs_menu_new);
+					log_error("Reload menu failed\n");
+				}
+				else
+				{
+					unload_menu(&bbs_menu);
+					memcpy(&bbs_menu, &bbs_menu_new, sizeof(bbs_menu_new));
+					log_common("Reload menu successfully\n");
+				}
 
-				log_common("Reload menu successfully\n");
+				// release rw lock of all sections
+				ret = section_list_rw_unlock(NULL);
+				if (ret < 0)
+				{
+					log_error("section_list_rw_unlock(NULL) error\n");
+				}
 			}
 
 			sd_notify(0, "READY=1");
@@ -471,7 +474,7 @@ int net_server(const char *hostaddr, in_
 
 			if (section_list_loader_reload() < 0)
 			{
-				log_error("ksection_list_loader_reload() failed\n");
+				log_error("section_list_loader_reload() failed\n");
 			}
 		}
 
@@ -525,7 +528,7 @@ int net_server(const char *hostaddr, in_
 
 					port_client = ntohs(sin.sin_port);
 
-					log_common("Accept %sconnection from %s:%d\n", (SSH_v2 ? "" : "SSH2 "), hostaddr_client, port_client);
+					log_common("Accept %s connection from %s:%d\n", (SSH_v2 ? "SSH" : "telnet"), hostaddr_client, port_client);
 
 					if (SYS_child_process_count - 1 < BBS_max_client)
 					{