--- lbbs/src/bbs_net.c 2025/11/30 11:59:18 1.86 +++ lbbs/src/bbs_net.c 2025/12/16 12:59:14 1.89 @@ -68,6 +68,8 @@ struct _bbsnet_conf static MENU_SET bbsnet_menu; +static void unload_bbsnet_conf(void); + static int load_bbsnet_conf(const char *file_config) { FILE *fp; @@ -75,18 +77,15 @@ static int load_bbsnet_conf(const char * MENU_ITEM *p_menu_item; MENU_ITEM_ID menu_item_id; char line[LINE_BUFFER_LEN], *t1, *t2, *t3, *t4, *t5, *t6, *saveptr; + int port; - fp = fopen(file_config, "r"); - if (fp == NULL) - { - return -1; - } + unload_bbsnet_conf(); bbsnet_menu.p_menu_pool = calloc(1, sizeof(MENU)); if (bbsnet_menu.p_menu_pool == NULL) { log_error("calloc(p_menu_pool) error\n"); - return -3; + return -1; } bbsnet_menu.menu_count = 1; @@ -94,7 +93,8 @@ static int load_bbsnet_conf(const char * if (bbsnet_menu.p_menu_item_pool == NULL) { log_error("calloc(p_menu_item_pool) error\n"); - return -3; + unload_bbsnet_conf(); + return -1; } bbsnet_menu.menu_item_count = MAXSTATION; @@ -105,6 +105,13 @@ static int load_bbsnet_conf(const char * p_menu->title.show = 0; p_menu->screen_show = 0; + fp = fopen(file_config, "r"); + if (fp == NULL) + { + unload_bbsnet_conf(); + return -2; + } + menu_item_id = 0; while (fgets(line, sizeof(line), fp) && menu_item_id < MAXSTATION) { @@ -127,7 +134,15 @@ static int load_bbsnet_conf(const char * bbsnet_conf[menu_item_id].org_name[sizeof(bbsnet_conf[menu_item_id].org_name) - 1] = '\0'; strncpy(bbsnet_conf[menu_item_id].host_name, t3, sizeof(bbsnet_conf[menu_item_id].host_name) - 1); bbsnet_conf[menu_item_id].host_name[sizeof(bbsnet_conf[menu_item_id].host_name) - 1] = '\0'; - bbsnet_conf[menu_item_id].port = (in_port_t)(t4 ? atoi(t4) : 23); + port = atoi(t4); + if (port <= 0 || port > 65535) + { + log_error("Invalid port value %d of menu item %d\n", port, menu_item_id); + fclose(fp); + unload_bbsnet_conf(); + return -3; + } + bbsnet_conf[menu_item_id].port = (in_port_t)port; bbsnet_conf[menu_item_id].use_ssh = (toupper(t5[0]) == 'Y'); strncpy(bbsnet_conf[menu_item_id].charset, t6, sizeof(bbsnet_conf[menu_item_id].charset) - 1); bbsnet_conf[menu_item_id].charset[sizeof(bbsnet_conf[menu_item_id].charset) - 1] = '\0'; @@ -136,7 +151,9 @@ static int load_bbsnet_conf(const char * if (p_menu_item == NULL) { log_error("get_menu_item_by_id(%d) return NULL pointer\n", menu_item_id); - return -1; + fclose(fp); + unload_bbsnet_conf(); + return -3; } p_menu_item->row = (int16_t)(2 + menu_item_id / STATION_PER_LINE); @@ -148,7 +165,7 @@ static int load_bbsnet_conf(const char * p_menu_item->name[0] = (char)(menu_item_id < MAXSTATION / 2 ? 'A' + menu_item_id : 'a' + menu_item_id); p_menu_item->name[1] = '\0'; - snprintf(p_menu_item->text, sizeof(p_menu_item->text), "%c. %s", + snprintf(p_menu_item->text, sizeof(p_menu_item->text), "\033[1;36m%c.\033[m %s", p_menu_item->name[0], bbsnet_conf[menu_item_id].site_name); p_menu->items[p_menu->item_count] = menu_item_id; @@ -171,10 +188,17 @@ static void unload_bbsnet_conf(void) bbsnet_menu.menu_count = 0; bbsnet_menu.menu_item_count = 0; - free(bbsnet_menu.p_menu_pool); - bbsnet_menu.p_menu_pool = NULL; - free(bbsnet_menu.p_menu_item_pool); - bbsnet_menu.p_menu_item_pool = NULL; + if (bbsnet_menu.p_menu_pool) + { + free(bbsnet_menu.p_menu_pool); + bbsnet_menu.p_menu_pool = NULL; + } + + if (bbsnet_menu.p_menu_item_pool) + { + free(bbsnet_menu.p_menu_item_pool); + bbsnet_menu.p_menu_item_pool = NULL; + } } static void process_bar(int n, int len) @@ -182,7 +206,11 @@ static void process_bar(int n, int len) char buf[LINE_BUFFER_LEN]; char buf2[LINE_BUFFER_LEN]; - if (len > LINE_BUFFER_LEN) + if (len <= 0) + { + len = 1; + } + else if (len > LINE_BUFFER_LEN) { len = LINE_BUFFER_LEN - 1; } @@ -207,12 +235,14 @@ static void process_bar(int n, int len) static int bbsnet_connect(int n) { - int sock, ret, loop, error; + int sock = -1; + int ret; + int loop; + int error; int sock_connected = 0; - int flags_sock; - int flags_stdin; - int flags_stdout; - int len; + int flags_sock = -1; + int flags_stdin = -1; + int flags_stdout = -1; struct sockaddr_in sin; char input_buf[LINE_BUFFER_LEN]; char output_buf[LINE_BUFFER_LEN]; @@ -226,13 +256,13 @@ static int bbsnet_connect(int n) int output_conv_len = 0; int input_conv_offset = 0; int output_conv_offset = 0; - iconv_t input_cd = NULL; - iconv_t output_cd = NULL; - char tocode[32]; + iconv_t input_cd = (iconv_t)(-1); + iconv_t output_cd = (iconv_t)(-1); + char tocode[CHARSET_MAX_LEN + 20]; #ifdef HAVE_SYS_EPOLL_H struct epoll_event ev, events[MAX_EVENTS]; - int epollfd; + int epollfd = -1; #else struct pollfd pfds[3]; #endif @@ -257,7 +287,8 @@ static int bbsnet_connect(int n) ssh_session session = NULL; ssh_channel channel = NULL; int ssh_process_config = 0; - int ssh_log_level = SSH_LOG_PROTOCOL; + int ssh_log_level = SSH_LOG_NOLOG; + long ssh_timeout = 0; if (user_online_update("BBS_NET") < 0) { @@ -316,7 +347,7 @@ static int bbsnet_connect(int n) { prints("\033[1;31m查找主机名失败！\033[m\r\n"); press_any_key(); - return -1; + goto cleanup; } sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); @@ -325,7 +356,7 @@ static int bbsnet_connect(int n) { prints("\033[1;31m无法创建socket！\033[m\r\n"); press_any_key(); - return -1; + goto cleanup; } sin.sin_family = AF_INET; @@ -336,7 +367,7 @@ static int bbsnet_connect(int n) { log_error("Bind address %s:%u failed (%d)\n", inet_ntoa(sin.sin_addr), ntohs(sin.sin_port), errno); - return -2; + goto cleanup; } memset(&sin, 0, sizeof(sin)); @@ -352,21 +383,45 @@ static int bbsnet_connect(int n) process_bar(0, MAX_PROCESS_BAR_LEN); // Set socket as non-blocking - flags_sock = fcntl(sock, F_GETFL, 0); - fcntl(sock, F_SETFL, flags_sock | O_NONBLOCK); + if ((flags_sock = fcntl(sock, F_GETFL, 0)) == -1) + { + log_error("fcntl(F_GETFL) error (%d)\n", errno); + goto cleanup; + } + if ((fcntl(sock, F_SETFL, flags_sock | O_NONBLOCK)) == -1) + { + log_error("fcntl(F_SETFL) error (%d)\n", errno); + goto cleanup; + } // Set STDIN/STDOUT as non-blocking - flags_stdin = fcntl(STDIN_FILENO, F_GETFL, 0); - flags_stdout = fcntl(STDOUT_FILENO, F_GETFL, 0); - fcntl(STDIN_FILENO, F_SETFL, flags_stdin | O_NONBLOCK); - fcntl(STDOUT_FILENO, F_SETFL, flags_stdout | O_NONBLOCK); + if ((flags_stdin = fcntl(STDIN_FILENO, F_GETFL, 0)) == -1) + { + log_error("fcntl(F_GETFL) error (%d)\n", errno); + goto cleanup; + } + if ((flags_stdout = fcntl(STDOUT_FILENO, F_GETFL, 0)) == -1) + { + log_error("fcntl(F_GETFL) error (%d)\n", errno); + goto cleanup; + } + if ((fcntl(STDIN_FILENO, F_SETFL, flags_stdin | O_NONBLOCK)) == -1) + { + log_error("fcntl(F_SETFL) error (%d)\n", errno); + goto cleanup; + } + if ((fcntl(STDOUT_FILENO, F_SETFL, flags_stdout | O_NONBLOCK)) == -1) + { + log_error("fcntl(F_SETFL) error (%d)\n", errno); + goto cleanup; + } #ifdef HAVE_SYS_EPOLL_H epollfd = epoll_create1(0); if (epollfd < 0) { log_error("epoll_create1() error (%d)\n", errno); - return -1; + goto cleanup; } ev.events = EPOLLOUT | EPOLLET; @@ -453,10 +508,10 @@ static int bbsnet_connect(int n) if (pfds[i].fd == sock && (pfds[i].revents & POLLOUT)) #endif { - len = sizeof(error); - if (getsockopt(sock, SOL_SOCKET, SO_ERROR, &error, (socklen_t *)&len) < 0) + socklen_t len = sizeof(error); + if (getsockopt(sock, SOL_SOCKET, SO_ERROR, &error, &len) < 0) { - log_error("getsockopt() error (%d) !\n", error); + log_error("getsockopt() error (%d) !\n", errno); goto cleanup; } if (error == 0) @@ -532,7 +587,12 @@ static int bbsnet_connect(int n) goto cleanup; } - ssh_set_blocking(session, 0); + ssh_timeout = 5; // second + if (ssh_options_set(session, SSH_OPTIONS_TIMEOUT, &ssh_timeout) < 0) + { + log_error("Error setting SSH options: %s\n", ssh_get_error(session)); + goto cleanup; + } while (!SYS_server_exit) { @@ -661,6 +721,15 @@ static int bbsnet_connect(int n) goto cleanup; } } + + ssh_timeout = 0; // second + if (ssh_options_set(session, SSH_OPTIONS_TIMEOUT, &ssh_timeout) < 0) + { + log_error("Error setting SSH options: %s\n", ssh_get_error(session)); + goto cleanup; + } + + ssh_set_blocking(session, 0); } prints("\033[1;31m连接成功！\033[m\r\n"); @@ -683,7 +752,6 @@ static int bbsnet_connect(int n) if (output_cd == (iconv_t)(-1)) { log_error("iconv_open(%s->%s) error: %d\n", bbsnet_conf[n].charset, tocode, errno); - iconv_close(input_cd); goto cleanup; } @@ -1102,12 +1170,18 @@ static int bbsnet_connect(int n) } } - iconv_close(input_cd); - iconv_close(output_cd); - cleanup: + if (input_cd != (iconv_t)(-1)) + { + iconv_close(input_cd); + } + if (output_cd != (iconv_t)(-1)) + { + iconv_close(output_cd); + } + #ifdef HAVE_SYS_EPOLL_H - if (close(epollfd) < 0) + if (epollfd != -1 && close(epollfd) < 0) { log_error("close(epoll) error (%d)\n"); } @@ -1115,16 +1189,28 @@ cleanup: if (bbsnet_conf[n].use_ssh) { - ssh_channel_free(channel); - ssh_disconnect(session); - ssh_free(session); + if (channel != NULL) + { + ssh_channel_free(channel); + } + if (session != NULL) + { + ssh_disconnect(session); + ssh_free(session); + } } // Restore STDIN/STDOUT flags - fcntl(STDIN_FILENO, F_SETFL, flags_stdin); - fcntl(STDOUT_FILENO, F_SETFL, flags_stdout); + if (flags_stdin != -1 &&fcntl(STDIN_FILENO, F_SETFL, flags_stdin) == -1) + { + log_error("fcntl(F_SETFL) error (%d)\n", errno); + } + if (flags_stdout != -1 && fcntl(STDOUT_FILENO, F_SETFL, flags_stdout) == -1) + { + log_error("fcntl(F_SETFL) error (%d)\n", errno); + } - if (close(sock) == -1) + if (sock != -1 && close(sock) == -1) { log_error("Close socket failed\n"); } @@ -1172,14 +1258,16 @@ static int bbsnet_selchange() moveto(20, 1); clrtoeol(); - prints("|\033[1m单位: \033[1;33m%s\033[m%*s 站名: \033[1;33m%s\033[m", - bbsnet_conf[i].org_name, 20 - str_length(bbsnet_conf[i].org_name, 1), "", bbsnet_conf[i].site_name); + prints("|\033[1m单位: \033[1;33m%s\033[m%*s 站名: \033[1;33m%s\033[m%*s 类型: \033[1;33m%s\033[m", + bbsnet_conf[i].org_name, 20 - str_length(bbsnet_conf[i].org_name, 1), "", + bbsnet_conf[i].site_name, 20 - str_length(bbsnet_conf[i].site_name, 1), "", + (bbsnet_conf[i].use_ssh ? "SSH" : "Telnet")); moveto(20, 80); prints("|"); moveto(21, 1); clrtoeol(); - prints("|\033[1m连往: \033[1;33m%-20s\033[m 端口: \033[1;33m%-5d\033[m 类型: \033[1;33m%s\033[m", - bbsnet_conf[i].host_name, bbsnet_conf[i].port, (bbsnet_conf[i].use_ssh ? "SSH" : "Telnet")); + prints("|\033[1m连往: \033[1;33m%-20s\033[m 端口: \033[1;33m%-5d\033[m 编码: \033[1;33m%s\033[m", + bbsnet_conf[i].host_name, bbsnet_conf[i].port, bbsnet_conf[i].charset); moveto(21, 80); prints("|"); iflush(); @@ -1191,7 +1279,14 @@ int bbs_net() { int ch, i; - load_bbsnet_conf(CONF_BBSNET); + if (load_bbsnet_conf(CONF_BBSNET) < 0) + { + clearscr(); + moveto(1, 1); + prints("加载穿梭配置失败！"); + press_any_key(); + return -1; + } bbsnet_refresh(); display_menu(&bbsnet_menu);