--- lbbs/src/bbs_net.c 2025/12/18 03:23:48 1.96 +++ lbbs/src/bbs_net.c 2025/12/20 03:24:01 1.105 @@ -49,12 +49,13 @@ static const char MENU_CONF_DELIM[] = " 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, - SSH_CONNECT_TIMEOUT = 5, // seconds + REMOTE_CONNECT_TIMEOUT = 10, // seconds + SSH_CONNECT_TIMEOUT = 5, // seconds + PROGRESS_BAR_LEN = 30, }; struct _bbsnet_conf @@ -78,14 +79,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; + long port; + char *endptr; 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"); + log_error("calloc(p_menu_pool) error"); return -1; } bbsnet_menu.menu_count = 1; @@ -93,7 +95,7 @@ static int load_bbsnet_conf(const char * 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"); + log_error("calloc(p_menu_item_pool) error"); unload_bbsnet_conf(); return -1; } @@ -124,7 +126,7 @@ static int load_bbsnet_conf(const char * t6 = strtok_r(NULL, MENU_CONF_DELIM, &saveptr); if (t1 == NULL || t2 == NULL || t3 == NULL || t4 == NULL || - t5 == NULL || t6 == NULL || line[0] == '#' || line[0] == '*') + t5 == NULL || t6 == NULL || t1[0] == '#') { continue; } @@ -135,10 +137,10 @@ 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'; - port = atoi(t4); - if (port <= 0 || port > 65535) + port = strtol(t4, &endptr, 10); + if (*endptr != '\0' || port <= 0 || port > 65535) { - log_error("Invalid port value %d of menu item %d\n", port, menu_item_id); + log_error("Invalid port value %ld of menu item %d", port, menu_item_id); fclose(fp); unload_bbsnet_conf(); return -3; @@ -152,7 +154,7 @@ static int load_bbsnet_conf(const char * 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); + log_error("get_menu_item_by_id(%d) return NULL pointer", menu_item_id); fclose(fp); unload_bbsnet_conf(); return -3; @@ -165,7 +167,7 @@ static int load_bbsnet_conf(const char * 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); + (char)(menu_item_id < MAXSTATION / 2 ? 'A' + menu_item_id : 'a' + menu_item_id - MAXSTATION / 2); p_menu_item->name[1] = '\0'; 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); @@ -203,42 +205,89 @@ static void unload_bbsnet_conf(void) } } -static void process_bar(int n, int len) +static void progress_bar(int percent, int len) { + char line[LINE_BUFFER_LEN]; char buf[LINE_BUFFER_LEN]; char buf2[LINE_BUFFER_LEN]; + int pos; - if (len <= 0) + if (len < 4) { - len = 1; + len = 4; } - else if (len > LINE_BUFFER_LEN) + else if (len + 2 > LINE_BUFFER_LEN) { - len = LINE_BUFFER_LEN - 1; + len = LINE_BUFFER_LEN - 3; } - if (n < 0) + if (percent < 0) { - n = 0; + percent = 0; } - else if (n > len) + else if (percent > 100) { - n = len; + percent = 100; } + pos = len * percent / 100; + + line[0] = ' '; + for (int i = 1; i <= len; i++) + { + line[i] = '-'; + } + line[len + 1] = ' '; + line[len + 2] = '\0'; + + snprintf(buf, sizeof(buf), "%*s%3d%%%*s", + (len - 4) / 2, "", percent, (len - 4 + 1) / 2, ""); + memcpy(buf2, buf, (size_t)pos); + buf2[pos] = '\0'; + moveto(4, 1); - prints(" ------------------------------ \r\n"); - snprintf(buf, sizeof(buf), " %3d%% ", n * 100 / len); - 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"); + prints("%s\r\n", line); + prints("|\033[46m%s\033[44m%s\033[m|\r\n", buf2, buf + pos); + prints("%s\r\n", line); iflush(); } +static int progress_update(struct timespec *p_ts_begin, struct timespec *p_ts_now, + int total_time_ms, int *p_progress_last, int bar_len) +{ + int progress; + + if (clock_gettime(CLOCK_REALTIME, p_ts_now) == -1) + { + log_error("clock_gettime() error (%d)", errno); + return -1; + } + + progress = (int)((p_ts_now->tv_sec - p_ts_begin->tv_sec) * 1000 + + (p_ts_now->tv_nsec - p_ts_begin->tv_nsec) / 1000 / 1000) / + REMOTE_CONNECT_TIMEOUT / 10 + + 1; + if (progress < 0) + { + progress = 0; + } + if (progress > 100) + { + progress = 100; + } + + if (progress != *p_progress_last) + { + *p_progress_last = progress; + progress_bar(progress, PROGRESS_BAR_LEN); + } + + return 0; +} + static int bbsnet_connect(int n) { int sock = -1; - int ret; + int ret = 0; int loop; int error; int sock_connected = 0; @@ -281,20 +330,20 @@ static int bbsnet_connect(int n) char local_addr[INET_ADDRSTRLEN]; int local_port; socklen_t sock_len; - time_t t_begin; - time_t t_used = time(NULL); - struct tm *tm_used; + time_t t_begin, t_used; + struct timespec ts_begin, ts_now; + int progress_last = 0; int ch; char remote_user[USERNAME_MAX_LEN + 1]; char remote_pass[PASSWORD_MAX_LEN + 1]; - ssh_session session = NULL; - ssh_channel channel = NULL; + ssh_session outbound_session = NULL; + ssh_channel outbound_channel = NULL; int ssh_process_config = 0; int ssh_log_level = SSH_LOG_NOLOG; if (user_online_update("BBS_NET") < 0) { - log_error("user_online_update(BBS_NET) error\n"); + log_error("user_online_update(BBS_NET) error"); } if (bbsnet_conf[n].use_ssh) @@ -341,7 +390,16 @@ static int bbsnet_connect(int n) moveto(1, 1); prints("\033[1;32m正在测试往 %s (%s) 的连接，请稍候... \033[m\r\n", bbsnet_conf[n].site_name, bbsnet_conf[n].host_name); - iflush(); + prints("\033[1;32m连接进行中，按\033[1;33mCtrl+C\033[1;32m中断。\033[m\r\n"); + progress_bar(0, PROGRESS_BAR_LEN); + + if (clock_gettime(CLOCK_REALTIME, &ts_begin) == -1) + { + log_error("clock_gettime() error (%d)", errno); + ret = -1; + goto cleanup; + } + ts_now = ts_begin; memset(&hints, 0, sizeof(hints)); hints.ai_family = AF_INET; @@ -350,13 +408,15 @@ static int bbsnet_connect(int n) if ((ret = getaddrinfo(BBS_address, NULL, &hints, &res)) != 0) { - log_error("getaddrinfo() error (%d)\n", ret); + log_error("getaddrinfo() error (%d): %s", ret, gai_strerror(ret)); + ret = -1; goto cleanup; } - if (inet_ntop(AF_INET, &(((struct sockaddr_in *)res->ai_addr)->sin_addr.s_addr), local_addr, sizeof(local_addr)) == NULL) + if (inet_ntop(AF_INET, &(((struct sockaddr_in *)res->ai_addr)->sin_addr), local_addr, sizeof(local_addr)) == NULL) { - log_error("inet_ntop() error (%d)\n", errno); + log_error("inet_ntop() error (%d)", errno); + ret = -1; goto cleanup; } local_port = ntohs(((struct sockaddr_in *)res->ai_addr)->sin_port); @@ -364,13 +424,15 @@ static int bbsnet_connect(int n) sock = socket(res->ai_family, res->ai_socktype, res->ai_protocol); if (sock < 0) { - log_error("socket() error (%d)\n", errno); + log_error("socket() error (%d)", errno); + ret = -1; goto cleanup; } if (bind(sock, res->ai_addr, res->ai_addrlen) < 0) { - log_error("bind(%s:%u) error (%d)\n", local_addr, local_port, errno); + log_error("bind(%s:%u) error (%d)", local_addr, local_port, errno); + ret = -1; goto cleanup; } @@ -385,53 +447,58 @@ static int bbsnet_connect(int n) if ((ret = getaddrinfo(bbsnet_conf[n].host_name, bbsnet_conf[n].port, &hints, &res)) != 0) { - log_error("getaddrinfo() error (%d)\n", ret); + log_error("getaddrinfo() error (%d): %s", ret, gai_strerror(ret)); prints("\033[1;31m查找主机名失败！\033[m\r\n"); press_any_key(); + ret = -1; goto cleanup; } - if (inet_ntop(AF_INET, &(((struct sockaddr_in *)res->ai_addr)->sin_addr.s_addr), remote_addr, sizeof(remote_addr)) == NULL) + if (inet_ntop(AF_INET, &(((struct sockaddr_in *)res->ai_addr)->sin_addr), remote_addr, sizeof(remote_addr)) == NULL) { - log_error("inet_ntop() error (%d)\n", errno); + log_error("inet_ntop() error (%d)", errno); + ret = -1; goto cleanup; } remote_port = ntohs(((struct sockaddr_in *)res->ai_addr)->sin_port); - 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 if ((flags_sock = fcntl(sock, F_GETFL, 0)) == -1) { - log_error("fcntl(F_GETFL) error (%d)\n", errno); + log_error("fcntl(F_GETFL) error (%d)", errno); + ret = -1; goto cleanup; } if ((fcntl(sock, F_SETFL, flags_sock | O_NONBLOCK)) == -1) { - log_error("fcntl(F_SETFL) error (%d)\n", errno); + log_error("fcntl(F_SETFL) error (%d)", errno); + ret = -1; goto cleanup; } // Set STDIN/STDOUT as non-blocking if ((flags_stdin = fcntl(STDIN_FILENO, F_GETFL, 0)) == -1) { - log_error("fcntl(F_GETFL) error (%d)\n", errno); + log_error("fcntl(F_GETFL) error (%d)", errno); + ret = -1; goto cleanup; } if ((flags_stdout = fcntl(STDOUT_FILENO, F_GETFL, 0)) == -1) { - log_error("fcntl(F_GETFL) error (%d)\n", errno); + log_error("fcntl(F_GETFL) error (%d)", errno); + ret = -1; goto cleanup; } if ((fcntl(STDIN_FILENO, F_SETFL, flags_stdin | O_NONBLOCK)) == -1) { - log_error("fcntl(F_SETFL) error (%d)\n", errno); + log_error("fcntl(F_SETFL) error (%d)", errno); + ret = -1; goto cleanup; } if ((fcntl(STDOUT_FILENO, F_SETFL, flags_stdout | O_NONBLOCK)) == -1) { - log_error("fcntl(F_SETFL) error (%d)\n", errno); + log_error("fcntl(F_SETFL) error (%d)", errno); + ret = -1; goto cleanup; } @@ -439,7 +506,8 @@ static int bbsnet_connect(int n) epollfd = epoll_create1(0); if (epollfd < 0) { - log_error("epoll_create1() error (%d)\n", errno); + log_error("epoll_create1() error (%d)", errno); + ret = -1; goto cleanup; } @@ -447,7 +515,8 @@ static int bbsnet_connect(int n) ev.data.fd = sock; if (epoll_ctl(epollfd, EPOLL_CTL_ADD, sock, &ev) == -1) { - log_error("epoll_ctl(socket) error (%d)\n", errno); + log_error("epoll_ctl(socket) error (%d)", errno); + ret = -1; goto cleanup; } @@ -455,14 +524,30 @@ static int bbsnet_connect(int n) ev.data.fd = STDIN_FILENO; if (epoll_ctl(epollfd, EPOLL_CTL_ADD, STDIN_FILENO, &ev) == -1) { - log_error("epoll_ctl(STDIN_FILENO) error (%d)\n", errno); + log_error("epoll_ctl(STDIN_FILENO) error (%d)", errno); + ret = -1; goto cleanup; } #endif - while (!SYS_server_exit) + while ((ts_now.tv_sec - ts_begin.tv_sec) * 1000 + + (ts_now.tv_nsec - ts_begin.tv_nsec) / 1000 / 1000 < + REMOTE_CONNECT_TIMEOUT * 1000 && + !SYS_server_exit) { - if ((ret = connect(sock, res->ai_addr, res->ai_addrlen)) < 0) + if (clock_gettime(CLOCK_REALTIME, &ts_now) == -1) + { + log_error("clock_gettime() error (%d)", errno); + ret = -1; + goto cleanup; + } + + if ((ret = connect(sock, res->ai_addr, res->ai_addrlen)) == 0) + { + sock_connected = 1; + break; + } + else if (ret < 0) { if (errno == EAGAIN || errno == EALREADY || errno == EINPROGRESS) { @@ -473,22 +558,41 @@ static int bbsnet_connect(int n) } else if (errno == EINTR) { - continue; } else { - log_error("connect(socket) error (%d)\n", errno); + log_error("connect(socket) error (%d)", errno); prints("\033[1;31m连接失败！\033[m\r\n"); press_any_key(); + ret = -1; + goto cleanup; + } + + if (progress_update(&ts_begin, &ts_now, + REMOTE_CONNECT_TIMEOUT * 1000, + &progress_last, PROGRESS_BAR_LEN) < 0) + { + log_error("progress_update() error"); + ret = -1; goto cleanup; } } } - for (int j = 0; j < MAX_PROCESS_BAR_LEN && !sock_connected && !SYS_server_exit; j++) + while ((ts_now.tv_sec - ts_begin.tv_sec) * 1000 + + (ts_now.tv_nsec - ts_begin.tv_nsec) / 1000 / 1000 < + REMOTE_CONNECT_TIMEOUT * 1000 && + !sock_connected && !SYS_server_exit) { + if (clock_gettime(CLOCK_REALTIME, &ts_now) == -1) + { + log_error("clock_gettime() error (%d)", errno); + ret = -1; + goto cleanup; + } + #ifdef HAVE_SYS_EPOLL_H - nfds = epoll_wait(epollfd, events, MAX_EVENTS, 500); // 0.5 second + nfds = epoll_wait(epollfd, events, MAX_EVENTS, 100); // 0.1 second ret = nfds; #else pfds[0].fd = sock; @@ -496,7 +600,7 @@ static int bbsnet_connect(int n) pfds[1].fd = STDIN_FILENO; pfds[1].events = POLLIN; nfds = 2; - ret = poll(pfds, (nfds_t)nfds, 500); // 0.5 second + ret = poll(pfds, (nfds_t)nfds, 100); // 0.1 second #endif if (ret < 0) @@ -504,16 +608,15 @@ static int bbsnet_connect(int n) if (errno != EINTR) { #ifdef HAVE_SYS_EPOLL_H - log_error("epoll_wait() error (%d)\n", errno); + log_error("epoll_wait() error (%d)", errno); #else - log_error("poll() error (%d)\n", errno); + log_error("poll() error (%d)", errno); #endif break; } } else if (ret == 0) // timeout { - process_bar(j + 1, MAX_PROCESS_BAR_LEN); } else // ret > 0 { @@ -528,12 +631,14 @@ static int bbsnet_connect(int n) socklen_t len = sizeof(error); if (getsockopt(sock, SOL_SOCKET, SO_ERROR, &error, &len) < 0) { - log_error("getsockopt() error (%d) !\n", errno); + log_error("getsockopt() error (%d) !", errno); + ret = -1; goto cleanup; } if (error == 0) { sock_connected = 1; + break; } } #ifdef HAVE_SYS_EPOLL_H @@ -548,230 +653,364 @@ static int bbsnet_connect(int n) } while (ch == 0); if (ch == Ctrl('C') || ch == KEY_ESC) { + ret = 0; goto cleanup; } } } } + + if (progress_update(&ts_begin, &ts_now, + REMOTE_CONNECT_TIMEOUT * 1000, + &progress_last, PROGRESS_BAR_LEN) < 0) + { + log_error("progress_update() error"); + ret = -1; + goto cleanup; + } } if (SYS_server_exit) { + ret = 0; goto cleanup; } if (!sock_connected) { + progress_bar(100, PROGRESS_BAR_LEN); prints("\033[1;31m连接失败！\033[m\r\n"); press_any_key(); + ret = -1; goto cleanup; } tos = IPTOS_LOWDELAY; if (setsockopt(sock, IPPROTO_IP, IP_TOS, &tos, sizeof(tos)) < 0) { - log_error("setsockopt IP_TOS=%d error (%d)\n", tos, errno); + log_error("setsockopt IP_TOS=%d error (%d)", tos, errno); } sock_len = sizeof(sin); if (getsockname(sock, (struct sockaddr *)&sin, &sock_len) < 0) { log_error("getsockname() error: %d", errno); + ret = -1; goto cleanup; } - strncpy(local_addr, inet_ntoa(sin.sin_addr), sizeof(local_addr) - 1); - local_addr[sizeof(local_addr) - 1] = '\0'; + if (inet_ntop(AF_INET, &(sin.sin_addr), local_addr, sizeof(local_addr)) == NULL) + { + log_error("inet_ntop() error (%d)", errno); + ret = -1; + goto cleanup; + } local_port = ntohs(sin.sin_port); if (bbsnet_conf[n].use_ssh) { - session = ssh_new(); - if (session == NULL) + outbound_session = ssh_new(); + if (outbound_session == NULL) { - log_error("ssh_new() error\n"); + log_error("ssh_new() error"); + ret = -1; 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].host_name) < 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) + if (ssh_options_set(outbound_session, SSH_OPTIONS_FD, &sock) < 0 || + ssh_options_set(outbound_session, SSH_OPTIONS_PROCESS_CONFIG, &ssh_process_config) < 0 || + ssh_options_set(outbound_session, SSH_OPTIONS_KNOWNHOSTS, SSH_KNOWN_HOSTS_FILE) < 0 || + ssh_options_set(outbound_session, SSH_OPTIONS_HOST, bbsnet_conf[n].host_name) < 0 || + ssh_options_set(outbound_session, SSH_OPTIONS_USER, remote_user) < 0 || + ssh_options_set(outbound_session, SSH_OPTIONS_HOSTKEYS, "+ssh-ed25519,ecdsa-sha2-nistp256,ssh-rsa") < 0 || + ssh_options_set(outbound_session, SSH_OPTIONS_LOG_VERBOSITY, &ssh_log_level) < 0) { - log_error("Error setting SSH options: %s\n", ssh_get_error(session)); + log_error("Error setting SSH options: %s", ssh_get_error(outbound_session)); + ret = -1; goto cleanup; } - ssh_set_blocking(session, 0); + ssh_set_blocking(outbound_session, 0); t_begin = time(NULL); ret = SSH_ERROR; - while (!SYS_server_exit && time(NULL) - t_begin < SSH_CONNECT_TIMEOUT) + while ((ts_now.tv_sec - ts_begin.tv_sec) * 1000 + + (ts_now.tv_nsec - ts_begin.tv_nsec) / 1000 / 1000 < + REMOTE_CONNECT_TIMEOUT * 1000 && + !SYS_server_exit) { - ret = ssh_connect(session); + if (clock_gettime(CLOCK_REALTIME, &ts_now) == -1) + { + log_error("clock_gettime() error (%d)", errno); + ret = -1; + goto cleanup; + } + + ret = ssh_connect(outbound_session); if (ret == SSH_OK) { break; } else if (ret == SSH_AGAIN) { - // log_error("ssh_connect() error: SSH_AGAIN\n"); + // log_debug("ssh_connect() error: SSH_AGAIN"); } else // if (ret == SSH_ERROR) { - log_error("ssh_connect() error: SSH_ERROR\n"); + log_error("ssh_connect() error: SSH_ERROR"); + ret = -1; + goto cleanup; + } + + if (progress_update(&ts_begin, &ts_now, + REMOTE_CONNECT_TIMEOUT * 1000, + &progress_last, PROGRESS_BAR_LEN) < 0) + { + log_error("progress_update() error"); + ret = -1; goto cleanup; } } if (ret != SSH_OK) { + progress_bar(100, PROGRESS_BAR_LEN); prints("\033[1;31m连接超时！\033[m\r\n"); press_any_key(); + ret = -1; goto cleanup; } - ret = ssh_session_is_known_server(session); + ret = ssh_session_is_known_server(outbound_session); switch (ret) { case SSH_KNOWN_HOSTS_NOT_FOUND: case SSH_KNOWN_HOSTS_UNKNOWN: - if (ssh_session_update_known_hosts(session) != SSH_OK) + if (ssh_session_update_known_hosts(outbound_session) != SSH_OK) { - log_error("ssh_session_update_known_hosts(%s) error\n", bbsnet_conf[n].host_name); + log_error("ssh_session_update_known_hosts(%s) error", bbsnet_conf[n].host_name); prints("\033[1;31m无法添加服务器证书\033[m\r\n"); press_any_key(); + ret = -1; goto cleanup; } - log_common("SSH key of (%s) is added into %s\n", bbsnet_conf[n].host_name, SSH_KNOWN_HOSTS_FILE); + log_common("SSH key of (%s) is added into %s", bbsnet_conf[n].host_name, 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].host_name, ret); + log_error("ssh_session_is_known_server(%s) error: %d", bbsnet_conf[n].host_name, ret); prints("\033[1;31m服务器证书已变更\033[m\r\n"); press_any_key(); + ret = -1; goto cleanup; } ret = SSH_AUTH_ERROR; - while (!SYS_server_exit && time(NULL) - t_begin < SSH_CONNECT_TIMEOUT) + while ((ts_now.tv_sec - ts_begin.tv_sec) * 1000 + + (ts_now.tv_nsec - ts_begin.tv_nsec) / 1000 / 1000 < + REMOTE_CONNECT_TIMEOUT * 1000 && + !SYS_server_exit) { - ret = ssh_userauth_password(session, NULL, remote_pass); + if (clock_gettime(CLOCK_REALTIME, &ts_now) == -1) + { + log_error("clock_gettime() error (%d)", errno); + ret = -1; + goto cleanup; + } + + ret = ssh_userauth_password(outbound_session, NULL, remote_pass); if (ret == SSH_AUTH_SUCCESS) { break; } else if (ret == SSH_AUTH_AGAIN) { - // log_error("ssh_userauth_password() error: SSH_AUTH_AGAIN\n"); + // log_debug("ssh_userauth_password() error: SSH_AUTH_AGAIN"); } else if (ret == SSH_AUTH_ERROR) { - log_error("ssh_userauth_password() error: SSH_AUTH_ERROR\n"); + log_error("ssh_userauth_password() error: SSH_AUTH_ERROR"); + ret = -1; goto cleanup; } else // if (ret == SSH_AUTH_DENIED) { - log_error("ssh_userauth_password() error: SSH_AUTH_DENIED\n"); + log_debug("ssh_userauth_password() error: SSH_AUTH_DENIED"); prints("\033[1;31m身份验证失败！\033[m\r\n"); press_any_key(); + ret = 0; + goto cleanup; + } + + if (progress_update(&ts_begin, &ts_now, + REMOTE_CONNECT_TIMEOUT * 1000, + &progress_last, PROGRESS_BAR_LEN) < 0) + { + log_error("progress_update() error"); + ret = -1; goto cleanup; } } if (ret != SSH_AUTH_SUCCESS) { + progress_bar(100, PROGRESS_BAR_LEN); prints("\033[1;31m连接超时！\033[m\r\n"); press_any_key(); + ret = -1; goto cleanup; } - channel = ssh_channel_new(session); - if (channel == NULL) + outbound_channel = ssh_channel_new(outbound_session); + if (outbound_channel == NULL) { - log_error("ssh_channel_new() error\n"); + log_error("ssh_channel_new() error"); + ret = -1; goto cleanup; } ret = SSH_ERROR; - while (!SYS_server_exit && time(NULL) - t_begin < SSH_CONNECT_TIMEOUT) + while ((ts_now.tv_sec - ts_begin.tv_sec) * 1000 + + (ts_now.tv_nsec - ts_begin.tv_nsec) / 1000 / 1000 < + REMOTE_CONNECT_TIMEOUT * 1000 && + !SYS_server_exit) { - ret = ssh_channel_open_session(channel); + if (clock_gettime(CLOCK_REALTIME, &ts_now) == -1) + { + log_error("clock_gettime() error (%d)", errno); + ret = -1; + goto cleanup; + } + + ret = ssh_channel_open_session(outbound_channel); if (ret == SSH_OK) { break; } else if (ret == SSH_AGAIN) { - // log_error("ssh_channel_open_session() error: SSH_AGAIN\n"); + // log_debug("ssh_channel_open_session() error: SSH_AGAIN"); } else // if (ret == SSH_ERROR) { - log_error("ssh_channel_open_session() error: SSH_ERROR\n"); + log_error("ssh_channel_open_session() error: SSH_ERROR"); + ret = -1; + goto cleanup; + } + + if (progress_update(&ts_begin, &ts_now, + REMOTE_CONNECT_TIMEOUT * 1000, + &progress_last, PROGRESS_BAR_LEN) < 0) + { + log_error("progress_update() error"); + ret = -1; goto cleanup; } } if (ret != SSH_OK) { + progress_bar(100, PROGRESS_BAR_LEN); prints("\033[1;31m连接超时！\033[m\r\n"); press_any_key(); + ret = -1; goto cleanup; } ret = SSH_ERROR; - while (!SYS_server_exit && time(NULL) - t_begin < SSH_CONNECT_TIMEOUT) + while ((ts_now.tv_sec - ts_begin.tv_sec) * 1000 + + (ts_now.tv_nsec - ts_begin.tv_nsec) / 1000 / 1000 < + REMOTE_CONNECT_TIMEOUT * 1000 && + !SYS_server_exit) { - ret = ssh_channel_request_pty(channel); + if (clock_gettime(CLOCK_REALTIME, &ts_now) == -1) + { + log_error("clock_gettime() error (%d)", errno); + ret = -1; + goto cleanup; + } + + ret = ssh_channel_request_pty(outbound_channel); if (ret == SSH_OK) { break; } else if (ret == SSH_AGAIN) { - // log_error("ssh_channel_request_pty() error: SSH_AGAIN\n"); + // log_debug("ssh_channel_request_pty() error: SSH_AGAIN"); } else // if (ret == SSH_ERROR) { - log_error("ssh_channel_request_pty() error: SSH_ERROR\n"); + log_error("ssh_channel_request_pty() error: SSH_ERROR"); + ret = -1; + goto cleanup; + } + + if (progress_update(&ts_begin, &ts_now, + REMOTE_CONNECT_TIMEOUT * 1000, + &progress_last, PROGRESS_BAR_LEN) < 0) + { + log_error("progress_update() error"); + ret = -1; goto cleanup; } } if (ret != SSH_OK) { + progress_bar(100, PROGRESS_BAR_LEN); prints("\033[1;31m连接超时！\033[m\r\n"); press_any_key(); + ret = -1; goto cleanup; } ret = SSH_ERROR; - while (!SYS_server_exit && time(NULL) - t_begin < SSH_CONNECT_TIMEOUT) + while ((ts_now.tv_sec - ts_begin.tv_sec) * 1000 + + (ts_now.tv_nsec - ts_begin.tv_nsec) / 1000 / 1000 < + REMOTE_CONNECT_TIMEOUT * 1000 && + !SYS_server_exit) { - ret = ssh_channel_request_shell(channel); + if (clock_gettime(CLOCK_REALTIME, &ts_now) == -1) + { + log_error("clock_gettime() error (%d)", errno); + ret = -1; + goto cleanup; + } + + ret = ssh_channel_request_shell(outbound_channel); if (ret == SSH_OK) { break; } else if (ret == SSH_AGAIN) { - // log_error("ssh_channel_request_shell() error: SSH_AGAIN\n"); + // log_debug("ssh_channel_request_shell() error: SSH_AGAIN"); } else // if (ret == SSH_ERROR) { - log_error("ssh_channel_request_shell() error: SSH_ERROR\n"); + log_error("ssh_channel_request_shell() error: SSH_ERROR"); + ret = -1; + goto cleanup; + } + + if (progress_update(&ts_begin, &ts_now, + REMOTE_CONNECT_TIMEOUT * 1000, + &progress_last, PROGRESS_BAR_LEN) < 0) + { + log_error("progress_update() error"); + ret = -1; goto cleanup; } } if (ret != SSH_OK) { + progress_bar(100, PROGRESS_BAR_LEN); prints("\033[1;31m连接超时！\033[m\r\n"); press_any_key(); + ret = -1; goto cleanup; } } prints("\033[1;31m连接成功！\033[m\r\n"); iflush(); - log_common("BBSNET connect to %s:%d from %s:%d by [%s]\n", + log_common("BBSNET connect to %s:%d from %s:%d by [%s]", remote_addr, remote_port, local_addr, local_port, BBS_username); snprintf(tocode, sizeof(tocode), "%s%s", bbsnet_conf[n].charset, @@ -779,7 +1018,8 @@ static int bbsnet_connect(int n) 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); + log_error("iconv_open(%s->%s) error: %d", stdio_charset, tocode, errno); + ret = -1; goto cleanup; } @@ -788,7 +1028,8 @@ static int bbsnet_connect(int n) 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); + log_error("iconv_open(%s->%s) error: %d", bbsnet_conf[n].charset, tocode, errno); + ret = -1; goto cleanup; } @@ -797,7 +1038,8 @@ static int bbsnet_connect(int n) ev.data.fd = sock; if (epoll_ctl(epollfd, EPOLL_CTL_MOD, sock, &ev) == -1) { - log_error("epoll_ctl(socket) error (%d)\n", errno); + log_error("epoll_ctl(socket) error (%d)", errno); + ret = -1; goto cleanup; } @@ -805,26 +1047,27 @@ static int bbsnet_connect(int n) ev.data.fd = STDOUT_FILENO; if (epoll_ctl(epollfd, EPOLL_CTL_ADD, STDOUT_FILENO, &ev) == -1) { - log_error("epoll_ctl(STDOUT_FILENO) error (%d)\n", errno); + log_error("epoll_ctl(STDOUT_FILENO) error (%d)", errno); + ret = -1; goto cleanup; } #endif - BBS_last_access_tm = t_used = time(NULL); + BBS_last_access_tm = t_begin = time(NULL); loop = 1; while (loop && !SYS_server_exit) { if (SSH_v2 && ssh_channel_is_closed(SSH_channel)) { - log_debug("SSH channel is closed\n"); + log_debug("SSH channel is closed"); loop = 0; break; } - if (bbsnet_conf[n].use_ssh && ssh_channel_is_closed(channel)) + if (bbsnet_conf[n].use_ssh && ssh_channel_is_closed(outbound_channel)) { - log_debug("Remote SSH channel is closed\n"); + log_debug("Outbound channel is closed"); loop = 0; break; } @@ -848,9 +1091,9 @@ static int bbsnet_connect(int n) if (errno != EINTR) { #ifdef HAVE_SYS_EPOLL_H - log_error("epoll_wait() error (%d)\n", errno); + log_error("epoll_wait() error (%d)", errno); #else - log_error("poll() error (%d)\n", errno); + log_error("poll() error (%d)", errno); #endif break; } @@ -860,6 +1103,7 @@ static int bbsnet_connect(int n) { if (time(NULL) - BBS_last_access_tm >= BBS_max_user_idle_time) { + log_debug("User input timeout"); break; } } @@ -873,9 +1117,9 @@ static int bbsnet_connect(int n) #endif { #ifdef HAVE_SYS_EPOLL_H - log_debug("FD (%d) error events (%d)\n", events[i].data.fd, events[i].events); + log_debug("FD (%d) error events (%d)", events[i].data.fd, events[i].events); #else - log_debug("FD (%d) error events (%d)\n", pfds[i].fd, pfds[i].revents); + log_debug("FD (%d) error events (%d)", pfds[i].fd, pfds[i].revents); #endif loop = 0; break; @@ -934,7 +1178,7 @@ static int bbsnet_connect(int n) 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) { - log_debug("ssh_channel_read_nonblocking() error: %s\n", ssh_get_error(SSH_session)); + log_debug("ssh_channel_read_nonblocking() error: %s", ssh_get_error(SSH_session)); loop = 0; break; } @@ -949,8 +1193,8 @@ static int bbsnet_connect(int n) // Send NO-OP to remote server input_buf[input_buf_len] = '\0'; input_buf_len++; - BBS_last_access_tm = time(NULL); + BBS_last_access_tm = time(NULL); stdin_read_wait = 0; break; // Check whether channel is still open } @@ -972,14 +1216,14 @@ static int bbsnet_connect(int n) } else { - log_error("read(STDIN) error (%d)\n", errno); + log_error("read(STDIN) error (%d)", errno); loop = 0; break; } } else if (ret == 0) // broken pipe { - log_debug("read(STDIN) EOF\n"); + log_debug("read(STDIN) EOF"); stdin_read_wait = 0; loop = 0; break; @@ -992,7 +1236,7 @@ static int bbsnet_connect(int n) // Refresh current action while user input if (user_online_update("BBS_NET") < 0) { - log_error("user_online_update(BBS_NET) error\n"); + log_error("user_online_update(BBS_NET) error"); } continue; @@ -1008,14 +1252,14 @@ static int bbsnet_connect(int n) #ifdef _DEBUG for (int j = input_buf_offset; j < input_buf_len; j++) { - log_debug("input: <--[%u]\n", (input_buf[j] + 256) % 256); + log_debug("input: <--[%u]", (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); + log_error("io_buf_conv(input, %d, %d, %d) error", input_buf_len, input_buf_offset, input_conv_len); input_buf_len = input_buf_offset; // Discard invalid sequence } @@ -1023,7 +1267,7 @@ static int bbsnet_connect(int n) #ifdef _DEBUG for (int j = input_conv_offset; j < input_conv_len; j++) { - log_debug("input_conv: <--[%u]\n", (input_conv[j] + 256) % 256); + log_debug("input_conv: <--[%u]", (input_conv[j] + 256) % 256); } #endif } @@ -1032,10 +1276,10 @@ static int bbsnet_connect(int n) { if (bbsnet_conf[n].use_ssh) { - ret = ssh_channel_write(channel, input_conv + input_conv_offset, (uint32_t)(input_conv_len - input_conv_offset)); + ret = ssh_channel_write(outbound_channel, input_conv + input_conv_offset, (uint32_t)(input_conv_len - input_conv_offset)); if (ret == SSH_ERROR) { - log_debug("ssh_channel_write() error: %s\n", ssh_get_error(session)); + log_debug("ssh_channel_write() error: %s", ssh_get_error(outbound_session)); loop = 0; break; } @@ -1057,14 +1301,14 @@ static int bbsnet_connect(int n) } else { - log_debug("write(socket) error (%d)\n", errno); + log_debug("write(socket) error (%d)", errno); loop = 0; break; } } else if (ret == 0) // broken pipe { - log_debug("write(socket) EOF\n"); + log_debug("write(socket) EOF"); sock_write_wait = 0; loop = 0; break; @@ -1089,11 +1333,11 @@ static int bbsnet_connect(int n) { if (bbsnet_conf[n].use_ssh) { - ret = ssh_channel_read_nonblocking(channel, output_buf + output_buf_len, + ret = ssh_channel_read_nonblocking(outbound_channel, output_buf + output_buf_len, (uint32_t)(sizeof(output_buf) - (size_t)output_buf_len), 0); if (ret == SSH_ERROR) { - log_debug("ssh_channel_read_nonblocking() error: %s\n", ssh_get_error(session)); + log_debug("ssh_channel_read_nonblocking() error: %s", ssh_get_error(outbound_session)); loop = 0; break; } @@ -1126,14 +1370,14 @@ static int bbsnet_connect(int n) } else { - log_debug("read(socket) error (%d)\n", errno); + log_debug("read(socket) error (%d)", errno); loop = 0; break; } } else if (ret == 0) // broken pipe { - log_debug("read(socket) EOF\n"); + log_debug("read(socket) EOF"); sock_read_wait = 0; loop = 0; break; @@ -1153,7 +1397,7 @@ static int bbsnet_connect(int n) 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); + log_error("io_buf_conv(output, %d, %d, %d) error", output_buf_len, output_buf_offset, output_conv_len); output_buf_len = output_buf_offset; // Discard invalid sequence } } @@ -1165,7 +1409,7 @@ static int bbsnet_connect(int n) ret = ssh_channel_write(SSH_channel, output_conv + output_conv_offset, (uint32_t)(output_conv_len - output_conv_offset)); if (ret == SSH_ERROR) { - log_debug("ssh_channel_write() error: %s\n", ssh_get_error(SSH_session)); + log_debug("ssh_channel_write() error: %s", ssh_get_error(SSH_session)); loop = 0; break; } @@ -1187,14 +1431,14 @@ static int bbsnet_connect(int n) } else { - log_debug("write(STDOUT) error (%d)\n", errno); + log_debug("write(STDOUT) error (%d)", errno); loop = 0; break; } } else if (ret == 0) // broken pipe { - log_debug("write(STDOUT) EOF\n"); + log_debug("write(STDOUT) EOF"); stdout_write_wait = 0; loop = 0; break; @@ -1214,7 +1458,17 @@ static int bbsnet_connect(int n) } } + ret = 1; // Normal disconnect + BBS_last_access_tm = time(NULL); + t_used = BBS_last_access_tm - t_begin; + log_common("BBSNET disconnect, %ld days %ld hours %ld minutes %ld seconds used", + t_used / 86400, t_used % 86400 / 3600, t_used % 3600 / 60, t_used % 60); + cleanup: + // Clear sensitive data + memset(remote_pass, 0, sizeof(remote_pass)); + memset(remote_user, 0, sizeof(remote_user)); + if (input_cd != (iconv_t)(-1)) { iconv_close(input_cd); @@ -1227,36 +1481,38 @@ cleanup: #ifdef HAVE_SYS_EPOLL_H if (epollfd != -1 && close(epollfd) < 0) { - log_error("close(epoll) error (%d)\n"); + log_error("close(epoll) error (%d)"); } #endif if (bbsnet_conf[n].use_ssh) { - if (channel != NULL) + if (outbound_channel != NULL) { - ssh_channel_free(channel); + ssh_channel_send_eof(outbound_channel); + ssh_channel_close(outbound_channel); + ssh_channel_free(outbound_channel); } - if (session != NULL) + if (outbound_session != NULL) { - ssh_disconnect(session); - ssh_free(session); + ssh_disconnect(outbound_session); + ssh_free(outbound_session); } } // Restore STDIN/STDOUT flags if (flags_stdin != -1 && fcntl(STDIN_FILENO, F_SETFL, flags_stdin) == -1) { - log_error("fcntl(F_SETFL) error (%d)\n", errno); + log_error("fcntl(F_SETFL) error (%d)", errno); } if (flags_stdout != -1 && fcntl(STDOUT_FILENO, F_SETFL, flags_stdout) == -1) { - log_error("fcntl(F_SETFL) error (%d)\n", errno); + log_error("fcntl(F_SETFL) error (%d)", errno); } if (sock != -1 && close(sock) == -1) { - log_error("Close socket failed\n"); + log_error("close(socket) error (%d)", errno); } if (res) @@ -1264,15 +1520,7 @@ cleanup: freeaddrinfo(res); } - t_used = time(NULL) - t_used; - tm_used = gmtime(&t_used); - - log_common("BBSNET disconnect, %d days %d hours %d minutes %d seconds used\n", - tm_used->tm_yday, tm_used->tm_hour, tm_used->tm_min, tm_used->tm_sec); - - BBS_last_access_tm = time(NULL); - - return 0; + return ret; } static int bbsnet_refresh() @@ -1325,7 +1573,7 @@ static int bbsnet_selchange() int bbs_net() { - int ch, i; + int ch; if (load_bbsnet_conf(CONF_BBSNET) < 0) { @@ -1352,12 +1600,12 @@ int bbs_net() switch (ch) { case KEY_NULL: // broken pipe - log_debug("KEY_NULL\n"); + log_debug("KEY_NULL"); goto cleanup; case KEY_TIMEOUT: if (time(NULL) - BBS_last_access_tm >= BBS_max_user_idle_time) { - log_error("User input timeout\n"); + log_debug("User input timeout"); goto cleanup; } continue; @@ -1365,7 +1613,10 @@ int bbs_net() case Ctrl('C'): // user cancel goto cleanup; case CR: - bbsnet_connect(bbsnet_menu.menu_item_pos[0]); + if (bbsnet_connect(bbsnet_menu.menu_item_pos[0]) < 0) + { + log_debug("bbsnet_connect() error"); + } // Force cleanup anything remaining in the output buffer clearscr(); iflush(); @@ -1375,14 +1626,14 @@ int bbs_net() bbsnet_selchange(); break; case KEY_UP: - for (i = 0; i < STATION_PER_LINE; i++) + for (int i = 0; i < STATION_PER_LINE; i++) { menu_control(&bbsnet_menu, KEY_UP); } bbsnet_selchange(); break; case KEY_DOWN: - for (i = 0; i < STATION_PER_LINE; i++) + for (int i = 0; i < STATION_PER_LINE; i++) { menu_control(&bbsnet_menu, KEY_DOWN); }