--- lbbs/src/bbs_net.c 2025/05/14 04:22:45 1.40 +++ lbbs/src/bbs_net.c 2025/10/29 03:23:39 1.74 @@ -16,26 +16,30 @@ #include "bbs.h" #include "common.h" -#include "log.h" #include "io.h" -#include "screen.h" +#include "log.h" +#include "login.h" #include "menu.h" -#include -#include +#include "screen.h" #include -#include -#include #include +#include +#include +#include +#include +#include #include #include -#include +#include +#include +#include +#include +#include +#include #include #include #include #include -#include -#include -#include #define MENU_CONF_DELIM " \t\r\n" @@ -49,17 +53,18 @@ struct _bbsnet_conf char host2[40]; char ip[40]; in_port_t port; + char charset[20]; } 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_menuitem; - char t[256], *t1, *t2, *t3, *t4, *saveptr; - int item_count = 0; + MENU_ITEM *p_menu_item; + MENU_ITEM_ID menu_item_id; + char t[256], *t1, *t2, *t3, *t4, *t5, *saveptr; fp = fopen(file_config, "r"); if (fp == NULL) @@ -67,74 +72,99 @@ int load_bbsnet_conf(const char *file_co return -1; } - bbsnet_menu.p_menu_name_dict = trie_dict_create(); + 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; + } + bbsnet_menu.menu_count = 1; + + bbsnet_menu.p_menu_item_pool = calloc(MAXSTATION, sizeof(MENU_ITEM)); + if (bbsnet_menu.p_menu_item_pool == NULL) + { + log_error("calloc(p_menu_item_pool) error\n"); + return -3; + } + bbsnet_menu.menu_item_count = MAXSTATION; + + p_menu = (MENU *)get_menu_by_id(&bbsnet_menu, 0); - p_menu = malloc(sizeof(MENU)); - bbsnet_menu.p_menu[0] = p_menu; strncpy(p_menu->name, "BBSNET", sizeof(p_menu->name) - 1); p_menu->name[sizeof(p_menu->name) - 1] = '\0'; p_menu->title.show = 0; - p_menu->screen.show = 0; - - if (trie_dict_set(bbsnet_menu.p_menu_name_dict, p_menu->name, (int64_t)p_menu) != 1) - { - log_error("Error set BBSNET menu dict [%s]\n", p_menu->name); - } + p_menu->screen_show = 0; - while (fgets(t, 255, fp) && item_count < MAXSTATION) + menu_item_id = 0; + while (fgets(t, 255, fp) && menu_item_id < MAXSTATION) { t1 = strtok_r(t, MENU_CONF_DELIM, &saveptr); 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); - if (t1 == NULL || t2 == NULL || t3 == NULL || t4 == NULL || t[0] == '#' || t[0] == '*') + if (t1 == NULL || t2 == NULL || t3 == NULL || t4 == NULL || t5 == NULL || t[0] == '#' || t[0] == '*') { continue; } - strncpy(bbsnet_conf[item_count].host1, t2, sizeof(bbsnet_conf[item_count].host1) - 1); - bbsnet_conf[item_count].host1[sizeof(bbsnet_conf[item_count].host1) - 1] = '\0'; - strncpy(bbsnet_conf[item_count].host2, t1, sizeof(bbsnet_conf[item_count].host2) - 1); - bbsnet_conf[item_count].host2[sizeof(bbsnet_conf[item_count].host2) - 1] = '\0'; - strncpy(bbsnet_conf[item_count].ip, t3, sizeof(bbsnet_conf[item_count].ip) - 1); - bbsnet_conf[item_count].ip[sizeof(bbsnet_conf[item_count].ip) - 1] = '\0'; - bbsnet_conf[item_count].port = (in_port_t)(t4 ? atoi(t4) : 23); - - p_menuitem = p_menu->items[item_count] = malloc(sizeof(MENU_ITEM)); - p_menuitem->row = 2 + item_count / STATION_PER_LINE; - p_menuitem->col = 5 + item_count % STATION_PER_LINE * 20; - snprintf(p_menuitem->action, sizeof(p_menuitem->action), "%d", item_count); - p_menuitem->submenu = 0; - p_menuitem->priv = 0; - p_menuitem->level = 0; - p_menuitem->display = 0; - p_menuitem->name[0] = - (char)(item_count < MAXSTATION / 2 ? 'A' + item_count : 'a' + item_count); - p_menuitem->name[1] = '\0'; - snprintf(p_menuitem->text, sizeof(p_menuitem->text), "%c. %s", - p_menuitem->name[0], bbsnet_conf[item_count].host1); + strncpy(bbsnet_conf[menu_item_id].host1, t2, sizeof(bbsnet_conf[menu_item_id].host1) - 1); + bbsnet_conf[menu_item_id].host1[sizeof(bbsnet_conf[menu_item_id].host1) - 1] = '\0'; + strncpy(bbsnet_conf[menu_item_id].host2, t1, sizeof(bbsnet_conf[menu_item_id].host2) - 1); + bbsnet_conf[menu_item_id].host2[sizeof(bbsnet_conf[menu_item_id].host2) - 1] = '\0'; + 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); + strncpy(bbsnet_conf[menu_item_id].charset, t5, sizeof(bbsnet_conf[menu_item_id].charset) - 1); + bbsnet_conf[menu_item_id].charset[sizeof(bbsnet_conf[menu_item_id].charset) - 1] = '\0'; - item_count++; - } - fclose(fp); + p_menu_item = get_menu_item_by_id(&bbsnet_menu, menu_item_id); + if (p_menu_item == NULL) + { + log_error("get_menu_item_by_id(%d) return NULL pointer\n", menu_item_id); + return -1; + } - p_menu->item_count = item_count; - p_menu->item_cur_pos = 0; + p_menu_item->row = (int16_t)(2 + menu_item_id / STATION_PER_LINE); + p_menu_item->col = (int16_t)(5 + menu_item_id % STATION_PER_LINE * 20); + snprintf(p_menu_item->action, sizeof(p_menu_item->action), "%d", (int16_t)menu_item_id); + p_menu_item->submenu = 0; + p_menu_item->priv = 0; + p_menu_item->level = 0; + 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", + p_menu_item->name[0], bbsnet_conf[menu_item_id].host1); + + p_menu->items[p_menu->item_count] = menu_item_id; + p_menu->item_count++; + menu_item_id++; + } + + bbsnet_menu.menu_item_count = (int16_t)menu_item_id; + bbsnet_menu.menu_id_path[0] = 0; + bbsnet_menu.menu_item_pos[0] = 0; + bbsnet_menu.choose_step = 0; - bbsnet_menu.menu_count = 1; - bbsnet_menu.menu_select_depth = 0; - bbsnet_menu.p_menu_select[0] = bbsnet_menu.p_menu[0]; + fclose(fp); return 0; } -void unload_bbsnet_conf(void) +static void unload_bbsnet_conf(void) { - unload_menu(&bbsnet_menu); + 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; } -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]; @@ -162,7 +192,7 @@ void process_bar(int n, int len) iflush(); } -int bbsnet_connect(int n) +static int bbsnet_connect(int n) { int sock, ret, loop, error; int sock_connected = 0; @@ -177,6 +207,15 @@ 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]; struct epoll_event ev, events[MAX_EVENTS]; int nfds, epollfd; int stdin_read_wait = 0; @@ -187,14 +226,22 @@ int bbsnet_connect(int n) int tos; char remote_addr[IP_ADDR_LEN]; int remote_port; - time_t t_used; + 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; + if (user_online_update("BBS_NET") < 0) + { + log_error("user_online_update(BBS_NET) error\n"); + } + clearscr(); moveto(0, 0); - prints("\033[1;32m正在测试往 %s (%s) 的连接，请稍候... \033[m\r\n", + prints("\033[1;32m姝ｅ湪娴嬭瘯寰 %s (%s) 鐨勮繛鎺ワ紝璇风◢鍊... \033[m\r\n", bbsnet_conf[n].host1, bbsnet_conf[n].ip); iflush(); @@ -202,7 +249,7 @@ int bbsnet_connect(int n) if (p_host == NULL) { - prints("\033[1;31m查找主机名失败！\033[m\r\n"); + prints("\033[1;31m鏌ユ壘涓绘満鍚嶅け璐ワ紒\033[m\r\n"); press_any_key(); return -1; } @@ -211,13 +258,13 @@ int bbsnet_connect(int n) if (sock < 0) { - prints("\033[1;31m无法创建socket！\033[m\r\n"); + prints("\033[1;31m鏃犳硶鍒涘缓socket锛乗033[m\r\n"); press_any_key(); return -1; } sin.sin_family = AF_INET; - sin.sin_addr.s_addr = (hostaddr_server[0] != '\0' ? inet_addr(hostaddr_server) : INADDR_ANY); + sin.sin_addr.s_addr = (BBS_address[0] != '\0' ? inet_addr(BBS_address) : INADDR_ANY); sin.sin_port = 0; if (bind(sock, (struct sockaddr *)&sin, sizeof(sin)) < 0) @@ -227,7 +274,7 @@ int bbsnet_connect(int n) return -2; } - bzero(&sin, sizeof(sin)); + memset(&sin, 0, sizeof(sin)); sin.sin_family = AF_INET; sin.sin_addr = *(struct in_addr *)p_host->h_addr_list[0]; sin.sin_port = htons(bbsnet_conf[n].port); @@ -236,7 +283,7 @@ int bbsnet_connect(int n) remote_addr[sizeof(remote_addr) - 1] = '\0'; remote_port = ntohs(sin.sin_port); - prints("\033[1;32m穿梭进度条提示您当前已使用的时间，按\033[1;33mCtrl+C\033[1;32m中断。\033[m\r\n"); + prints("\033[1;32m绌挎杩涘害鏉℃彁绀烘偍褰撳墠宸蹭娇鐢ㄧ殑鏃堕棿锛屾寜\033[1;33mCtrl+C\033[1;32m涓柇銆俓033[m\r\n"); process_bar(0, MAX_PROCESS_BAR_LEN); // Set socket as non-blocking @@ -256,7 +303,7 @@ int bbsnet_connect(int n) return -1; } - ev.events = EPOLLOUT; + ev.events = EPOLLOUT | EPOLLET; ev.data.fd = sock; if (epoll_ctl(epollfd, EPOLL_CTL_ADD, sock, &ev) == -1) { @@ -264,7 +311,7 @@ int bbsnet_connect(int n) goto cleanup; } - ev.events = EPOLLIN; + ev.events = EPOLLIN | EPOLLET; ev.data.fd = STDIN_FILENO; if (epoll_ctl(epollfd, EPOLL_CTL_ADD, STDIN_FILENO, &ev) == -1) { @@ -291,7 +338,7 @@ int bbsnet_connect(int n) { log_error("connect(socket) error (%d)\n", errno); - prints("\033[1;31m连接失败！\033[m\r\n"); + prints("\033[1;31m杩炴帴澶辫触锛乗033[m\r\n"); press_any_key(); goto cleanup; @@ -335,7 +382,7 @@ int bbsnet_connect(int n) else if (events[i].data.fd == STDIN_FILENO) { ch = igetch(0); - if (ch == Ctrl('C')) + if (ch == Ctrl('C') || ch == KEY_ESC) { goto cleanup; } @@ -349,7 +396,7 @@ int bbsnet_connect(int n) } if (!sock_connected) { - prints("\033[1;31m连接失败！\033[m\r\n"); + prints("\033[1;31m杩炴帴澶辫触锛乗033[m\r\n"); press_any_key(); goto cleanup; @@ -361,9 +408,40 @@ int bbsnet_connect(int n) log_error("setsockopt IP_TOS=%d error (%d)\n", tos, errno); } - prints("\033[1;31m连接成功！\033[m\r\n"); + 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); + + prints("\033[1;31m杩炴帴鎴愬姛锛乗033[m\r\n"); iflush(); - log_std("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; + } ev.events = EPOLLIN | EPOLLOUT | EPOLLET; ev.data.fd = sock; @@ -373,7 +451,7 @@ int bbsnet_connect(int n) goto cleanup; } - ev.events = EPOLLOUT; + ev.events = EPOLLOUT | EPOLLET; ev.data.fd = STDOUT_FILENO; if (epoll_ctl(epollfd, EPOLL_CTL_ADD, STDOUT_FILENO, &ev) == -1) { @@ -381,11 +459,18 @@ int bbsnet_connect(int n) goto cleanup; } - BBS_last_access_tm = t_used = time(0); + BBS_last_access_tm = t_used = time(NULL); loop = 1; while (loop && !SYS_server_exit) { + if (SSH_v2 && ssh_channel_is_closed(SSH_channel)) + { + log_error("SSH channel is closed\n"); + loop = 0; + break; + } + nfds = epoll_wait(epollfd, events, MAX_EVENTS, 100); // 0.1 second if (nfds < 0) @@ -399,186 +484,299 @@ int bbsnet_connect(int n) } else if (nfds == 0) // timeout { - if (time(0) - BBS_last_access_tm >= MAX_DELAY_TIME) + if (time(NULL) - BBS_last_access_tm >= MAX_DELAY_TIME) { break; } - continue; } for (int i = 0; i < nfds; i++) { - if (events[i].data.fd == STDIN_FILENO || stdin_read_wait) + if (events[i].data.fd == STDIN_FILENO) { stdin_read_wait = 1; - while (input_buf_len < sizeof(input_buf) && !SYS_server_exit) + } + + if (events[i].data.fd == sock) + { + if (events[i].events & EPOLLIN) { - ret = (int)read(STDIN_FILENO, input_buf + input_buf_len, sizeof(input_buf) - (size_t)input_buf_len); - if (ret < 0) + sock_read_wait = 1; + } + if (events[i].events & EPOLLOUT) + { + sock_write_wait = 1; + } + } + + if (events[i].data.fd == STDOUT_FILENO) + { + stdout_write_wait = 1; + } + } + + if (stdin_read_wait) + { + while (input_buf_len < sizeof(input_buf) && !SYS_server_exit) + { + if (SSH_v2) + { + ret = ssh_channel_read_nonblocking(SSH_channel, input_buf + input_buf_len, sizeof(input_buf) - (uint32_t)input_buf_len, 0); + if (ret == SSH_ERROR) { - if (errno == EAGAIN || errno == EWOULDBLOCK) - { - stdin_read_wait = 0; - break; - } - else if (errno == EINTR) - { - continue; - } - else - { - log_error("read(STDIN) error (%d)\n", errno); - loop = 0; - break; - } + log_error("ssh_channel_read_nonblocking() error: %s\n", ssh_get_error(SSH_session)); + loop = 0; + break; } - else if (ret == 0) // broken pipe + else if (ret == SSH_EOF) { - log_std("read(STDIN) EOF\n"); stdin_read_wait = 0; loop = 0; break; } - else + 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 + } + } + else + { + ret = (int)read(STDIN_FILENO, input_buf + input_buf_len, sizeof(input_buf) - (size_t)input_buf_len); + } + if (ret < 0) + { + if (errno == EAGAIN || errno == EWOULDBLOCK) + { + stdin_read_wait = 0; + break; + } + else if (errno == EINTR) { - input_buf_len += ret; - BBS_last_access_tm = time(0); continue; } + else + { + log_error("read(STDIN) error (%d)\n", errno); + loop = 0; + break; + } + } + else if (ret == 0) // broken pipe + { +#ifdef _DEBUG + log_error("read(STDIN) EOF\n"); +#endif + stdin_read_wait = 0; + loop = 0; + break; + } + else + { + input_buf_len += ret; + BBS_last_access_tm = time(NULL); + + // Refresh current action while user input + if (user_online_update("BBS_NET") < 0) + { + log_error("user_online_update(BBS_NET) error\n"); + } + + continue; + } + } + } + + if (sock_write_wait) + { + if (input_buf_offset < input_buf_len) + { + // 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 } - if (events[i].data.fd == sock || sock_write_wait) // EPOLLOUT + while (input_conv_offset < input_conv_len && !SYS_server_exit) { - sock_write_wait = 1; - while (input_buf_offset < input_buf_len && !SYS_server_exit) + ret = (int)write(sock, input_conv + input_conv_offset, (size_t)(input_conv_len - input_conv_offset)); + if (ret < 0) { - ret = (int)write(sock, input_buf + input_buf_offset, (size_t)(input_buf_len - input_buf_offset)); - if (ret < 0) + if (errno == EAGAIN || errno == EWOULDBLOCK) { - if (errno == EAGAIN || errno == EWOULDBLOCK) - { - sock_write_wait = 0; - break; - } - else if (errno == EINTR) - { - continue; - } - else - { - log_error("write(socket) error (%d)\n", errno); - loop = 0; - break; - } + sock_write_wait = 0; + break; } - else if (ret == 0) // broken pipe + else if (errno == EINTR) { - log_std("write(socket) EOF\n"); - sock_write_wait = 0; + continue; + } + else + { + log_error("write(socket) error (%d)\n", errno); loop = 0; break; } - else + } + else if (ret == 0) // broken pipe + { +#ifdef _DEBUG + log_error("write(socket) EOF\n"); +#endif + sock_write_wait = 0; + loop = 0; + break; + } + else + { + input_conv_offset += ret; + if (input_conv_offset >= input_conv_len) // Output buffer complete { - input_buf_offset += ret; - if (input_buf_offset >= input_buf_len) // Output buffer complete - { - input_buf_offset = 0; - input_buf_len = 0; - break; - } - continue; + input_conv_offset = 0; + input_conv_len = 0; + break; } + continue; } } + } - if (events[i].data.fd == sock || sock_read_wait) // EPOLLIN + if (sock_read_wait) + { + while (output_buf_len < sizeof(output_buf) && !SYS_server_exit) { - sock_read_wait = 1; - 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 (ret < 0) { - 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) { - if (errno == EAGAIN || errno == EWOULDBLOCK) - { - sock_read_wait = 0; - break; - } - else if (errno == EINTR) - { - continue; - } - else - { - log_error("read(socket) error (%d)\n", errno); - loop = 0; - break; - } - } - else if (ret == 0) // broken pipe - { - log_std("read(socket) EOF\n"); sock_read_wait = 0; - loop = 0; break; } - else + else if (errno == EINTR) { - output_buf_len += ret; continue; } + else + { + log_error("read(socket) error (%d)\n", errno); + loop = 0; + break; + } + } + else if (ret == 0) // broken pipe + { +#ifdef _DEBUG + log_error("read(socket) EOF\n"); +#endif + sock_read_wait = 0; + loop = 0; + break; + } + else + { + output_buf_len += ret; + continue; } } + } - if (events[i].data.fd == STDOUT_FILENO || stdout_write_wait) + if (stdout_write_wait) + { + if (output_buf_offset < output_buf_len) { - stdout_write_wait = 1; - while (output_buf_offset < output_buf_len && !SYS_server_exit) + 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) { - ret = (int)write(STDOUT_FILENO, output_buf + output_buf_offset, (size_t)(output_buf_len - output_buf_offset)); - 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_conv + output_conv_offset, (uint32_t)(output_conv_len - output_conv_offset)); + if (ret == SSH_ERROR) { - if (errno == EAGAIN || errno == EWOULDBLOCK) - { - stdout_write_wait = 0; - break; - } - else if (errno == EINTR) - { - continue; - } - else - { - log_error("write(STDOUT) error (%d)\n", errno); - loop = 0; - break; - } + log_error("ssh_channel_write() error: %s\n", ssh_get_error(SSH_session)); + loop = 0; + break; } - else if (ret == 0) // broken pipe + } + else + { + ret = (int)write(STDOUT_FILENO, output_conv + output_conv_offset, (size_t)(output_conv_len - output_conv_offset)); + } + if (ret < 0) + { + if (errno == EAGAIN || errno == EWOULDBLOCK) { - log_std("write(STDOUT) EOF\n"); stdout_write_wait = 0; - loop = 0; break; } - else + else if (errno == EINTR) { - output_buf_offset += ret; - if (output_buf_offset >= output_buf_len) // Output buffer complete - { - output_buf_offset = 0; - output_buf_len = 0; - break; - } continue; } + else + { + log_error("write(STDOUT) error (%d)\n", errno); + loop = 0; + break; + } + } + else if (ret == 0) // broken pipe + { +#ifdef _DEBUG + log_error("write(STDOUT) EOF\n"); +#endif + stdout_write_wait = 0; + loop = 0; + break; + } + else + { + output_conv_offset += ret; + if (output_conv_offset >= output_conv_len) // Output buffer complete + { + output_conv_offset = 0; + output_conv_len = 0; + break; + } + continue; } } } } + iconv_close(input_cd); + iconv_close(output_cd); + cleanup: if (close(epollfd) < 0) { @@ -597,18 +795,19 @@ cleanup: log_error("Close socket failed\n"); } - t_used = time(0) - t_used; + t_used = time(NULL) - t_used; tm_used = gmtime(&t_used); - log_std("BBSNET disconnect, %d days %d hours %d minutes %d seconds used\n", - tm_used->tm_mday - 1, tm_used->tm_hour, tm_used->tm_min, - tm_used->tm_sec); + log_common("BBSNET disconnect, %d days %d hours %d minutes %d seconds used\n", + 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); @@ -625,27 +824,29 @@ bbsnet_refresh() moveto(22, 0); prints(" ----------------------------------------------------------------------------- "); moveto(23, 0); - prints(" [\x1b[1;32mCtrl+C\x1b[m]退出"); + prints(" [\x1b[1;32mCtrl+C\x1b[m]閫鍑"); iflush(); return 0; } -int bbsnet_selchange(int new_pos) +static int bbsnet_selchange() { + int i = bbsnet_menu.menu_item_pos[0]; + moveto(20, 0); clrtoeol(); - prints("|\x1b[1m单位:\x1b[1;33m%-18s\x1b[m 站名:\x1b[1;33m%s\x1b[m", - bbsnet_conf[new_pos].host2, bbsnet_conf[new_pos].host1); + 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("|"); moveto(21, 0); clrtoeol(); - prints("|\x1b[1m连往:\x1b[1;33m%-20s", bbsnet_conf[new_pos].ip); - if (bbsnet_conf[new_pos].port != 23) + prints("|\x1b[1m杩炲線:\x1b[1;33m%-20s", bbsnet_conf[i].ip); + if (bbsnet_conf[i].port != 23) { - prints(" %d", bbsnet_conf[new_pos].port); + prints(" %d", bbsnet_conf[i].port); } prints("\x1b[m"); moveto(21, 79); @@ -655,74 +856,84 @@ int bbsnet_selchange(int new_pos) return 0; } -int bbs_net() +extern int bbs_net() { - int ch, pos, i; + int ch, i; load_bbsnet_conf(CONF_BBSNET); - BBS_last_access_tm = time(0); - clearscr(); bbsnet_refresh(); - pos = bbsnet_menu.p_menu[0]->item_cur_pos; - display_menu(get_menu(&bbsnet_menu, "BBSNET")); - bbsnet_selchange(pos); + display_menu(&bbsnet_menu); + bbsnet_selchange(); while (!SYS_server_exit) { ch = igetch(100); + + if (ch != KEY_NULL && ch != KEY_TIMEOUT) + { + BBS_last_access_tm = time(NULL); + } + switch (ch) { - case KEY_NULL: // broken pipe - case Ctrl('C'): // user cancel + case KEY_NULL: // broken pipe + log_error("KEY_NULL\n"); goto cleanup; case KEY_TIMEOUT: - if (time(0) - BBS_last_access_tm >= MAX_DELAY_TIME) + if (time(NULL) - BBS_last_access_tm >= MAX_DELAY_TIME) { + log_error("User input timeout\n"); goto cleanup; } continue; + case KEY_ESC: + case Ctrl('C'): // user cancel + goto cleanup; case CR: - pos = bbsnet_menu.p_menu[0]->item_cur_pos; - bbsnet_connect(pos); + bbsnet_connect(bbsnet_menu.menu_item_pos[0]); bbsnet_refresh(); - display_current_menu(&bbsnet_menu); - bbsnet_selchange(pos); + display_menu(&bbsnet_menu); + bbsnet_selchange(); break; case KEY_UP: for (i = 0; i < STATION_PER_LINE; i++) { menu_control(&bbsnet_menu, KEY_UP); } - pos = bbsnet_menu.p_menu[0]->item_cur_pos; - bbsnet_selchange(pos); + bbsnet_selchange(); break; case KEY_DOWN: for (i = 0; i < STATION_PER_LINE; i++) { menu_control(&bbsnet_menu, KEY_DOWN); } - pos = bbsnet_menu.p_menu[0]->item_cur_pos; - bbsnet_selchange(pos); + bbsnet_selchange(); break; case KEY_LEFT: menu_control(&bbsnet_menu, KEY_UP); - pos = bbsnet_menu.p_menu[0]->item_cur_pos; - bbsnet_selchange(pos); + bbsnet_selchange(); break; case KEY_RIGHT: menu_control(&bbsnet_menu, KEY_DOWN); - pos = bbsnet_menu.p_menu[0]->item_cur_pos; - bbsnet_selchange(pos); + bbsnet_selchange(); + break; + case KEY_HOME: + case KEY_PGUP: + menu_control(&bbsnet_menu, KEY_PGUP); + bbsnet_selchange(); + break; + case KEY_END: + case KEY_PGDN: + menu_control(&bbsnet_menu, KEY_PGDN); + bbsnet_selchange(); break; default: menu_control(&bbsnet_menu, ch); - pos = bbsnet_menu.p_menu[0]->item_cur_pos; - bbsnet_selchange(pos); + bbsnet_selchange(); break; } - BBS_last_access_tm = time(0); } cleanup: