--- lbbs/src/net_server.c 2025/12/01 14:01:36 1.99 +++ lbbs/src/net_server.c 2025/12/16 13:16:47 1.104 @@ -40,6 +40,7 @@ #include #include #include +#include #include #include @@ -114,6 +115,11 @@ static int auth_password(ssh_session ses else { ret = check_user(user, password); + if (ret == 2) // Enforce update user agreement + { + BBS_update_eula = 1; + ret = 0; + } } if (ret == 0) @@ -509,6 +515,7 @@ cleanup: int net_server(const char *hostaddr, in_port_t port[]) { + struct stat file_stat; unsigned int addrlen; int ret; int flags_server[2]; @@ -803,6 +810,16 @@ int net_server(const char *hostaddr, in_ log_error("Reload BWF conf failed\n"); } + // Get EULA modification tm + if (stat(DATA_EULA, &file_stat) == -1) + { + log_error("stat(%s) error\n", DATA_EULA, errno); + } + else + { + BBS_eula_tm = file_stat.st_mtim.tv_sec; + } + if (detach_menu_shm(&bbs_menu) < 0) { log_error("detach_menu_shm(bbs_menu) error\n"); @@ -822,6 +839,7 @@ int net_server(const char *hostaddr, in_ log_error("load_menu(top10_menu) error\n"); unload_menu(&top10_menu); } + top10_menu.allow_exit = 1; for (int i = 0; i < data_files_load_startup_count; i++) { @@ -919,8 +937,6 @@ int net_server(const char *hostaddr, in_ port_client = ntohs(sin.sin_port); - 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) { j = 0; @@ -932,6 +948,9 @@ int net_server(const char *hostaddr, in_ if (j < BBS_max_client_per_ip) { + log_common("Accept %s connection from %s:%d, already have %d connections\n", + (SSH_v2 ? "SSH" : "telnet"), hostaddr_client, port_client, j); + if ((pid = fork_server()) < 0) { log_error("fork_server() error\n"); @@ -947,18 +966,20 @@ int net_server(const char *hostaddr, in_ ret = hash_dict_inc(hash_dict_sockaddr_count, (uint64_t)sin.sin_addr.s_addr, 1); if (ret < 0) { - log_error("hash_dict_inc(hash_dict_sockaddr_count, %s, %d) error\n", hostaddr_client, 1); + log_error("hash_dict_inc(hash_dict_sockaddr_count, %s, 1) error\n", hostaddr_client); } } } else { - log_error("Rejected client connection from %s over limit per IP (%d)\n", hostaddr_client, BBS_max_client_per_ip); + log_error("Rejected %s connection from %s:%d over limit per IP (%d)\n", + (SSH_v2 ? "SSH" : "telnet"), hostaddr_client, port_client, BBS_max_client_per_ip); } } else { - log_error("Rejected client connection over limit (%d)\n", SYS_child_process_count - 1); + log_error("Rejected %s connection from %s:%d over limit (%d)\n", + (SSH_v2 ? "SSH" : "telnet"), hostaddr_client, port_client, SYS_child_process_count - 1); } if (close(socket_client) == -1)