--- lbbs/src/bbs_net.c 2025/10/04 10:11:44 1.59 +++ lbbs/src/bbs_net.c 2025/11/30 11:12:06 1.85 @@ -1,26 +1,24 @@ -/*************************************************************************** - bbs_net.c - description - ------------------- - Copyright : (C) 2004-2025 by Leaflet - Email : leaflet@leafok.com - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/* SPDX-License-Identifier: GPL-3.0-or-later */ +/* + * bbs_net + * - user interactive feature of site shuttle + * + * Copyright (C) 2004-2025 Leaflet + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "bbs.h" +#include "bbs_net.h" #include "common.h" #include "io.h" #include "log.h" #include "login.h" #include "menu.h" #include "screen.h" +#include "str_process.h" #include #include #include @@ -31,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -39,13 +38,23 @@ #include #include #include + +#ifdef HAVE_SYS_EPOLL_H #include +#else +#include +#endif -#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, + USERNAME_MAX_LEN = 20, + PASSWORD_MAX_LEN = 20, +}; struct _bbsnet_conf { @@ -53,17 +62,19 @@ struct _bbsnet_conf char host2[40]; char ip[40]; in_port_t port; + int8_t use_ssh; + char charset[CHARSET_MAX_LEN + 1]; } bbsnet_conf[MAXSTATION]; -MENU_SET bbsnet_menu; +static MENU_SET bbsnet_menu; -int load_bbsnet_conf(const char *file_config) +static int load_bbsnet_conf(const char *file_config) { FILE *fp; MENU *p_menu; MENU_ITEM *p_menu_item; MENU_ITEM_ID menu_item_id; - char t[256], *t1, *t2, *t3, *t4, *saveptr; + char t[256], *t1, *t2, *t3, *t4, *t5, *t6, *saveptr; fp = fopen(file_config, "r"); if (fp == NULL) @@ -101,8 +112,11 @@ int load_bbsnet_conf(const char *file_co t2 = strtok_r(NULL, MENU_CONF_DELIM, &saveptr); t3 = strtok_r(NULL, MENU_CONF_DELIM, &saveptr); t4 = strtok_r(NULL, MENU_CONF_DELIM, &saveptr); + t5 = strtok_r(NULL, MENU_CONF_DELIM, &saveptr); + t6 = strtok_r(NULL, MENU_CONF_DELIM, &saveptr); - if (t1 == NULL || t2 == NULL || t3 == NULL || t4 == NULL || t[0] == '#' || t[0] == '*') + if (t1 == NULL || t2 == NULL || t3 == NULL || t4 == NULL || + t5 == NULL || t6 == NULL || t[0] == '#' || t[0] == '*') { continue; } @@ -114,6 +128,9 @@ int load_bbsnet_conf(const char *file_co strncpy(bbsnet_conf[menu_item_id].ip, t3, sizeof(bbsnet_conf[menu_item_id].ip) - 1); bbsnet_conf[menu_item_id].ip[sizeof(bbsnet_conf[menu_item_id].ip) - 1] = '\0'; bbsnet_conf[menu_item_id].port = (in_port_t)(t4 ? atoi(t4) : 23); + 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'; p_menu_item = get_menu_item_by_id(&bbsnet_menu, menu_item_id); if (p_menu_item == NULL) @@ -149,7 +166,7 @@ int load_bbsnet_conf(const char *file_co return 0; } -void unload_bbsnet_conf(void) +static void unload_bbsnet_conf(void) { bbsnet_menu.menu_count = 0; bbsnet_menu.menu_item_count = 0; @@ -160,7 +177,7 @@ void unload_bbsnet_conf(void) bbsnet_menu.p_menu_item_pool = NULL; } -void process_bar(int n, int len) +static void process_bar(int n, int len) { char buf[LINE_BUFFER_LEN]; char buf2[LINE_BUFFER_LEN]; @@ -178,17 +195,17 @@ void process_bar(int n, int len) n = len; } - moveto(4, 0); + moveto(4, 1); prints(" ------------------------------ \r\n"); snprintf(buf, sizeof(buf), " %3d%% ", n * 100 / len); - strncpy(buf2, buf, (size_t)n); + memcpy(buf2, buf, (size_t)n); buf2[n] = '\0'; prints("|\033[46m%s\033[44m%s\033[m|\r\n", buf2, buf + n); prints(" ------------------------------ \r\n"); iflush(); } -int bbsnet_connect(int n) +static int bbsnet_connect(int n) { int sock, ret, loop, error; int sock_connected = 0; @@ -203,8 +220,24 @@ int bbsnet_connect(int n) int output_buf_len = 0; int input_buf_offset = 0; int output_buf_offset = 0; + char input_conv[LINE_BUFFER_LEN * 2]; + char output_conv[LINE_BUFFER_LEN * 2]; + int input_conv_len = 0; + 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]; + +#ifdef HAVE_SYS_EPOLL_H struct epoll_event ev, events[MAX_EVENTS]; - int nfds, epollfd; + int epollfd; +#else + struct pollfd pfds[3]; +#endif + + int nfds; int stdin_read_wait = 0; int stdout_write_wait = 0; int sock_read_wait = 0; @@ -213,18 +246,66 @@ int bbsnet_connect(int n) int tos; char remote_addr[IP_ADDR_LEN]; int remote_port; + char local_addr[IP_ADDR_LEN]; + int local_port; + socklen_t sock_len; time_t t_used = time(NULL); struct tm *tm_used; int ch; + char remote_user[USERNAME_MAX_LEN + 1]; + char remote_pass[PASSWORD_MAX_LEN + 1]; + ssh_session session = NULL; + ssh_channel channel = NULL; + int ssh_process_config = 0; + int ssh_log_level = SSH_LOG_PROTOCOL; if (user_online_update("BBS_NET") < 0) { log_error("user_online_update(BBS_NET) error\n"); } + if (bbsnet_conf[n].use_ssh) + { + clearscr(); + + if (!SSH_v2) + { + moveto(1, 1); + prints("只有在以SSH方式登陆本站时，才能使用SSH站点穿梭。"); + press_any_key(); + return 0; + } + + moveto(1, 1); + prints("通过SSH方式连接[%s]...", bbsnet_conf[n].host1); + moveto(2, 1); + prints("请输入用户名: "); + iflush(); + if (str_input(remote_user, sizeof(remote_user), DOECHO) < 0) + { + return -1; + } + if (remote_user[0] == '\0') + { + return 0; + } + + moveto(3, 1); + prints("请输入密码: "); + iflush(); + if (str_input(remote_pass, sizeof(remote_pass), NOECHO) < 0) + { + return -1; + } + if (remote_pass[0] == '\0') + { + return 0; + } + } + clearscr(); - moveto(0, 0); + moveto(1, 1); prints("\033[1;32m正在测试往 %s (%s) 的连接，请稍候... \033[m\r\n", bbsnet_conf[n].host1, bbsnet_conf[n].ip); iflush(); @@ -280,6 +361,7 @@ int bbsnet_connect(int n) fcntl(STDIN_FILENO, F_SETFL, flags_stdin | O_NONBLOCK); fcntl(STDOUT_FILENO, F_SETFL, flags_stdout | O_NONBLOCK); +#ifdef HAVE_SYS_EPOLL_H epollfd = epoll_create1(0); if (epollfd < 0) { @@ -302,6 +384,7 @@ int bbsnet_connect(int n) log_error("epoll_ctl(STDIN_FILENO) error (%d)\n", errno); goto cleanup; } +#endif while (!SYS_server_exit) { @@ -332,17 +415,31 @@ int bbsnet_connect(int n) for (int j = 0; j < MAX_PROCESS_BAR_LEN && !sock_connected && !SYS_server_exit; j++) { +#ifdef HAVE_SYS_EPOLL_H nfds = epoll_wait(epollfd, events, MAX_EVENTS, 500); // 0.5 second + ret = nfds; +#else + pfds[0].fd = sock; + pfds[0].events = POLLOUT; + pfds[1].fd = STDIN_FILENO; + pfds[1].events = POLLIN; + nfds = 2; + ret = poll(pfds, (nfds_t)nfds, 500); // 0.5 second +#endif - if (nfds < 0) + if (ret < 0) { if (errno != EINTR) { +#ifdef HAVE_SYS_EPOLL_H log_error("epoll_wait() error (%d)\n", errno); +#else + log_error("poll() error (%d)\n", errno); +#endif break; } } - else if (nfds == 0) // timeout + else if (ret == 0) // timeout { process_bar(j + 1, MAX_PROCESS_BAR_LEN); } @@ -350,7 +447,11 @@ int bbsnet_connect(int n) { for (int i = 0; i < nfds; i++) { +#ifdef HAVE_SYS_EPOLL_H if (events[i].data.fd == sock) +#else + 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) @@ -363,9 +464,16 @@ int bbsnet_connect(int n) sock_connected = 1; } } +#ifdef HAVE_SYS_EPOLL_H else if (events[i].data.fd == STDIN_FILENO) +#else + else if (pfds[i].fd == STDIN_FILENO && (pfds[i].revents & POLLIN)) +#endif { - ch = igetch(0); + do + { + ch = igetch(0); + } while (ch == 0); if (ch == Ctrl('C') || ch == KEY_ESC) { goto cleanup; @@ -392,10 +500,194 @@ int bbsnet_connect(int n) log_error("setsockopt IP_TOS=%d error (%d)\n", tos, errno); } + sock_len = sizeof(sin); + if (getsockname(sock, (struct sockaddr *)&sin, &sock_len) < 0) + { + log_error("getsockname() error: %d", errno); + goto cleanup; + } + + strncpy(local_addr, inet_ntoa(sin.sin_addr), sizeof(local_addr) - 1); + local_addr[sizeof(local_addr) - 1] = '\0'; + local_port = ntohs(sin.sin_port); + + if (bbsnet_conf[n].use_ssh) + { + session = ssh_new(); + if (session == NULL) + { + log_error("ssh_new() error\n"); + goto cleanup; + } + + if (ssh_options_set(session, SSH_OPTIONS_FD, &sock) < 0 || + ssh_options_set(session, SSH_OPTIONS_PROCESS_CONFIG, &ssh_process_config) < 0 || + ssh_options_set(session, SSH_OPTIONS_KNOWNHOSTS, SSH_KNOWN_HOSTS_FILE) < 0 || + ssh_options_set(session, SSH_OPTIONS_HOST, bbsnet_conf[n].ip) < 0 || + ssh_options_set(session, SSH_OPTIONS_USER, remote_user) < 0 || + ssh_options_set(session, SSH_OPTIONS_HOSTKEYS, "+ssh-rsa") < 0 || + ssh_options_set(session, SSH_OPTIONS_LOG_VERBOSITY, &ssh_log_level) < 0) + { + log_error("Error setting SSH options: %s\n", ssh_get_error(session)); + goto cleanup; + } + + ssh_set_blocking(session, 0); + + while (!SYS_server_exit) + { + ret = ssh_connect(session); + if (ret == SSH_OK) + { + break; + } + else if (ret == SSH_ERROR) + { + log_error("ssh_connect() error\n"); + goto cleanup; + } + } + + ret = ssh_session_is_known_server(session); + switch (ret) + { + case SSH_KNOWN_HOSTS_NOT_FOUND: + case SSH_KNOWN_HOSTS_UNKNOWN: + if (ssh_session_update_known_hosts(session) != SSH_OK) + { + log_error("ssh_session_update_known_hosts(%s) error\n", bbsnet_conf[n].ip); + prints("\033[1;31m无法添加服务器证书\033[m"); + press_any_key(); + goto cleanup; + } + log_common("SSH key of (%s) is added into %s\n", bbsnet_conf[n].ip, SSH_KNOWN_HOSTS_FILE); + case SSH_KNOWN_HOSTS_OK: + break; + case SSH_KNOWN_HOSTS_CHANGED: + case SSH_KNOWN_HOSTS_OTHER: + log_error("ssh_session_is_known_server(%s) error: %d\n", bbsnet_conf[n].ip, ret); + prints("\033[1;31m服务器证书已变更\033[m"); + press_any_key(); + goto cleanup; + } + + for (int i = 0; !SYS_server_exit;) + { + ret = ssh_userauth_password(session, NULL, remote_pass); + if (ret == SSH_AUTH_SUCCESS) + { + break; + } + else if (ret == SSH_AUTH_AGAIN) + { +#ifdef _DEBUG + log_error("ssh_userauth_password() error: SSH_AUTH_AGAIN\n"); +#endif + } + else if (ret == SSH_AUTH_ERROR) + { + log_error("ssh_userauth_password() error: %d\n", ret); + goto cleanup; + } + else // if (ret == SSH_AUTH_DENIED) + { + prints("\033[1;31m身份验证失败！\033[m\r\n"); + i++; + if (i < BBS_login_retry_times) + { + prints("请输入密码: "); + iflush(); + if (str_input(remote_pass, sizeof(remote_pass), NOECHO) < 0) + { + goto cleanup; + } + if (remote_pass[0] == '\0') + { + goto cleanup; + } + } + else + { + goto cleanup; + } + } + } + + channel = ssh_channel_new(session); + if (channel == NULL) + { + log_error("ssh_channel_new() error\n"); + goto cleanup; + } + + while (!SYS_server_exit) + { + ret = ssh_channel_open_session(channel); + if (ret == SSH_OK) + { + break; + } + else if (ret == SSH_ERROR) + { + log_error("ssh_channel_open_session() error\n"); + goto cleanup; + } + } + + while (!SYS_server_exit) + { + ret = ssh_channel_request_pty(channel); + if (ret == SSH_OK) + { + break; + } + else if (ret == SSH_ERROR) + { + log_error("ssh_channel_request_pty() error\n"); + goto cleanup; + } + } + + while (!SYS_server_exit) + { + ret = ssh_channel_request_shell(channel); + if (ret == SSH_OK) + { + break; + } + else if (ret == SSH_ERROR) + { + log_error("ssh_channel_request_shell() error\n"); + goto cleanup; + } + } + } + prints("\033[1;31m连接成功！\033[m\r\n"); iflush(); - log_common("BBSNET connect to %s:%d\n", remote_addr, remote_port); + log_common("BBSNET connect to %s:%d from %s:%d by [%s]\n", + remote_addr, remote_port, local_addr, local_port, BBS_username); + + snprintf(tocode, sizeof(tocode), "%s%s", bbsnet_conf[n].charset, + (strcasecmp(stdio_charset, bbsnet_conf[n].charset) == 0 ? "" : "//IGNORE")); + input_cd = iconv_open(tocode, stdio_charset); + if (input_cd == (iconv_t)(-1)) + { + log_error("iconv_open(%s->%s) error: %d\n", stdio_charset, tocode, errno); + goto cleanup; + } + snprintf(tocode, sizeof(tocode), "%s%s", stdio_charset, + (strcasecmp(bbsnet_conf[n].charset, stdio_charset) == 0 ? "" : "//TRANSLIT")); + output_cd = iconv_open(tocode, bbsnet_conf[n].charset); + 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; + } + +#ifdef HAVE_SYS_EPOLL_H ev.events = EPOLLIN | EPOLLOUT | EPOLLET; ev.data.fd = sock; if (epoll_ctl(epollfd, EPOLL_CTL_MOD, sock, &ev) == -1) @@ -411,6 +703,7 @@ int bbsnet_connect(int n) log_error("epoll_ctl(STDOUT_FILENO) error (%d)\n", errno); goto cleanup; } +#endif BBS_last_access_tm = t_used = time(NULL); loop = 1; @@ -424,20 +717,43 @@ int bbsnet_connect(int n) break; } + if (bbsnet_conf[n].use_ssh && ssh_channel_is_closed(channel)) + { + log_error("Remote SSH channel is closed\n"); + loop = 0; + break; + } + +#ifdef HAVE_SYS_EPOLL_H nfds = epoll_wait(epollfd, events, MAX_EVENTS, 100); // 0.1 second + ret = nfds; +#else + pfds[0].fd = STDIN_FILENO; + pfds[0].events = POLLIN; + pfds[1].fd = sock; + pfds[1].events = POLLIN | POLLOUT; + pfds[2].fd = STDOUT_FILENO; + pfds[2].events = POLLOUT; + nfds = 3; + ret = poll(pfds, (nfds_t)nfds, 100); // 0.1 second +#endif - if (nfds < 0) + if (ret < 0) { if (errno != EINTR) { +#ifdef HAVE_SYS_EPOLL_H log_error("epoll_wait() error (%d)\n", errno); +#else + log_error("poll() error (%d)\n", errno); +#endif break; } continue; } - else if (nfds == 0) // timeout + else if (ret == 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; } @@ -445,24 +761,45 @@ int bbsnet_connect(int n) for (int i = 0; i < nfds; i++) { +#ifdef HAVE_SYS_EPOLL_H if (events[i].data.fd == STDIN_FILENO) +#else + if (pfds[i].fd == STDIN_FILENO && (pfds[i].revents & POLLIN)) +#endif { stdin_read_wait = 1; } +#ifdef HAVE_SYS_EPOLL_H if (events[i].data.fd == sock) +#else + if (pfds[i].fd == sock) +#endif { +#ifdef HAVE_SYS_EPOLL_H if (events[i].events & EPOLLIN) +#else + if (pfds[i].revents & POLLIN) +#endif { sock_read_wait = 1; } + +#ifdef HAVE_SYS_EPOLL_H if (events[i].events & EPOLLOUT) +#else + if (pfds[i].revents & POLLOUT) +#endif { sock_write_wait = 1; } } +#ifdef HAVE_SYS_EPOLL_H if (events[i].data.fd == STDOUT_FILENO) +#else + if (pfds[i].fd == STDOUT_FILENO && (pfds[i].revents & POLLOUT)) +#endif { stdout_write_wait = 1; } @@ -489,6 +826,11 @@ int bbsnet_connect(int n) } else if (ret == 0) { + // Send NO-OP to remote server + input_buf[input_buf_len] = '\0'; + input_buf_len++; + BBS_last_access_tm = time(NULL); + stdin_read_wait = 0; break; // Check whether channel is still open } @@ -542,9 +884,48 @@ int bbsnet_connect(int n) if (sock_write_wait) { - while (input_buf_offset < input_buf_len && !SYS_server_exit) + if (input_buf_offset < input_buf_len) { - ret = (int)write(sock, input_buf + input_buf_offset, (size_t)(input_buf_len - input_buf_offset)); + // For debug +#ifdef _DEBUG + for (int j = input_buf_offset; j < input_buf_len; j++) + { + log_error("Debug input: <--[%u]\n", (input_buf[j] + 256) % 256); + } +#endif + + ret = io_buf_conv(input_cd, input_buf, &input_buf_len, &input_buf_offset, input_conv, sizeof(input_conv), &input_conv_len); + if (ret < 0) + { + log_error("io_buf_conv(input, %d, %d, %d) error\n", input_buf_len, input_buf_offset, input_conv_len); + input_buf_len = input_buf_offset; // Discard invalid sequence + } + + // For debug +#ifdef _DEBUG + for (int j = input_conv_offset; j < input_conv_len; j++) + { + log_error("Debug input_conv: <--[%u]\n", (input_conv[j] + 256) % 256); + } +#endif + } + + while (input_conv_offset < input_conv_len && !SYS_server_exit) + { + if (bbsnet_conf[n].use_ssh) + { + ret = ssh_channel_write(channel, input_conv + input_conv_offset, (uint32_t)(input_conv_len - input_conv_offset)); + if (ret == SSH_ERROR) + { + log_error("ssh_channel_write() error: %s\n", ssh_get_error(session)); + loop = 0; + break; + } + } + else + { + ret = (int)write(sock, input_conv + input_conv_offset, (size_t)(input_conv_len - input_conv_offset)); + } if (ret < 0) { if (errno == EAGAIN || errno == EWOULDBLOCK) @@ -574,11 +955,11 @@ int bbsnet_connect(int n) } else { - input_buf_offset += ret; - if (input_buf_offset >= input_buf_len) // Output buffer complete + input_conv_offset += ret; + if (input_conv_offset >= input_conv_len) // Output buffer complete { - input_buf_offset = 0; - input_buf_len = 0; + input_conv_offset = 0; + input_conv_len = 0; break; } continue; @@ -590,7 +971,32 @@ int bbsnet_connect(int n) { while (output_buf_len < sizeof(output_buf) && !SYS_server_exit) { - ret = (int)read(sock, output_buf + output_buf_len, sizeof(output_buf) - (size_t)output_buf_len); + if (bbsnet_conf[n].use_ssh) + { + ret = ssh_channel_read_nonblocking(channel, output_buf + output_buf_len, + (uint32_t)(sizeof(output_buf) - (size_t)output_buf_len), 0); + if (ret == SSH_ERROR) + { + log_error("ssh_channel_read_nonblocking() error: %s\n", ssh_get_error(session)); + loop = 0; + break; + } + else if (ret == SSH_EOF) + { + sock_read_wait = 0; + loop = 0; + break; + } + else if (ret == 0) + { + sock_read_wait = 0; + break; + } + } + else + { + ret = (int)read(sock, output_buf + output_buf_len, sizeof(output_buf) - (size_t)output_buf_len); + } if (ret < 0) { if (errno == EAGAIN || errno == EWOULDBLOCK) @@ -628,11 +1034,21 @@ int bbsnet_connect(int n) if (stdout_write_wait) { - while (output_buf_offset < output_buf_len && !SYS_server_exit) + if (output_buf_offset < output_buf_len) + { + ret = io_buf_conv(output_cd, output_buf, &output_buf_len, &output_buf_offset, output_conv, sizeof(output_conv), &output_conv_len); + if (ret < 0) + { + log_error("io_buf_conv(output, %d, %d, %d) error\n", output_buf_len, output_buf_offset, output_conv_len); + output_buf_len = output_buf_offset; // Discard invalid sequence + } + } + + while (output_conv_offset < output_conv_len && !SYS_server_exit) { if (SSH_v2) { - ret = ssh_channel_write(SSH_channel, output_buf + output_buf_offset, (uint32_t)(output_buf_len - output_buf_offset)); + ret = ssh_channel_write(SSH_channel, output_conv + output_conv_offset, (uint32_t)(output_conv_len - output_conv_offset)); if (ret == SSH_ERROR) { log_error("ssh_channel_write() error: %s\n", ssh_get_error(SSH_session)); @@ -642,7 +1058,7 @@ int bbsnet_connect(int n) } else { - ret = (int)write(STDOUT_FILENO, output_buf + output_buf_offset, (size_t)(output_buf_len - output_buf_offset)); + ret = (int)write(STDOUT_FILENO, output_conv + output_conv_offset, (size_t)(output_conv_len - output_conv_offset)); } if (ret < 0) { @@ -673,11 +1089,11 @@ int bbsnet_connect(int n) } else { - output_buf_offset += ret; - if (output_buf_offset >= output_buf_len) // Output buffer complete + output_conv_offset += ret; + if (output_conv_offset >= output_conv_len) // Output buffer complete { - output_buf_offset = 0; - output_buf_len = 0; + output_conv_offset = 0; + output_conv_len = 0; break; } continue; @@ -686,19 +1102,28 @@ int bbsnet_connect(int n) } } + iconv_close(input_cd); + iconv_close(output_cd); + cleanup: +#ifdef HAVE_SYS_EPOLL_H if (close(epollfd) < 0) { log_error("close(epoll) error (%d)\n"); } +#endif + + if (bbsnet_conf[n].use_ssh) + { + ssh_channel_free(channel); + ssh_disconnect(session); + ssh_free(session); + } // Restore STDIN/STDOUT flags fcntl(STDIN_FILENO, F_SETFL, flags_stdin); fcntl(STDOUT_FILENO, F_SETFL, flags_stdout); - // Restore socket flags - fcntl(sock, F_SETFL, flags_sock); - if (close(sock) == -1) { log_error("Close socket failed\n"); @@ -711,53 +1136,51 @@ cleanup: tm_used->tm_mday - 1, tm_used->tm_hour, tm_used->tm_min, tm_used->tm_sec); + BBS_last_access_tm = time(NULL); + return 0; } -static int -bbsnet_refresh() +static int bbsnet_refresh() { clearscr(); - moveto(1, 0); - prints(" ----------------------------------------------------------------------------- "); + + moveto(1, 1); + prints(" ------------------------------------------------------------------------------ "); for (int i = 2; i < 19; i++) { - moveto(i, 0); + moveto(i, 1); prints("|"); - moveto(i, 79); + moveto(i, 80); prints("|"); } - moveto(19, 0); - prints("|-----------------------------------------------------------------------------|"); - moveto(22, 0); - prints(" ----------------------------------------------------------------------------- "); - moveto(23, 0); - prints(" [\x1b[1;32mCtrl+C\x1b[m]退出"); + moveto(19, 1); + prints("|------------------------------------------------------------------------------|"); + moveto(22, 1); + prints(" ------------------------------------------------------------------------------ "); + moveto(23, 1); + prints(" [\033[1;32mCtrl+C\033[m]退出"); iflush(); return 0; } -int bbsnet_selchange() +static int bbsnet_selchange() { int i = bbsnet_menu.menu_item_pos[0]; - moveto(20, 0); + moveto(20, 1); clrtoeol(); - prints("|\x1b[1m单位:\x1b[1;33m%-18s\x1b[m 站名:\x1b[1;33m%s\x1b[m", - bbsnet_conf[i].host2, bbsnet_conf[i].host1); - moveto(20, 79); + prints("|\033[1m单位: \033[1;33m%s\033[m%*s 站名: \033[1;33m%s\033[m", + bbsnet_conf[i].host2, 20 - str_length(bbsnet_conf[i].host2, 1), "", bbsnet_conf[i].host1); + moveto(20, 80); prints("|"); - moveto(21, 0); + moveto(21, 1); clrtoeol(); - prints("|\x1b[1m连往:\x1b[1;33m%-20s", bbsnet_conf[i].ip); - if (bbsnet_conf[i].port != 23) - { - prints(" %d", bbsnet_conf[i].port); - } - prints("\x1b[m"); - moveto(21, 79); + prints("|\033[1m连往: \033[1;33m%-20s\033[m 端口: \033[1;33m%-5d\033[m 类型: \033[1;33m%s\033[m", + bbsnet_conf[i].ip, bbsnet_conf[i].port, (bbsnet_conf[i].use_ssh ? "SSH" : "Telnet")); + moveto(21, 80); prints("|"); iflush(); @@ -770,9 +1193,6 @@ int bbs_net() load_bbsnet_conf(CONF_BBSNET); - BBS_last_access_tm = time(NULL); - - clearscr(); bbsnet_refresh(); display_menu(&bbsnet_menu); bbsnet_selchange(); @@ -781,21 +1201,32 @@ int bbs_net() { ch = igetch(100); + if (ch != KEY_NULL && ch != KEY_TIMEOUT) + { + BBS_last_access_tm = time(NULL); + } + switch (ch) { case KEY_NULL: // broken pipe - case KEY_ESC: - case Ctrl('C'): // user cancel + 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; } continue; + case KEY_ESC: + case Ctrl('C'): // user cancel + goto cleanup; case CR: - igetch_reset(); bbsnet_connect(bbsnet_menu.menu_item_pos[0]); + // Force cleanup anything remaining in the output buffer + clearscr(); + iflush(); + // Clear screen and redraw menu bbsnet_refresh(); display_menu(&bbsnet_menu); bbsnet_selchange(); @@ -837,7 +1268,6 @@ int bbs_net() bbsnet_selchange(); break; } - BBS_last_access_tm = time(NULL); } cleanup: