--- lbbs/src/net_server.c 2025/10/25 07:58:10 1.75 +++ lbbs/src/net_server.c 2026/01/03 10:27:14 1.115 @@ -1,24 +1,22 @@ -/*************************************************************************** - net_server.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 */ +/* + * net_server + * - network server with SSH support + * + * Copyright (C) 2004-2026 Leaflet + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "bbs.h" #include "bbs_main.h" +#include "bwf.h" #include "common.h" #include "database.h" #include "file_loader.h" +#include "hash_dict.h" #include "io.h" #include "init.h" #include "log.h" @@ -40,28 +38,29 @@ #include #include #include -#include +#include #include -#include +#include #include #include -#include - -#define WAIT_CHILD_PROCESS_EXIT_TIMEOUT 5 // second -#define WAIT_CHILD_PROCESS_KILL_TIMEOUT 1 // second -struct process_sockaddr_t -{ - pid_t pid; - in_addr_t s_addr; -}; -typedef struct process_sockaddr_t PROCESS_SOCKADDR; +#ifdef HAVE_SYS_EPOLL_H +#include +#else +#include +#endif -static PROCESS_SOCKADDR process_sockaddr_pool[MAX_CLIENT_LIMIT]; +#ifdef HAVE_SYSTEMD_SD_DAEMON_H +#include +#endif -#define SSH_AUTH_MAX_DURATION (60 * 1000) // milliseconds +enum _net_server_constant_t +{ + WAIT_CHILD_PROCESS_EXIT_TIMEOUT = 5, // second + WAIT_CHILD_PROCESS_KILL_TIMEOUT = 1, // second -#define SFTP_SERVER_PATH "/usr/lib/sftp-server" + SSH_AUTH_MAX_DURATION = 60 * 1000, // milliseconds +}; /* A userdata struct for session. */ struct session_data_struct @@ -89,6 +88,20 @@ struct channel_data_struct struct winsize *winsize; }; +static int socket_server[2]; +static int socket_client; + +#ifdef HAVE_SYS_EPOLL_H +static int epollfd_server = -1; +#endif + +static ssh_bind sshbind; + +static HASH_DICT *hash_dict_pid_sockaddr = NULL; +static HASH_DICT *hash_dict_sockaddr_count = NULL; + +static const char SFTP_SERVER_PATH[] = "/usr/lib/sftp-server"; + static int auth_password(ssh_session session, const char *user, const char *password, void *userdata) { @@ -102,10 +115,16 @@ static int auth_password(ssh_session ses else { ret = check_user(user, password); + if (ret == 2) // Enforce update user agreement + { + BBS_update_eula = 1; + ret = 0; + } } if (ret == 0) { + log_common("User [%s] authenticated successfully", user); return SSH_AUTH_SUCCESS; } @@ -114,6 +133,8 @@ static int auth_password(ssh_session ses sdata->error = 1; } + log_common("User [%s] authentication failed (%d/%d)", user, + sdata->tries, BBS_login_retry_times); return SSH_AUTH_DENIED; } @@ -135,7 +156,7 @@ static int pty_request(ssh_session sessi rc = openpty(&cdata->pty_master, &cdata->pty_slave, NULL, NULL, cdata->winsize); if (rc != 0) { - log_error("Failed to open pty\n"); + log_error("Failed to open pty"); return SSH_ERROR; } @@ -169,7 +190,7 @@ static int exec_pty(const char *mode, co if (command != NULL) { - log_error("Forbid exec /bin/sh %s %s)\n", mode, command); + log_error("Forbid exec /bin/sh %s %s)", mode, command); } return SSH_OK; @@ -181,7 +202,7 @@ static int exec_nopty(const char *comman if (command != NULL) { - log_error("Forbid exec /bin/sh -c %s)\n", command); + log_error("Forbid exec /bin/sh -c %s)", command); } return SSH_OK; @@ -231,7 +252,7 @@ static int subsystem_request(ssh_session (void)session; (void)channel; - log_error("subsystem_request(subsystem=%s)\n", subsystem); + log_error("subsystem_request(subsystem=%s)", subsystem); /* subsystem requests behave similarly to exec requests. */ if (strcmp(subsystem, "sftp") == 0) @@ -305,29 +326,41 @@ static int fork_server(void) if (pid > 0) // Parent process { SYS_child_process_count++; - log_common("Child process (%d) start\n", pid); + log_common("Child process (%d) start", pid); return pid; } else if (pid < 0) // Error { - log_error("fork() error (%d)\n", errno); + log_error("fork() error (%d)", errno); return -1; } // Child process +#ifdef HAVE_SYS_EPOLL_H + if (close(epollfd_server) < 0) + { + log_error("close(epollfd_server) error (%d)"); + } +#endif - if (close(socket_server[0]) == -1 || close(socket_server[1]) == -1) + for (i = 0; i < 2; i++) { - log_error("Close server socket failed\n"); + if (close(socket_server[i]) == -1) + { + log_error("Close server socket failed"); + } } + hash_dict_destroy(hash_dict_pid_sockaddr); + hash_dict_destroy(hash_dict_sockaddr_count); + SSH_session = ssh_new(); if (SSH_v2) { if (ssh_bind_accept_fd(sshbind, SSH_session, socket_client) != SSH_OK) { - log_error("ssh_bind_accept_fd() error: %s\n", ssh_get_error(SSH_session)); + log_error("ssh_bind_accept_fd() error: %s", ssh_get_error(SSH_session)); goto cleanup; } @@ -336,7 +369,7 @@ static int fork_server(void) ssh_timeout = 60; // second if (ssh_options_set(SSH_session, SSH_OPTIONS_TIMEOUT, &ssh_timeout) < 0) { - log_error("Error setting SSH options: %s\n", ssh_get_error(SSH_session)); + log_error("Error setting SSH options: %s", ssh_get_error(SSH_session)); goto cleanup; } @@ -349,7 +382,7 @@ static int fork_server(void) if (ssh_handle_key_exchange(SSH_session)) { - log_error("ssh_handle_key_exchange() error: %s\n", ssh_get_error(SSH_session)); + log_error("ssh_handle_key_exchange() error: %s", ssh_get_error(SSH_session)); goto cleanup; } @@ -361,16 +394,14 @@ static int fork_server(void) ret = ssh_event_dopoll(event, 100); // 0.1 second if (ret == SSH_ERROR) { -#ifdef _DEBUG - log_error("ssh_event_dopoll() error: %s\n", ssh_get_error(SSH_session)); -#endif + log_debug("ssh_event_dopoll() error: %s", ssh_get_error(SSH_session)); goto cleanup; } } if (cb_data.error) { - log_error("SSH auth error, tried %d times\n", cb_data.tries); + log_error("SSH auth error, tried %d times", cb_data.tries); goto cleanup; } @@ -395,29 +426,42 @@ static int fork_server(void) ssh_timeout = 0; if (ssh_options_set(SSH_session, SSH_OPTIONS_TIMEOUT, &ssh_timeout) < 0) { - log_error("Error setting SSH options: %s\n", ssh_get_error(SSH_session)); + log_error("Error setting SSH options: %s", ssh_get_error(SSH_session)); goto cleanup; } + + ssh_set_blocking(SSH_session, 0); } // Redirect Input - close(STDIN_FILENO); if (dup2(socket_client, STDIN_FILENO) == -1) { - log_error("Redirect stdin to client socket failed\n"); + log_error("Redirect stdin to client socket failed"); goto cleanup; } // Redirect Output - close(STDOUT_FILENO); if (dup2(socket_client, STDOUT_FILENO) == -1) { - log_error("Redirect stdout to client socket failed\n"); + log_error("Redirect stdout to client socket failed"); + goto cleanup; + } + + if (io_init() < 0) + { + log_error("io_init() error"); goto cleanup; } SYS_child_process_count = 0; + // BWF compile + if (bwf_compile() < 0) + { + log_error("bwf_compile() error"); + goto cleanup; + } + bbs_main(); cleanup: @@ -426,27 +470,43 @@ cleanup: if (SSH_v2) { - close(cdata.pty_master); - close(cdata.child_stdin); - close(cdata.child_stdout); - close(cdata.child_stderr); + if (cdata.pty_master != -1) + { + close(cdata.pty_master); + } + if (cdata.child_stdin != -1) + { + close(cdata.child_stdin); + } + if (cdata.child_stdout != -1) + { + close(cdata.child_stdout); + } + if (cdata.child_stderr != -1) + { + close(cdata.child_stderr); + } ssh_channel_free(SSH_channel); ssh_disconnect(SSH_session); } else if (close(socket_client) == -1) { - log_error("Close client socket failed\n"); + log_error("Close client socket failed"); } ssh_free(SSH_session); ssh_finalize(); + // BWF cleanup + bwf_cleanup(); + // Close Input and Output for client + io_cleanup(); close(STDIN_FILENO); close(STDOUT_FILENO); - log_common("Process exit normally\n"); + log_common("Process exit normally"); log_end(); _exit(0); @@ -456,52 +516,93 @@ cleanup: int net_server(const char *hostaddr, in_port_t port[]) { + struct stat file_stat; unsigned int addrlen; int ret; - int flags[2]; + int flags_server[2]; struct sockaddr_in sin; + char local_addr[INET_ADDRSTRLEN]; + +#ifdef HAVE_SYS_EPOLL_H struct epoll_event ev, events[MAX_EVENTS]; - int nfds, epollfd; - siginfo_t siginfo; +#else + struct pollfd pfds[2]; +#endif + + int nfds; int notify_child_exit = 0; time_t tm_notify_child_exit = time(NULL); - int sd_notify_stopping = 0; - MENU_SET bbs_menu_new; - MENU_SET top10_menu_new; - int i, j; pid_t pid; + int ssh_key_valid = 0; int ssh_log_level = SSH_LOG_NOLOG; +#ifdef HAVE_SYSTEMD_SD_DAEMON_H + int sd_notify_stopping = 0; +#endif + ssh_init(); sshbind = ssh_bind_new(); + if (ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_HOSTKEY, SSH_HOST_RSA_KEY_FILE) < 0) + { + log_error("Error loading SSH RSA key: %s", SSH_HOST_RSA_KEY_FILE); + } + else + { + ssh_key_valid = 1; + } + if (ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_HOSTKEY, SSH_HOST_ED25519_KEY_FILE) < 0) + { + log_error("Error loading SSH ED25519 key: %s", SSH_HOST_ED25519_KEY_FILE); + } + else + { + ssh_key_valid = 1; + } + if (ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_HOSTKEY, SSH_HOST_ECDSA_KEY_FILE) < 0) + { + log_error("Error loading SSH ECDSA key: %s", SSH_HOST_ECDSA_KEY_FILE); + } + else + { + ssh_key_valid = 1; + } + + if (!ssh_key_valid) + { + log_error("Error: no valid SSH host key"); + ssh_bind_free(sshbind); + return -1; + } + if (ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_BINDADDR, hostaddr) < 0 || ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_BINDPORT, &port) < 0 || - ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_HOSTKEY, SSH_HOST_KEYFILE) < 0 || - ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_HOSTKEY_ALGORITHMS, "ssh-rsa,rsa-sha2-512,rsa-sha2-256") < 0 || + ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_HOSTKEY_ALGORITHMS, "+ssh-ed25519,ecdsa-sha2-nistp256,ssh-rsa") < 0 || ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_LOG_VERBOSITY, &ssh_log_level) < 0) { - log_error("Error setting SSH bind options: %s\n", ssh_get_error(sshbind)); + log_error("Error setting SSH bind options: %s", ssh_get_error(sshbind)); ssh_bind_free(sshbind); return -1; } - epollfd = epoll_create1(0); - if (epollfd < 0) +#ifdef HAVE_SYS_EPOLL_H + epollfd_server = epoll_create1(0); + if (epollfd_server == -1) { - log_error("epoll_create1() error (%d)\n", errno); + log_error("epoll_create1() error (%d)", errno); return -1; } +#endif // Server socket - for (i = 0; i < 2; i++) + for (int i = 0; i < 2; i++) { socket_server[i] = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); if (socket_server[i] < 0) { - log_error("Create socket_server error (%d)\n", errno); + log_error("Create socket_server error (%d)", errno); return -1; } @@ -509,99 +610,145 @@ int net_server(const char *hostaddr, in_ sin.sin_addr.s_addr = (hostaddr[0] != '\0' ? inet_addr(hostaddr) : INADDR_ANY); sin.sin_port = htons(port[i]); + if (inet_ntop(AF_INET, &(sin.sin_addr), local_addr, sizeof(local_addr)) == NULL) + { + log_error("inet_ntop() error (%d)", errno); + return -1; + } + // Reuse address and port - flags[i] = 1; - if (setsockopt(socket_server[i], SOL_SOCKET, SO_REUSEADDR, &flags[i], sizeof(flags[i])) < 0) + flags_server[i] = 1; + if (setsockopt(socket_server[i], SOL_SOCKET, SO_REUSEADDR, &flags_server[i], sizeof(flags_server[i])) < 0) { - log_error("setsockopt SO_REUSEADDR error (%d)\n", errno); + log_error("setsockopt SO_REUSEADDR error (%d)", errno); } - if (setsockopt(socket_server[i], SOL_SOCKET, SO_REUSEPORT, &flags[i], sizeof(flags[i])) < 0) +#if defined(SO_REUSEPORT) + if (setsockopt(socket_server[i], SOL_SOCKET, SO_REUSEPORT, &flags_server[i], sizeof(flags_server[i])) < 0) { - log_error("setsockopt SO_REUSEPORT error (%d)\n", errno); + log_error("setsockopt SO_REUSEPORT error (%d)", errno); } +#endif if (bind(socket_server[i], (struct sockaddr *)&sin, sizeof(sin)) < 0) { - log_error("Bind address %s:%u error (%d)\n", - inet_ntoa(sin.sin_addr), ntohs(sin.sin_port), errno); + log_error("Bind address %s:%u error (%d)", + local_addr, port[i], errno); return -1; } if (listen(socket_server[i], 10) < 0) { - log_error("Telnet socket listen error (%d)\n", errno); + log_error("Telnet socket listen error (%d)", errno); return -1; } - log_common("Listening at %s:%u\n", inet_ntoa(sin.sin_addr), ntohs(sin.sin_port)); + log_common("Listening at %s:%u", local_addr, port[i]); +#ifdef HAVE_SYS_EPOLL_H ev.events = EPOLLIN; ev.data.fd = socket_server[i]; - if (epoll_ctl(epollfd, EPOLL_CTL_ADD, socket_server[i], &ev) == -1) + if (epoll_ctl(epollfd_server, EPOLL_CTL_ADD, socket_server[i], &ev) == -1) { - log_error("epoll_ctl(socket_server[%d]) error (%d)\n", i, errno); - if (close(epollfd) < 0) + log_error("epoll_ctl(socket_server[%d]) error (%d)", i, errno); + if (close(epollfd_server) < 0) { - log_error("close(epoll) error (%d)\n"); + log_error("close(epoll) error (%d)"); } return -1; } +#endif - flags[i] = fcntl(socket_server[i], F_GETFL, 0); - fcntl(socket_server[i], F_SETFL, flags[i] | O_NONBLOCK); + flags_server[i] = fcntl(socket_server[i], F_GETFL, 0); + fcntl(socket_server[i], F_SETFL, flags_server[i] | O_NONBLOCK); + } + + ssh_bind_set_blocking(sshbind, 0); + + hash_dict_pid_sockaddr = hash_dict_create(MAX_CLIENT_LIMIT); + if (hash_dict_pid_sockaddr == NULL) + { + log_error("hash_dict_create(hash_dict_pid_sockaddr) error"); + return -1; + } + hash_dict_sockaddr_count = hash_dict_create(MAX_CLIENT_LIMIT); + if (hash_dict_sockaddr_count == NULL) + { + log_error("hash_dict_create(hash_dict_sockaddr_count) error"); + return -1; } // Startup complete +#ifdef HAVE_SYSTEMD_SD_DAEMON_H sd_notifyf(0, "READY=1\n" "STATUS=Listening at %s:%d (Telnet) and %s:%d (SSH2)\n" "MAINPID=%d", hostaddr, port[0], hostaddr, port[1], getpid()); +#endif while (!SYS_server_exit || SYS_child_process_count > 0) { +#ifdef HAVE_SYSTEMD_SD_DAEMON_H if (SYS_server_exit && !sd_notify_stopping) { sd_notify(0, "STOPPING=1"); sd_notify_stopping = 1; } +#endif while ((SYS_child_exit || SYS_server_exit) && SYS_child_process_count > 0) { SYS_child_exit = 0; - siginfo.si_pid = 0; - ret = waitid(P_ALL, 0, &siginfo, WEXITED | WNOHANG); - if (ret == 0 && siginfo.si_pid > 0) + pid = waitpid(-1, &ret, WNOHANG); + if (pid > 0) { SYS_child_exit = 1; // Retry waitid - SYS_child_process_count--; - log_common("Child process (%d) exited\n", siginfo.si_pid); - if (siginfo.si_pid != section_list_loader_pid) + if (WIFEXITED(ret)) + { + log_common("Child process (%d) exited, status=%d", pid, WEXITSTATUS(ret)); + } + else if (WIFSIGNALED(ret)) + { + log_common("Child process (%d) is killed, status=%d", pid, WTERMSIG(ret)); + } + else + { + log_common("Child process (%d) exited abnormally, status=%d", pid, ret); + } + + if (pid != section_list_loader_pid) { - i = 0; - for (; i < BBS_max_client; i++) + int64_t j = 0; + ret = hash_dict_get(hash_dict_pid_sockaddr, (uint64_t)pid, &j); + if (ret < 0) { - if (process_sockaddr_pool[i].pid == siginfo.si_pid) - { - process_sockaddr_pool[i].pid = 0; - break; - } + log_error("hash_dict_get(hash_dict_pid_sockaddr, %d) error", pid); } - if (i >= BBS_max_client) + else { - log_error("Child process (%d) not found in process sockaddr pool\n", siginfo.si_pid); + ret = hash_dict_inc(hash_dict_sockaddr_count, (in_addr_t)j, -1); + if (ret <= 0) + { + log_error("hash_dict_inc(hash_dict_sockaddr_count, %lu, -1) error: %d", (in_addr_t)j, ret); + } + + ret = hash_dict_del(hash_dict_pid_sockaddr, (uint64_t)pid); + if (ret < 0) + { + log_error("hash_dict_del(hash_dict_pid_sockaddr, %lu) error", (uint64_t)pid); + } } } } - else if (ret == 0) + else if (pid == 0) { break; } - else if (ret < 0) + else if (pid < 0) { - log_error("Error in waitid: %d\n", errno); + log_error("Error in waitpid(): %d", errno); break; } } @@ -610,12 +757,14 @@ int net_server(const char *hostaddr, in_ { if (notify_child_exit == 0) { +#ifdef HAVE_SYSTEMD_SD_DAEMON_H sd_notifyf(0, "STATUS=Notify %d child process to exit", SYS_child_process_count); - log_common("Notify %d child process to exit\n", SYS_child_process_count); + log_common("Notify %d child process to exit", SYS_child_process_count); +#endif if (kill(0, SIGTERM) < 0) { - log_error("Send SIGTERM signal failed (%d)\n", errno); + log_error("Send SIGTERM signal failed (%d)", errno); } notify_child_exit = 1; @@ -623,18 +772,13 @@ int net_server(const char *hostaddr, in_ } else if (notify_child_exit == 1 && time(NULL) - tm_notify_child_exit >= WAIT_CHILD_PROCESS_EXIT_TIMEOUT) { +#ifdef HAVE_SYSTEMD_SD_DAEMON_H sd_notifyf(0, "STATUS=Kill %d child process", SYS_child_process_count); +#endif - for (i = 0; i < BBS_max_client; i++) + if (kill(0, SIGKILL) < 0) { - if (process_sockaddr_pool[i].pid != 0) - { - log_error("Kill child process (pid=%d)\n", process_sockaddr_pool[i].pid); - if (kill(process_sockaddr_pool[i].pid, SIGKILL) < 0) - { - log_error("Send SIGKILL signal failed (%d)\n", errno); - } - } + log_error("Send SIGKILL signal failed (%d)", errno); } notify_child_exit = 2; @@ -642,7 +786,7 @@ int net_server(const char *hostaddr, in_ } else if (notify_child_exit == 2 && time(NULL) - tm_notify_child_exit >= WAIT_CHILD_PROCESS_KILL_TIMEOUT) { - log_error("Main process prepare to exit without waiting for %d child process any longer\n", SYS_child_process_count); + log_error("Main process prepare to exit without waiting for %d child process any longer", SYS_child_process_count); SYS_child_process_count = 0; } } @@ -650,68 +794,107 @@ int net_server(const char *hostaddr, in_ if (SYS_conf_reload && !SYS_server_exit) { SYS_conf_reload = 0; + +#ifdef HAVE_SYSTEMD_SD_DAEMON_H sd_notify(0, "RELOADING=1"); +#endif + + log_common("Reload configuration"); + + // Restart log + if (log_restart() < 0) + { + log_error("Restart logging failed"); + } // Reload configuration if (load_conf(CONF_BBSD) < 0) { - log_error("Reload conf failed\n"); + log_error("Reload conf failed"); + } + + // Reload BWF config + if (bwf_load(CONF_BWF) < 0) + { + log_error("Reload BWF conf failed"); } - if (load_menu(&bbs_menu_new, CONF_MENU) < 0) + // Get EULA modification tm + if (stat(DATA_EULA, &file_stat) == -1) { - unload_menu(&bbs_menu_new); - log_error("Reload bbs menu failed\n"); + log_error("stat(%s) error", DATA_EULA, errno); } else { + BBS_eula_tm = file_stat.st_mtim.tv_sec; + } + + if (detach_menu_shm(&bbs_menu) < 0) + { + log_error("detach_menu_shm(bbs_menu) error"); + } + if (load_menu(&bbs_menu, CONF_MENU) < 0) + { + log_error("load_menu(bbs_menu) error"); unload_menu(&bbs_menu); - memcpy(&bbs_menu, &bbs_menu_new, sizeof(bbs_menu_new)); - log_common("Reload bbs menu successfully\n"); } - if (load_menu(&top10_menu_new, CONF_TOP10_MENU) < 0) + if (detach_menu_shm(&top10_menu) < 0) { - unload_menu(&top10_menu_new); - log_error("Reload top10 menu failed\n"); + log_error("detach_menu_shm(top10_menu) error"); } - else + if (load_menu(&top10_menu, CONF_TOP10_MENU) < 0) { + log_error("load_menu(top10_menu) error"); unload_menu(&top10_menu); - top10_menu_new.allow_exit = 1; - memcpy(&top10_menu, &top10_menu_new, sizeof(top10_menu_new)); - log_common("Reload top10 menu successfully\n"); } + top10_menu.allow_exit = 1; for (int i = 0; i < data_files_load_startup_count; i++) { if (load_file(data_files_load_startup[i]) < 0) { - log_error("load_file_mmap(%s) error\n", data_files_load_startup[i]); + log_error("load_file(%s) error", data_files_load_startup[i]); } } - log_common("Reload data files successfully\n"); // Load section config and gen_ex if (load_section_config_from_db(1) < 0) { - log_error("load_section_config_from_db(1) error\n"); + log_error("load_section_config_from_db(1) error"); } - else + + // Notify child processes to reload configuration + if (kill(0, SIGUSR1) < 0) { - log_common("Reload section config and gen_ex successfully\n"); + log_error("Send SIGUSR1 signal failed (%d)", errno); } +#ifdef HAVE_SYSTEMD_SD_DAEMON_H sd_notify(0, "READY=1"); +#endif } - nfds = epoll_wait(epollfd, events, MAX_EVENTS, 100); // 0.1 second - - if (nfds < 0) +#ifdef HAVE_SYS_EPOLL_H + nfds = epoll_wait(epollfd_server, events, MAX_EVENTS, 100); // 0.1 second + ret = nfds; +#else + pfds[0].fd = socket_server[0]; + pfds[0].events = POLLIN; + pfds[1].fd = socket_server[1]; + pfds[1].events = POLLIN; + nfds = 2; + ret = poll(pfds, (nfds_t)nfds, 100); // 0.1 second +#endif + if (ret < 0) { if (errno != EINTR) { - log_error("epoll_wait() error (%d)\n", errno); +#ifdef HAVE_SYS_EPOLL_H + log_error("epoll_wait() error (%d)", errno); +#else + log_error("poll() error (%d)", errno); +#endif break; } continue; @@ -725,14 +908,22 @@ int net_server(const char *hostaddr, in_ for (int i = 0; i < nfds; i++) { +#ifdef HAVE_SYS_EPOLL_H if (events[i].data.fd == socket_server[0] || events[i].data.fd == socket_server[1]) +#else + if ((pfds[i].fd == socket_server[0] || pfds[i].fd == socket_server[1]) && (pfds[i].revents & POLLIN)) +#endif { +#ifdef HAVE_SYS_EPOLL_H SSH_v2 = (events[i].data.fd == socket_server[1] ? 1 : 0); +#else + SSH_v2 = (pfds[i].fd == socket_server[1] ? 1 : 0); +#endif while (!SYS_server_exit) // Accept all incoming connections until error { addrlen = sizeof(sin); - socket_client = accept(socket_server[SSH_v2], (struct sockaddr *)&sin, &addrlen); + socket_client = accept(socket_server[SSH_v2], (struct sockaddr *)&sin, (socklen_t *)&addrlen); if (socket_client < 0) { if (errno == EAGAIN || errno == EWOULDBLOCK) @@ -745,92 +936,107 @@ int net_server(const char *hostaddr, in_ } else { - log_error("accept(socket_server) error (%d)\n", errno); + log_error("accept(socket_server) error (%d)", errno); break; } } - strncpy(hostaddr_client, inet_ntoa(sin.sin_addr), sizeof(hostaddr_client) - 1); - hostaddr_client[sizeof(hostaddr_client) - 1] = '\0'; - + if (inet_ntop(AF_INET, &(sin.sin_addr), hostaddr_client, sizeof(hostaddr_client)) == NULL) + { + log_error("inet_ntop() error (%d)", errno); + close(socket_client); + break; + } port_client = ntohs(sin.sin_port); - log_common("Accept %s connection from %s:%d\n", (SSH_v2 ? "SSH" : "telnet"), hostaddr_client, port_client); - if (SYS_child_process_count - 1 < BBS_max_client) { - j = 0; - for (i = 0; i < BBS_max_client; i++) + int64_t j = 0; + ret = hash_dict_get(hash_dict_sockaddr_count, sin.sin_addr.s_addr, &j); + if (ret < 0) { - if (process_sockaddr_pool[i].pid != 0 && process_sockaddr_pool[i].s_addr == sin.sin_addr.s_addr) - { - j++; - if (j >= BBS_max_client_per_ip) - { - log_common("Too many client connections (%d) from %s\n", j, hostaddr_client); - break; - } - } + log_error("hash_dict_get(hash_dict_sockaddr_count, %s) error", hostaddr_client); } if (j < BBS_max_client_per_ip) { if ((pid = fork_server()) < 0) { - log_error("fork_server() error\n"); + log_error("fork_server() error"); } else if (pid > 0) { - i = 0; - for (; i < BBS_max_client; i++) + ret = hash_dict_set(hash_dict_pid_sockaddr, (uint64_t)pid, sin.sin_addr.s_addr); + if (ret < 0) { - if (process_sockaddr_pool[i].pid == 0) - { - break; - } + log_error("hash_dict_set(hash_dict_pid_sockaddr, %lu, %s) error", (uint64_t)pid, hostaddr_client); } - if (i >= BBS_max_client) + if (j == 0) { - log_error("Process sockaddr pool depleted\n"); + // First connection from this IP + log_common("Accept %s connection from %s:%d", + (SSH_v2 ? "SSH" : "telnet"), hostaddr_client, port_client); + + ret = hash_dict_set(hash_dict_sockaddr_count, (uint64_t)sin.sin_addr.s_addr, 1); + if (ret < 0) + { + log_error("hash_dict_set(hash_dict_sockaddr_count, %s, 1) error", hostaddr_client); + } } else { - process_sockaddr_pool[i].pid = pid; - process_sockaddr_pool[i].s_addr = sin.sin_addr.s_addr; + // Increase connection count from this IP + log_common("Accept %s connection from %s:%d, already have %d connections", + (SSH_v2 ? "SSH" : "telnet"), hostaddr_client, port_client, j); + + ret = hash_dict_inc(hash_dict_sockaddr_count, (uint64_t)sin.sin_addr.s_addr, 1); + if (ret <= 0) + { + log_error("hash_dict_inc(hash_dict_sockaddr_count, %s, 1) error: %d", hostaddr_client, ret); + } } } } + else + { + log_error("Rejected %s connection from %s:%d over limit per IP (%d >= %d)", + (SSH_v2 ? "SSH" : "telnet"), hostaddr_client, port_client, j, BBS_max_client_per_ip); + } } else { - log_error("Rejected client connection over limit (%d)\n", SYS_child_process_count - 1); + log_error("Rejected %s connection from %s:%d over limit (%d >= %d)", + (SSH_v2 ? "SSH" : "telnet"), hostaddr_client, port_client, SYS_child_process_count - 1, BBS_max_client); } if (close(socket_client) == -1) { - log_error("close(socket_lient) error (%d)\n", errno); + log_error("close(socket_lient) error (%d)", errno); } } } } } - if (close(epollfd) < 0) +#ifdef HAVE_SYS_EPOLL_H + if (close(epollfd_server) < 0) { - log_error("close(epoll) error (%d)\n"); + log_error("close(epollfd_server) error (%d)"); } +#endif - for (i = 0; i < 2; i++) + for (int i = 0; i < 2; i++) { - fcntl(socket_server[i], F_SETFL, flags[i]); - if (close(socket_server[i]) == -1) { - log_error("Close server socket failed\n"); + log_error("Close server socket failed"); } } + hash_dict_destroy(hash_dict_pid_sockaddr); + hash_dict_destroy(hash_dict_sockaddr_count); + ssh_bind_free(sshbind); ssh_finalize();