--- lbbs/src/net_server.c 2025/06/01 03:07:42 1.44 +++ lbbs/src/net_server.c 2025/11/14 08:45:25 1.82 @@ -1,111 +1,486 @@ -/*************************************************************************** - 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. * - * * - ***************************************************************************/ - -#define _XOPEN_SOURCE 500 -#define _POSIX_C_SOURCE 200809L -#define _GNU_SOURCE - -#include "net_server.h" +/* SPDX-License-Identifier: GPL-3.0-or-later */ +/* + * net_server + * - network server with SSH support + * + * Copyright (C) 2004-2025 Leaflet + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "bbs.h" +#include "bbs_main.h" +#include "bwf.h" #include "common.h" -#include "log.h" +#include "database.h" +#include "file_loader.h" +#include "hash_dict.h" #include "io.h" #include "init.h" -#include "fork.h" +#include "log.h" +#include "login.h" #include "menu.h" -#include "file_loader.h" +#include "net_server.h" +#include "section_list.h" #include "section_list_loader.h" #include #include -#include +#include #include #include +#include #include -#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include #include -#include -#include #include -struct process_sockaddr_t +enum _net_server_constant_t { + WAIT_CHILD_PROCESS_EXIT_TIMEOUT = 5, // second + WAIT_CHILD_PROCESS_KILL_TIMEOUT = 1, // second + + SSH_AUTH_MAX_DURATION = 60 * 1000, // milliseconds +}; + +static const char SFTP_SERVER_PATH[] = "/usr/lib/sftp-server"; + +/* A userdata struct for session. */ +struct session_data_struct +{ + int tries; + int error; +}; + +/* A userdata struct for channel. */ +struct channel_data_struct +{ + /* pid of the child process the channel will spawn. */ pid_t pid; - in_addr_t s_addr; + /* For PTY allocation */ + socket_t pty_master; + socket_t pty_slave; + /* For communication with the child process. */ + socket_t child_stdin; + socket_t child_stdout; + /* Only used for subsystem and exec requests. */ + socket_t child_stderr; + /* Event which is used to poll the above descriptors. */ + ssh_event event; + /* Terminal size struct. */ + struct winsize *winsize; }; -typedef struct process_sockaddr_t PROCESS_SOCKADDR; -static PROCESS_SOCKADDR process_sockaddr_pool[MAX_CLIENTS_LIMIT]; +static int auth_password(ssh_session session, const char *user, + const char *password, void *userdata) +{ + struct session_data_struct *sdata = (struct session_data_struct *)userdata; + int ret; + + if (strcmp(user, "guest") == 0) + { + ret = load_guest_info(); + } + else + { + ret = check_user(user, password); + } + + if (ret == 0) + { + return SSH_AUTH_SUCCESS; + } + + if ((++(sdata->tries)) >= BBS_login_retry_times) + { + sdata->error = 1; + } + + return SSH_AUTH_DENIED; +} + +static int pty_request(ssh_session session, ssh_channel channel, const char *term, + int cols, int rows, int px, int py, void *userdata) +{ + struct channel_data_struct *cdata = (struct channel_data_struct *)userdata; + int rc; + + (void)session; + (void)channel; + (void)term; + + cdata->winsize->ws_row = (unsigned short int)rows; + cdata->winsize->ws_col = (unsigned short int)cols; + cdata->winsize->ws_xpixel = (unsigned short int)px; + cdata->winsize->ws_ypixel = (unsigned short int)py; + + rc = openpty(&cdata->pty_master, &cdata->pty_slave, NULL, NULL, cdata->winsize); + if (rc != 0) + { + log_error("Failed to open pty\n"); + return SSH_ERROR; + } + + return SSH_OK; +} + +static int pty_resize(ssh_session session, ssh_channel channel, int cols, int rows, + int py, int px, void *userdata) +{ + struct channel_data_struct *cdata = (struct channel_data_struct *)userdata; + + (void)session; + (void)channel; + + cdata->winsize->ws_row = (unsigned short int)rows; + cdata->winsize->ws_col = (unsigned short int)cols; + cdata->winsize->ws_xpixel = (unsigned short int)px; + cdata->winsize->ws_ypixel = (unsigned short int)py; + + if (cdata->pty_master != -1) + { + return ioctl(cdata->pty_master, TIOCSWINSZ, cdata->winsize); + } + + return SSH_ERROR; +} + +static int exec_pty(const char *mode, const char *command, struct channel_data_struct *cdata) +{ + (void)cdata; + + if (command != NULL) + { + log_error("Forbid exec /bin/sh %s %s)\n", mode, command); + } + + return SSH_OK; +} + +static int exec_nopty(const char *command, struct channel_data_struct *cdata) +{ + (void)cdata; + + if (command != NULL) + { + log_error("Forbid exec /bin/sh -c %s)\n", command); + } + + return SSH_OK; +} + +static int exec_request(ssh_session session, ssh_channel channel, const char *command, void *userdata) +{ + struct channel_data_struct *cdata = (struct channel_data_struct *)userdata; + + (void)session; + (void)channel; + + if (cdata->pid > 0) + { + return SSH_ERROR; + } + + if (cdata->pty_master != -1 && cdata->pty_slave != -1) + { + return exec_pty("-c", command, cdata); + } + return exec_nopty(command, cdata); +} + +static int shell_request(ssh_session session, ssh_channel channel, void *userdata) +{ + struct channel_data_struct *cdata = (struct channel_data_struct *)userdata; + + (void)session; + (void)channel; + + if (cdata->pid > 0) + { + return SSH_ERROR; + } + + if (cdata->pty_master != -1 && cdata->pty_slave != -1) + { + return exec_pty("-l", NULL, cdata); + } + /* Client requested a shell without a pty, let's pretend we allow that */ + return SSH_OK; +} + +static int subsystem_request(ssh_session session, ssh_channel channel, const char *subsystem, void *userdata) +{ + (void)session; + (void)channel; + + log_error("subsystem_request(subsystem=%s)\n", subsystem); + + /* subsystem requests behave similarly to exec requests. */ + if (strcmp(subsystem, "sftp") == 0) + { + return exec_request(session, channel, SFTP_SERVER_PATH, userdata); + } + return SSH_ERROR; +} + +static ssh_channel channel_open(ssh_session session, void *userdata) +{ + (void)userdata; + + if (SSH_channel != NULL) + { + return NULL; + } + + SSH_channel = ssh_channel_new(session); + + return SSH_channel; +} -int net_server(const char *hostaddr, in_port_t port) +static int fork_server(void) { - unsigned int namelen; + ssh_event event; + long int ssh_timeout = 0; + int pid; + int i; int ret; - int flags; - struct sockaddr_in sin; - struct epoll_event ev, events[MAX_EVENTS]; - int nfds, epollfd; - siginfo_t siginfo; - int sd_notify_stopping = 0; - MENU_SET *p_bbs_menu_new; - int i, j; - pid_t pid; - socket_server = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + /* Structure for storing the pty size. */ + struct winsize wsize = { + .ws_row = 0, + .ws_col = 0, + .ws_xpixel = 0, + .ws_ypixel = 0}; + + /* Our struct holding information about the channel. */ + struct channel_data_struct cdata = { + .pid = 0, + .pty_master = -1, + .pty_slave = -1, + .child_stdin = -1, + .child_stdout = -1, + .child_stderr = -1, + .event = NULL, + .winsize = &wsize}; + + struct session_data_struct cb_data = { + .tries = 0, + .error = 0, + }; + + struct ssh_channel_callbacks_struct channel_cb = { + .userdata = &cdata, + .channel_pty_request_function = pty_request, + .channel_pty_window_change_function = pty_resize, + .channel_shell_request_function = shell_request, + .channel_exec_request_function = exec_request, + .channel_subsystem_request_function = subsystem_request}; + + struct ssh_server_callbacks_struct server_cb = { + .userdata = &cb_data, + .auth_password_function = auth_password, + .channel_open_request_session_function = channel_open, + }; - if (socket_server < 0) + pid = fork(); + + if (pid > 0) // Parent process { - log_error("Create socket failed\n"); + SYS_child_process_count++; + log_common("Child process (%d) start\n", pid); + return pid; + } + else if (pid < 0) // Error + { + log_error("fork() error (%d)\n", errno); return -1; } - sin.sin_family = AF_INET; - sin.sin_addr.s_addr = (hostaddr[0] != '\0' ? inet_addr(hostaddr) : INADDR_ANY); - sin.sin_port = htons(port); + // Child process + + if (close(socket_server[0]) == -1 || close(socket_server[1]) == -1) + { + log_error("Close server socket failed\n"); + } + + SSH_session = ssh_new(); - // Reuse address and port - flags = 1; - if (setsockopt(socket_server, SOL_SOCKET, SO_REUSEADDR, &flags, sizeof(flags)) < 0) + if (SSH_v2) { - log_error("setsockopt SO_REUSEADDR error (%d)\n", errno); + 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)); + goto cleanup; + } + + ssh_bind_free(sshbind); + + 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)); + goto cleanup; + } + + ssh_set_auth_methods(SSH_session, SSH_AUTH_METHOD_PASSWORD); + + ssh_callbacks_init(&server_cb); + ssh_callbacks_init(&channel_cb); + + ssh_set_server_callbacks(SSH_session, &server_cb); + + if (ssh_handle_key_exchange(SSH_session)) + { + log_error("ssh_handle_key_exchange() error: %s\n", ssh_get_error(SSH_session)); + goto cleanup; + } + + event = ssh_event_new(); + ssh_event_add_session(event, SSH_session); + + for (i = 0; i < SSH_AUTH_MAX_DURATION && !SYS_server_exit && !cb_data.error && SSH_channel == NULL; i += 100) + { + 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 + goto cleanup; + } + } + + if (cb_data.error) + { + log_error("SSH auth error, tried %d times\n", cb_data.tries); + goto cleanup; + } + + ssh_set_channel_callbacks(SSH_channel, &channel_cb); + + do + { + ret = ssh_event_dopoll(event, 100); // 0.1 second + if (ret == SSH_ERROR) + { + ssh_channel_close(SSH_channel); + } + + if (ret == SSH_AGAIN) // loop until SSH connection is fully established + { + /* Executed only once, once the child process starts. */ + cdata.event = event; + break; + } + } while (ssh_channel_is_open(SSH_channel)); + + 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)); + goto cleanup; + } } - if (setsockopt(socket_server, SOL_SOCKET, SO_REUSEPORT, &flags, sizeof(flags)) < 0) + + // Redirect Input + close(STDIN_FILENO); + if (dup2(socket_client, STDIN_FILENO) == -1) { - log_error("setsockopt SO_REUSEPORT error (%d)\n", errno); + log_error("Redirect stdin to client socket failed\n"); + goto cleanup; } - if (bind(socket_server, (struct sockaddr *)&sin, sizeof(sin)) < 0) + // Redirect Output + close(STDOUT_FILENO); + if (dup2(socket_client, STDOUT_FILENO) == -1) { - log_error("Bind address %s:%u failed (%d)\n", - inet_ntoa(sin.sin_addr), ntohs(sin.sin_port), errno); - return -1; + log_error("Redirect stdout to client socket failed\n"); + goto cleanup; } - if (listen(socket_server, 10) < 0) + SYS_child_process_count = 0; + + bbs_main(); + +cleanup: + // Child process exit + SYS_server_exit = 1; + + if (SSH_v2) { - log_error("Socket listen failed (%d)\n", errno); - return -1; + close(cdata.pty_master); + close(cdata.child_stdin); + close(cdata.child_stdout); + 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"); } - strncpy(hostaddr_server, inet_ntoa(sin.sin_addr), sizeof(hostaddr_server) - 1); - hostaddr_server[sizeof(hostaddr_server) - 1] = '\0'; + ssh_free(SSH_session); + ssh_finalize(); - port_server = ntohs(sin.sin_port); - namelen = sizeof(sin); + // Close Input and Output for client + close(STDIN_FILENO); + close(STDOUT_FILENO); - log_std("Listening at %s:%d\n", hostaddr_server, port_server); + log_common("Process exit normally\n"); + log_end(); + + _exit(0); + + return 0; +} + +int net_server(const char *hostaddr, in_port_t port[]) +{ + HASH_DICT *hash_dict_pid_sockaddr = NULL; + HASH_DICT *hash_dict_sockaddr_count = NULL; + + unsigned int addrlen; + int ret; + int flags[2]; + struct sockaddr_in sin; + struct epoll_event ev, events[MAX_EVENTS]; + int nfds, epollfd; + siginfo_t siginfo; + 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_log_level = SSH_LOG_NOLOG; + + ssh_init(); + + sshbind = ssh_bind_new(); + + 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_LOG_VERBOSITY, &ssh_log_level) < 0) + { + log_error("Error setting SSH bind options: %s\n", ssh_get_error(sshbind)); + ssh_bind_free(sshbind); + return -1; + } epollfd = epoll_create1(0); if (epollfd < 0) @@ -114,26 +489,81 @@ int net_server(const char *hostaddr, in_ return -1; } - ev.events = EPOLLIN; - ev.data.fd = socket_server; - if (epoll_ctl(epollfd, EPOLL_CTL_ADD, socket_server, &ev) == -1) + // Server socket + for (i = 0; i < 2; i++) { - log_error("epoll_ctl(socket_server) error (%d)\n", errno); - if (close(epollfd) < 0) + socket_server[i] = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + + if (socket_server[i] < 0) { - log_error("close(epoll) error (%d)\n"); + log_error("Create socket_server error (%d)\n", errno); + return -1; } - return -1; + + sin.sin_family = AF_INET; + sin.sin_addr.s_addr = (hostaddr[0] != '\0' ? inet_addr(hostaddr) : INADDR_ANY); + sin.sin_port = htons(port[i]); + + // Reuse address and port + flags[i] = 1; + if (setsockopt(socket_server[i], SOL_SOCKET, SO_REUSEADDR, &flags[i], sizeof(flags[i])) < 0) + { + log_error("setsockopt SO_REUSEADDR error (%d)\n", errno); + } + if (setsockopt(socket_server[i], SOL_SOCKET, SO_REUSEPORT, &flags[i], sizeof(flags[i])) < 0) + { + log_error("setsockopt SO_REUSEPORT error (%d)\n", errno); + } + + 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); + return -1; + } + + if (listen(socket_server[i], 10) < 0) + { + log_error("Telnet socket listen error (%d)\n", errno); + return -1; + } + + log_common("Listening at %s:%u\n", inet_ntoa(sin.sin_addr), ntohs(sin.sin_port)); + + ev.events = EPOLLIN; + ev.data.fd = socket_server[i]; + if (epoll_ctl(epollfd, 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("close(epoll) error (%d)\n"); + } + return -1; + } + + flags[i] = fcntl(socket_server[i], F_GETFL, 0); + fcntl(socket_server[i], F_SETFL, flags[i] | O_NONBLOCK); } - flags = fcntl(socket_server, F_GETFL, 0); - fcntl(socket_server, F_SETFL, flags | O_NONBLOCK); + 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\n"); + 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\n"); + return -1; + } // Startup complete sd_notifyf(0, "READY=1\n" - "STATUS=Listening at %s:%d\n" + "STATUS=Listening at %s:%d (Telnet) and %s:%d (SSH2)\n" "MAINPID=%d", - hostaddr_server, port_server, getpid()); + hostaddr, port[0], hostaddr, port[1], getpid()); while (!SYS_server_exit || SYS_child_process_count > 0) { @@ -154,20 +584,44 @@ int net_server(const char *hostaddr, in_ SYS_child_exit = 1; // Retry waitid SYS_child_process_count--; - log_std("Child process (%d) exited\n", siginfo.si_pid); + log_common("Child process (%d) exited\n", siginfo.si_pid); - i = 0; - for (; i < BBS_max_client; i++) + if (siginfo.si_pid != section_list_loader_pid) { - if (process_sockaddr_pool[i].pid == siginfo.si_pid) + j = 0; + ret = hash_dict_get(hash_dict_pid_sockaddr, (uint64_t)siginfo.si_pid, (int64_t *)&j); + if (ret < 0) { - process_sockaddr_pool[i].pid = 0; - break; + log_error("hash_dict_get(hash_dict_pid_sockaddr, %d) error\n", siginfo.si_pid); + } + else + { + sin.sin_addr.s_addr = (uint32_t)j; + j = 0; + ret = hash_dict_get(hash_dict_sockaddr_count, sin.sin_addr.s_addr, (int64_t *)&j); + if (ret < 0) + { + log_error("hash_dict_get(hash_dict_sockaddr_count, %d) error\n", sin.sin_addr.s_addr); + } + else if (ret == 0) + { + log_error("hash_dict_get(hash_dict_sockaddr_count, %d) not found\n", sin.sin_addr.s_addr); + j = 1; + } + + j--; + ret = hash_dict_set(hash_dict_sockaddr_count, sin.sin_addr.s_addr, j); + if (ret < 0) + { + log_error("hash_dict_set(hash_dict_sockaddr_count, %d, %d) error\n", sin.sin_addr.s_addr, j); + } + + ret = hash_dict_del(hash_dict_pid_sockaddr, (uint64_t)siginfo.si_pid); + if (ret < 0) + { + log_error("hash_dict_del(hash_dict_pid_sockaddr, %d) error\n", siginfo.si_pid); + } } - } - if (i >= BBS_max_client) - { - log_error("Child process (%d) not found in process sockaddr pool\n", siginfo.si_pid); } } else if (ret == 0) @@ -183,13 +637,36 @@ int net_server(const char *hostaddr, in_ if (SYS_server_exit && !SYS_child_exit && SYS_child_process_count > 0) { - log_std("Notify %d child process to exit\n", SYS_child_process_count); - if (kill(0, SIGTERM) < 0) + if (notify_child_exit == 0) { - log_error("Send SIGTERM signal failed (%d)\n", errno); + 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); + + if (kill(-getpid(), SIGTERM) < 0) + { + log_error("Send SIGTERM signal failed (%d)\n", errno); + } + + notify_child_exit = 1; + tm_notify_child_exit = time(NULL); } + else if (notify_child_exit == 1 && time(NULL) - tm_notify_child_exit >= WAIT_CHILD_PROCESS_EXIT_TIMEOUT) + { + sd_notifyf(0, "STATUS=Kill %d child process", SYS_child_process_count); - sd_notifyf(0, "STATUS=Waiting for %d child process to exit", SYS_child_process_count); + if (kill(-getpid(), SIGKILL) < 0) + { + log_error("Send SIGKILL signal failed (%d)\n", errno); + } + + notify_child_exit = 2; + tm_notify_child_exit = time(NULL); + } + 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); + SYS_child_process_count = 0; + } } if (SYS_conf_reload && !SYS_server_exit) @@ -203,58 +680,57 @@ int net_server(const char *hostaddr, in_ log_error("Reload conf failed\n"); } - p_bbs_menu_new = calloc(1, sizeof(MENU_SET)); - if (p_bbs_menu_new == NULL) + // Reload BWF config + if (bwf_load(CONF_BWF) < 0) { - log_error("OOM: calloc(MENU_SET)\n"); + log_error("Reload BWF conf failed\n"); } - else if (load_menu(p_bbs_menu_new, CONF_MENU) < 0) - { - unload_menu(p_bbs_menu_new); - free(p_bbs_menu_new); - p_bbs_menu_new = NULL; - log_error("Reload menu failed\n"); + if (load_menu(&bbs_menu_new, CONF_MENU) < 0) + { + unload_menu(&bbs_menu_new); + log_error("Reload bbs menu failed\n"); } else { - unload_menu(p_bbs_menu); - free(p_bbs_menu); - - p_bbs_menu = p_bbs_menu_new; - p_bbs_menu_new = NULL; - - log_std("Reload menu successfully\n"); + unload_menu(&bbs_menu); + memcpy(&bbs_menu, &bbs_menu_new, sizeof(bbs_menu_new)); + log_common("Reload bbs menu successfully\n"); } - sd_notify(0, "READY=1"); - } - - if (SYS_data_file_reload && !SYS_server_exit) - { - SYS_data_file_reload = 0; - sd_notify(0, "RELOADING=1"); + if (load_menu(&top10_menu_new, CONF_TOP10_MENU) < 0) + { + unload_menu(&top10_menu_new); + log_error("Reload top10 menu failed\n"); + } + else + { + 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"); + } 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\n", data_files_load_startup[i]); } } + log_common("Reload data files successfully\n"); - log_std("Reload data files successfully\n"); - sd_notify(0, "READY=1"); - } - - if (SYS_section_list_reload && !SYS_server_exit) - { - SYS_section_list_reload = 0; - - if (section_list_loader_reload() < 0) + // Load section config and gen_ex + if (load_section_config_from_db(1) < 0) + { + log_error("load_section_config_from_db(1) error\n"); + } + else { - log_error("ksection_list_loader_reload() failed\n"); + log_common("Reload section config and gen_ex successfully\n"); } + + sd_notify(0, "READY=1"); } nfds = epoll_wait(epollfd, events, MAX_EVENTS, 100); // 0.1 second @@ -277,11 +753,14 @@ int net_server(const char *hostaddr, in_ for (int i = 0; i < nfds; i++) { - if (events[i].data.fd == socket_server) + if (events[i].data.fd == socket_server[0] || events[i].data.fd == socket_server[1]) { + SSH_v2 = (events[i].data.fd == socket_server[1] ? 1 : 0); + while (!SYS_server_exit) // Accept all incoming connections until error { - socket_client = accept(socket_server, (struct sockaddr *)&sin, &namelen); + addrlen = sizeof(sin); + socket_client = accept(socket_server[SSH_v2], (struct sockaddr *)&sin, &addrlen); if (socket_client < 0) { if (errno == EAGAIN || errno == EWOULDBLOCK) @@ -304,22 +783,15 @@ int net_server(const char *hostaddr, in_ port_client = ntohs(sin.sin_port); - log_std("Accept connection from %s:%d\n", hostaddr_client, port_client); + 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++) + ret = hash_dict_get(hash_dict_sockaddr_count, (uint64_t)sin.sin_addr.s_addr, (int64_t *)&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_error("Too many client connections (%d) from %s\n", j, hostaddr_client); - break; - } - } + log_error("hash_dict_get(hash_dict_sockaddr_count, %s) error\n", hostaddr_client); } if (j < BBS_max_client_per_ip) @@ -330,26 +802,23 @@ int net_server(const char *hostaddr, in_ } 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, %d, %s) error\n", pid, hostaddr_client); } - if (i >= BBS_max_client) + ret = hash_dict_set(hash_dict_sockaddr_count, (uint64_t)sin.sin_addr.s_addr, j + 1); + if (ret < 0) { - log_error("Process sockaddr pool depleted\n"); - } - else - { - process_sockaddr_pool[i].pid = pid; - process_sockaddr_pool[i].s_addr = sin.sin_addr.s_addr; + log_error("hash_dict_set(hash_dict_sockaddr_count, %s, %d) error\n", hostaddr_client, j + 1); } } } + else + { + log_error("Rejected client connection from %s over limit per IP (%d)\n", hostaddr_client, BBS_max_client_per_ip); + } } else { @@ -370,12 +839,21 @@ int net_server(const char *hostaddr, in_ log_error("close(epoll) error (%d)\n"); } - fcntl(socket_server, F_SETFL, flags); - - if (close(socket_server) == -1) + for (i = 0; i < 2; i++) { - log_error("Close server socket failed\n"); + fcntl(socket_server[i], F_SETFL, flags[i]); + + if (close(socket_server[i]) == -1) + { + log_error("Close server socket failed\n"); + } } + hash_dict_destroy(hash_dict_pid_sockaddr); + hash_dict_destroy(hash_dict_sockaddr_count); + + ssh_bind_free(sshbind); + ssh_finalize(); + return 0; }