X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=send_common.c;h=24b14ab8ed50b90c956fc6578199f8a4da3f2c4e;hp=250a2a0bc5a80f8973b33d43bcb2e12e3ee723e9;hb=3b0a8fdb191309652e71e104a8f3705d55a93d3e;hpb=9c5fbc5dd8b53604d7e73fb6714ee2b5e3458866 diff --git a/send_common.c b/send_common.c index 250a2a0b..24b14ab8 100644 --- a/send_common.c +++ b/send_common.c @@ -1,13 +1,15 @@ -/* - * Copyright (C) 2005-2013 Andre Noll - * - * Licensed under the GPL v2. For licencing details see COPYING. - */ +/* Copyright (C) 2005 Andre Noll , see file COPYING. */ /** \file send_common.c Functions used by more than one paraslash sender. */ +#include +#include #include #include +#include +#include +#include +#include #include "para.h" #include "error.h" @@ -28,34 +30,6 @@ /** Clients will be kicked if there are more than that many bytes pending. */ #define MAX_CQ_BYTES 40000 -/** - * Open a passive socket of given layer4 type. - * - * Set the resulting file descriptor to nonblocking mode and add it to the list - * of fds that are being closed in the child process when the server calls - * fork(). - * - * \param l4type The transport-layer protocol. - * \param port The port number. - * - * \return The listening fd on success, negative on errors. - */ -static int open_sender(unsigned l4type, int port) -{ - int fd, ret = para_listen_simple(l4type, port); - - if (ret < 0) - return ret; - fd = ret; - ret = mark_fd_nonblocking(fd); - if (ret < 0) { - close(fd); - return ret; - } - add_close_on_fork_list(fd); - return fd; -} - /** * Shut down a client connected to a paraslash sender. * @@ -66,14 +40,16 @@ static int open_sender(unsigned l4type, int port) * list, destroy the chunk queue of this client, delete the client from the * list of connected clients and free the sender_client struct. * - * \sa shutdown_clients(). + * \sa \ref shutdown_clients(). */ void shutdown_client(struct sender_client *sc, struct sender_status *ss) { PARA_INFO_LOG("shutting down %s on fd %d\n", sc->name, sc->fd); free(sc->name); - close(sc->fd); - del_close_on_fork_list(sc->fd); + if (!process_is_command_handler()) { + close(sc->fd); + del_close_on_fork_list(sc->fd); + } cq_destroy(sc->cq); list_del(&sc->node); free(sc->private_data); @@ -128,19 +104,51 @@ int send_queued_chunks(int fd, struct chunk_queue *cq) * Initialize a struct sender status. * * \param ss The struct to initialize. - * \param access_arg The array of access arguments given at the command line. - * \param num_access_args The number of elements in \a access_arg. - * \param port The tcp or dccp port to listen on. + * \param acl_opt_result Contains array of --{http|dccp}-access arguments. + * \param listen_address_opt_result Where to listen on. + * \param default_port Used for addresses with no specified port. * \param max_clients The maximal number of simultaneous connections. * \param default_deny Whether a blacklist should be used for access control. */ -void init_sender_status(struct sender_status *ss, char **access_arg, - int num_access_args, int port, int max_clients, int default_deny) +void init_sender_status(struct sender_status *ss, + const struct lls_opt_result *acl_opt_result, + const struct lls_opt_result *listen_address_opt_result, + int default_port, int max_clients, int default_deny) { - ss->listen_fd = -1; + int i; + unsigned n = lls_opt_given(listen_address_opt_result); + + if (n == 0) { + ss->num_listen_fds = 1; + ss->listen_addresses = para_malloc(sizeof(char *)); + ss->listen_addresses[0] = NULL; + ss->listen_fds = para_malloc(sizeof(int)); + ss->listen_fds[0] = -1; + } else { + ss->num_listen_fds = n; + ss->listen_addresses = para_malloc(n * sizeof(char *)); + ss->listen_fds = para_malloc(n * sizeof(int)); + FOR_EACH_LISTEN_FD(i, ss) { + ss->listen_addresses[i] = para_strdup(lls_string_val(i, + listen_address_opt_result)); + ss->listen_fds[i] = -1; + } + } + ss->default_port = default_port; + INIT_LIST_HEAD(&ss->client_list); - ss->port = port; - acl_init(&ss->acl, access_arg, num_access_args); + /* Initialize an access control list */ + INIT_LIST_HEAD(&ss->acl); + for (i = 0; i < lls_opt_given(acl_opt_result); i++) { + const char *arg = lls_string_val(i, acl_opt_result); + char addr[16]; + int mask; + if (!parse_cidr(arg, addr, sizeof(addr), &mask)) + PARA_WARNING_LOG("ACL syntax error: %s, ignoring\n", + arg); + else + acl_add_entry(&ss->acl, addr, mask); + } ss->num_clients = 0; ss->max_clients = max_clients; ss->default_deny = default_deny; @@ -154,28 +162,37 @@ void init_sender_status(struct sender_status *ss, char **access_arg, * * \return The string printed in the "si" command. */ -char *get_sender_info(struct sender_status *ss, const char *name) +char *generic_sender_status(struct sender_status *ss, const char *name) { - char *clnts = NULL, *ret; + char *clnts = NULL, *ret, *addr = NULL; struct sender_client *sc, *tmp_sc; - + unsigned n; char *acl_contents = acl_get_contents(&ss->acl); + list_for_each_entry_safe(sc, tmp_sc, &ss->client_list, node) { char *tmp = make_message("%s%s ", clnts? clnts : "", sc->name); free(clnts); clnts = tmp; } + FOR_EACH_LISTEN_FD(n, ss) { + char *url = format_url(ss->listen_addresses[n], ss->default_port); + char *tmp = make_message("%s%s%s (fd %d)", addr? + addr : "", addr? ", " : "", url, + ss->listen_fds[n]); + free(url); + free(addr); + addr = tmp; + } ret = make_message( - "%s sender:\n" - "\tstatus: %s\n" - "\tport: %s\n" - "\tnumber of connected clients: %d\n" - "\tmaximal number of clients: %d%s\n" - "\tconnected clients: %s\n" - "\taccess %s list: %s\n", - name, - (ss->listen_fd >= 0)? "on" : "off", - stringify_port(ss->port, strcmp(name, "http") ? "dccp" : "tcp"), + "listening address(es): %s\n" + "default port: %s\n" + "number of connected clients: %d\n" + "maximal number of clients: %d%s\n" + "connected clients: %s\n" + "access %s list: %s\n", + addr, + stringify_port(ss->default_port, + strcmp(name, "http")? "dccp" : "tcp"), ss->num_clients, ss->max_clients, ss->max_clients > 0? "" : " (unlimited)", @@ -194,7 +211,7 @@ char *get_sender_info(struct sender_status *ss, const char *name) * \param scd Contains the IP and the netmask. * \param ss The sender. * - * \sa generic_com_deny(). + * \sa \ref generic_com_deny(). */ void generic_com_allow(struct sender_command_data *scd, struct sender_status *ss) @@ -202,13 +219,29 @@ void generic_com_allow(struct sender_command_data *scd, acl_allow(scd->host, scd->netmask, &ss->acl, ss->default_deny); } +/** + * Empty the access control list of a sender. + * + * \param acl The access control list of the sender. + * + * This is called from the ->shutdown methods of the http and the dccp sender. + */ +void generic_acl_deplete(struct list_head *acl) +{ + /* + * Since default_deny is false, the ACL is considered a blacklist. A + * netmask of zero matches any IP address, so this call empties the ACL. + */ + acl_allow("0.0.0.0", 0 /* netmask */, acl, 0 /* default_deny */); +} + /** * Deny connections from the given range of IP addresses. * * \param scd see \ref generic_com_allow(). * \param ss see \ref generic_com_allow(). * - * \sa generic_com_allow(). + * \sa \ref generic_com_allow(). */ void generic_com_deny(struct sender_command_data *scd, struct sender_status *ss) @@ -220,21 +253,48 @@ void generic_com_deny(struct sender_command_data *scd, * Activate a paraslash sender. * * \param ss The sender to activate. - * \param protocol The symbolic name of the transport-layer protocol. + * \param protocol layer4 type (IPPROTO_TCP or IPPROTO_DCCP). * - * \return Standard. + * This opens a passive socket of given layer4 type, sets the resulting file + * descriptor to nonblocking mode and adds it to the close on fork list. + * + * Errors are logged but otherwise ignored. */ -int generic_com_on(struct sender_status *ss, unsigned protocol) +void generic_com_on(struct sender_status *ss, unsigned protocol) { int ret; + unsigned n; - if (ss->listen_fd >= 0) - return 1; - ret = open_sender(protocol, ss->port); - if (ret < 0) - return ret; - ss->listen_fd = ret; - return 1; + FOR_EACH_LISTEN_FD(n, ss) { + if (ss->listen_fds[n] >= 0) + continue; + ret = para_listen(protocol, ss->listen_addresses[n], + ss->default_port); + if (ret < 0) { + char *url = format_url(ss->listen_addresses[n], + ss->default_port); + PARA_ERROR_LOG("could not listen on %s %s: %s\n", + protocol == IPPROTO_TCP? "TCP" : "DCCP", + url, para_strerror(-ret)); + free(url); + continue; + } + ss->listen_fds[n] = ret; + ret = mark_fd_nonblocking(ss->listen_fds[n]); + if (ret < 0) { + char *url = format_url(ss->listen_addresses[n], + ss->default_port); + PARA_ERROR_LOG("could not set %s socket fd for %s to " + "nonblocking mode: %s\n", + protocol == IPPROTO_TCP? "TCP" : "DCCP", url, + para_strerror(-ret)); + free(url); + close(ss->listen_fds[n]); + ss->listen_fds[n] = -1; + continue; + } + add_close_on_fork_list(ss->listen_fds[n]); + } } /** @@ -244,28 +304,30 @@ int generic_com_on(struct sender_status *ss, unsigned protocol) * * \param ss The sender to deactivate. * - * \sa \ref del_close_on_fork_list(), shutdown_clients(). + * \sa \ref del_close_on_fork_list(), \ref shutdown_clients(). */ void generic_com_off(struct sender_status *ss) { - if (ss->listen_fd < 0) - return; - PARA_NOTICE_LOG("closing port %d\n", ss->port); - close(ss->listen_fd); - del_close_on_fork_list(ss->listen_fd); - shutdown_clients(ss); - ss->listen_fd = -1; + unsigned n; + + FOR_EACH_LISTEN_FD(n, ss) { + if (ss->listen_fds[n] < 0) + return; + close(ss->listen_fds[n]); + del_close_on_fork_list(ss->listen_fds[n]); + shutdown_clients(ss); + ss->listen_fds[n] = -1; + } } /** - * Accept a connection on the socket this server is listening on. + * Accept a connection on the socket(s) this server is listening on. * * \param ss The sender whose listening fd is ready for reading. * \param rfds Passed to para_accept(), * - * This must be called only if the socket fd of \a ss is ready for reading. It - * calls para_accept() to accept the connection and performs the following - * actions on the resulting file descriptor \a fd: + * This accepts incoming connections on any of the listening sockets of the + * server. If there is a connection pending, the function * * - Checks whether the maximal number of connections are exceeded. * - Sets \a fd to nonblocking mode. @@ -290,36 +352,40 @@ struct sender_client *accept_sender_client(struct sender_status *ss, fd_set *rfd { struct sender_client *sc; int fd, ret; + unsigned n; - if (ss->listen_fd < 0) - return NULL; - ret = para_accept(ss->listen_fd, rfds, NULL, 0, &fd); - if (ret < 0) - PARA_ERROR_LOG("%s\n", para_strerror(-ret)); - if (ret <= 0) - return NULL; - ret = -E_MAX_CLIENTS; - if (ss->max_clients > 0 && ss->num_clients >= ss->max_clients) - goto err_out; - ret = mark_fd_nonblocking(fd); - if (ret < 0) - goto err_out; - ret = acl_check_access(fd, &ss->acl, ss->default_deny); - if (ret < 0) - goto err_out; - ss->num_clients++; - sc = para_calloc(sizeof(*sc)); - sc->fd = fd; - sc->name = para_strdup(remote_name(fd)); - sc->cq = cq_new(MAX_CQ_BYTES); - para_list_add(&sc->node, &ss->client_list); - add_close_on_fork_list(fd); - PARA_INFO_LOG("accepted client #%d: %s (fd %d)\n", ss->num_clients, - sc->name, fd); - return sc; -err_out: - PARA_WARNING_LOG("%s\n", para_strerror(-ret)); - close(fd); + FOR_EACH_LISTEN_FD(n, ss) { + if (ss->listen_fds[n] < 0) + continue; + ret = para_accept(ss->listen_fds[n], rfds, NULL, 0, &fd); + if (ret < 0) + goto warn; + if (ret == 0) + continue; + ret = -E_MAX_CLIENTS; + if (ss->max_clients > 0 && ss->num_clients >= ss->max_clients) + goto close_fd_and_warn; + ret = mark_fd_nonblocking(fd); + if (ret < 0) + goto close_fd_and_warn; + ret = acl_check_access(fd, &ss->acl, ss->default_deny); + if (ret < 0) + goto close_fd_and_warn; + ss->num_clients++; + sc = para_calloc(sizeof(*sc)); + sc->fd = fd; + sc->name = para_strdup(remote_name(fd)); + sc->cq = cq_new(MAX_CQ_BYTES); + para_list_add(&sc->node, &ss->client_list); + add_close_on_fork_list(fd); + PARA_INFO_LOG("accepted client #%d: %s (fd %d)\n", ss->num_clients, + sc->name, fd); + return sc; +close_fd_and_warn: + close(fd); +warn: + PARA_WARNING_LOG("%s\n", para_strerror(-ret)); + } return NULL; }