--- lbbs/src/bbs_net.c 2025/11/04 13:49:51 1.76 +++ lbbs/src/bbs_net.c 2025/11/11 00:28:05 1.81 @@ -3,9 +3,13 @@ * bbs_net * - user interactive feature of site shuttle * - * Copyright (C) 2004-2025 by Leaflet + * Copyright (C) 2004-2025 Leaflet */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "bbs.h" #include "common.h" #include "io.h" @@ -33,11 +37,14 @@ #include #include -#define MENU_CONF_DELIM " \t\r\n" +static const char MENU_CONF_DELIM[] = " \t\r\n"; -#define MAX_PROCESS_BAR_LEN 30 -#define MAXSTATION 26 * 2 -#define STATION_PER_LINE 4 +enum _bbs_net_constant_t +{ + MAX_PROCESS_BAR_LEN = 30, + MAXSTATION = 26 * 2, + STATION_PER_LINE = 4, +}; struct _bbsnet_conf { @@ -45,7 +52,7 @@ struct _bbsnet_conf char host2[40]; char ip[40]; in_port_t port; - char charset[20]; + char charset[CHARSET_MAX_LEN + 1]; } bbsnet_conf[MAXSTATION]; static MENU_SET bbsnet_menu; @@ -476,7 +483,7 @@ static int bbsnet_connect(int n) } else if (nfds == 0) // timeout { - if (time(NULL) - BBS_last_access_tm >= MAX_DELAY_TIME) + if (time(NULL) - BBS_last_access_tm >= BBS_max_user_idle_time) { break; } @@ -874,7 +881,7 @@ extern int bbs_net() log_error("KEY_NULL\n"); goto cleanup; case KEY_TIMEOUT: - if (time(NULL) - BBS_last_access_tm >= MAX_DELAY_TIME) + if (time(NULL) - BBS_last_access_tm >= BBS_max_user_idle_time) { log_error("User input timeout\n"); goto cleanup;