--- lbbs/src/common.c 2025/05/26 12:06:05 1.23 +++ lbbs/src/common.c 2025/06/21 02:15:18 1.34 @@ -14,18 +14,14 @@ * * ***************************************************************************/ -#define _POSIX_C_SOURCE 200112L - #include "common.h" #include "log.h" #include "menu.h" +#include #include #include #include -// Version information -char app_version[256] = "LBBS-devel version 1.0"; - // File loader const char *data_files_load_startup[] = { DATA_WELCOME, @@ -39,24 +35,25 @@ const char *data_files_load_startup[] = VAR_BBS_TOP}; int data_files_load_startup_count = 9; // Count of data_files_load_startup[] -const char *data_files_load_timeval[] = { - VAR_BBS_TOP}; -int data_files_load_timeval_count = 1; // Count of data_files_load_timeval[] - // Global declaration for sockets -int socket_server; +int socket_server[2]; int socket_client; -char hostaddr_server[50]; -char hostaddr_client[50]; -int port_server; +char hostaddr_client[IP_ADDR_LEN]; int port_client; +// SSHv2 +int SSH_v2 = 0; +ssh_bind sshbind; +ssh_session SSH_session; +ssh_channel SSH_channel; + // Global declaration for system volatile int SYS_server_exit = 0; volatile int SYS_child_process_count = 0; volatile int SYS_child_exit = 0; -volatile int SYS_menu_reload = 0; +volatile int SYS_conf_reload = 0; volatile int SYS_data_file_reload = 0; +volatile int SYS_section_list_reload = 0; static const char *weekday[] = { "天", "一", "二", "三", "四", "五", "六"}; @@ -69,7 +66,7 @@ const char *get_time_str(char *s, size_t time(&curtime); localtime_r(&curtime, &local_tm); - size_t j = strftime(s, len, "%Y年%m月%d日%H:%M:%S 星期", &local_tm); + size_t j = strftime(s, len, "%b %d %H:%M 星期", &local_tm); if (j == 0 || j + strlen(weekday[local_tm.tm_wday]) + 1 > len) { @@ -83,8 +80,9 @@ const char *get_time_str(char *s, size_t void sig_hup_handler(int i) { - SYS_menu_reload = 1; + SYS_conf_reload = 1; SYS_data_file_reload = 1; + SYS_section_list_reload = 1; } void sig_term_handler(int i)