X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_send.c;h=9b72b7c90e089f6b09f711094634f69f826df3ab;hp=3509d5d88a5e18f00089885ae7be41b8207e1b17;hb=b2e6a24448a9e49e0766ab4f32163580eeff469e;hpb=74d8b443aba528dc65af874a81c53be26aaace9e diff --git a/dccp_send.c b/dccp_send.c index 3509d5d8..9b72b7c9 100644 --- a/dccp_send.c +++ b/dccp_send.c @@ -1,250 +1,116 @@ /* - * Copyright (C) 2006-2007 Andre Noll + * Copyright (C) 2006-2009 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ -/** \file dccp_send.c paraslash's dccp sender */ +/** \file dccp_send.c Paraslash's dccp sender. */ /* * based on server.c of dccp-cs-0.01.tar.bz2, * (C) 2005 Ian McDonald */ +#include +#include + #include "para.h" #include "error.h" +#include "string.h" #include "afh.h" +#include "afs.h" #include "server.h" #include "net.h" #include "list.h" #include "vss.h" #include "send.h" -#include "dccp.h" -#include "string.h" #include "fd.h" #include "close_on_fork.h" #include "chunk_queue.h" #include "server.cmdline.h" +#include "acl.h" -/** the list of connected clients **/ -static struct list_head clients; -static int listen_fd = -1; -static struct sender *self; +/** Do not write more than that many bytes at once. */ +#define DCCP_MAX_BYTES_PER_WRITE 1024 -/** Maximal number of bytes in a chunk queue. */ -#define DCCP_MAX_PENDING_BYTES 40000 +static struct sender_status dccp_sender_status, *dss = &dccp_sender_status; -/** describes one connected client */ -struct dccp_client { - /** the dccp socket */ - int fd; - /** address information about the client */ - struct sockaddr_in addr; - /** the position of this client in the client list */ - struct list_head node; - /** non-zero if audio file header has been sent */ - int header_sent; - /** The list of pending chunks for this client. */ - struct chunk_queue *cq; -}; - -static void dccp_pre_select( int *max_fileno, fd_set *rfds, +static void dccp_pre_select(int *max_fileno, fd_set *rfds, __a_unused fd_set *wfds) { - if (listen_fd < 0) - return; - FD_SET(listen_fd, rfds); - *max_fileno = PARA_MAX(*max_fileno, listen_fd); + if (dss->listen_fd >= 0) + para_fd_set(dss->listen_fd, rfds, max_fileno); } static void dccp_post_select(fd_set *rfds, __a_unused fd_set *wfds) { - struct dccp_client *dc; - int ret; + struct sender_client *sc; - if (!FD_ISSET(listen_fd, rfds)) + if (dss->listen_fd < 0 || !FD_ISSET(dss->listen_fd, rfds)) + return; + sc = accept_sender_client(dss); + if (!sc) return; - dc = para_calloc(sizeof(struct dccp_client)); - ret = para_accept(listen_fd, &dc->addr, sizeof(struct sockaddr_in)); - if (ret < 0) { - PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret)); + /* + * Bypass unused CCID paths: the sender does not receive application data + * from the client; by shutting down this unused communication path we can + * reduce processing costs a bit. See analogous comment in dccp_recv.c. + */ + if (shutdown(sc->fd, SHUT_RD) >= 0) return; - } - PARA_NOTICE_LOG("connection from %s\n", inet_ntoa(dc->addr.sin_addr)); - dc->fd = ret; - para_list_add(&dc->node, &clients); - add_close_on_fork_list(dc->fd); - mark_fd_nonblock(dc->fd); - dc->cq = cq_new(DCCP_MAX_PENDING_BYTES); + PARA_WARNING_LOG("%s\n", strerror(errno)); + shutdown_client(sc, dss); } -static int dccp_open(void) +static void dccp_send(long unsigned current_chunk, + __a_unused long unsigned chunks_sent, const char *buf, + size_t len, const char *header_buf, size_t header_len) { - struct sockaddr_in servaddr; - int ret; + struct sender_client *sc, *tmp; - ret = dccp_get_socket(); - if (ret < 0) - return ret; - listen_fd = ret; - - memset(&servaddr, 0, sizeof(servaddr)); - servaddr.sin_family = AF_INET; - servaddr.sin_addr.s_addr = htonl(INADDR_ANY); - servaddr.sin_port = htons(conf.dccp_port_arg); - ret = bind(listen_fd, (struct sockaddr *)&servaddr, sizeof(servaddr)); - if (ret < 0) - return -E_DCCP_BIND; - ret = dccp_set_socket(listen_fd); - if (ret < 0) - return ret; - ret = listen(listen_fd, 0); - if (ret < 0) { - PARA_ERROR_LOG("%s\n", strerror(errno)); - return -E_DCCP_LISTEN; - } - PARA_DEBUG_LOG("listening on fd %d\n", listen_fd); - add_close_on_fork_list(listen_fd); - mark_fd_nonblock(listen_fd); - return 1; + list_for_each_entry_safe(sc, tmp, &dss->client_list, node) + send_chunk(sc, dss, DCCP_MAX_BYTES_PER_WRITE, current_chunk, buf, + len, header_buf, header_len); } -static void dccp_shutdown_client(struct dccp_client *dc) -{ - PARA_DEBUG_LOG("shutting down %s (fd %d)\n", inet_ntoa(dc->addr.sin_addr), - dc->fd); - close(dc->fd); - del_close_on_fork_list(dc->fd); - cq_destroy(dc->cq); - list_del(&dc->node); - free(dc); -} - -/* - * ret: Negative on errors, zero if nothing was written and write returned - * EAGAIN, number of bytes written else. - */ -static int dccp_write(int fd, const char *buf, size_t len) +static void dccp_shutdown_clients(void) { - size_t written = 0; - int ret = 0; - - while (written < len) { - ret = write(fd, buf + written, PARA_MIN(1024, len - written)); - /* - * Error handling: CCID3 has a sending wait queue which fills up and is - * emptied asynchronously. The EAGAIN case means that there is currently - * no space in the wait queue, but this can change at any moment and is - * thus not an error condition. - */ - if (ret < 0 && errno == EAGAIN) - return written; - if (ret < 0) { - PARA_ERROR_LOG("%s\n", strerror(errno)); - return -E_DCCP_WRITE; - } - written += ret; - } - return written; + shutdown_clients(dss); } -static int queue_chunk_or_shutdown(struct dccp_client *dc, long unsigned chunk_num, - size_t sent) +static int dccp_com_on(__a_unused struct sender_command_data *scd) { - int ret = cq_enqueue(dc->cq, chunk_num, sent); - if (ret < 0) { - PARA_NOTICE_LOG("enqueue error\n"); - dccp_shutdown_client(dc); - } - return ret; + return generic_com_on(dss, IPPROTO_DCCP); } -static int send_queued_chunks(struct dccp_client *dc) +static int dccp_com_off(__a_unused struct sender_command_data *scd) { - struct queued_chunk *qc; - while ((qc = cq_peek(dc->cq))) { - char *buf; - size_t len; - int ret; - cq_get(qc, &buf, &len); - ret = dccp_write(dc->fd, buf, len); - if (ret < 0) - return ret; - cq_update(dc->cq, ret); - if (ret != len) - return 1; - cq_dequeue(dc->cq); - } + generic_com_off(dss); return 1; } -static void dccp_send(long unsigned current_chunk, - __a_unused long unsigned chunks_sent, const char *buf, size_t len) -{ - struct dccp_client *dc, *tmp; - int ret; - char *header_buf; - size_t header_len; - - if (listen_fd < 0 || !len) - return; - - list_for_each_entry_safe(dc, tmp, &clients, node) { - if (!dc->header_sent && current_chunk) { - header_buf = vss_get_header(&header_len); - if (header_buf && header_len > 0) { - if (queue_chunk_or_shutdown(dc, -1U, 0) < 0) - continue; - } - dc->header_sent = 1; - } - ret = send_queued_chunks(dc); - if (ret < 0) { - dccp_shutdown_client(dc); - continue; - } -// PARA_DEBUG_LOG("writing %d bytes to fd %d\n", len, dc->fd); - ret = dccp_write(dc->fd, buf, len); - if (ret < 0) { - PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-ret)); - dccp_shutdown_client(dc); - continue; - } - if (ret != len) - queue_chunk_or_shutdown(dc, current_chunk, ret); - } -} -static void dccp_shutdown_clients(void) +static int dccp_com_deny(struct sender_command_data *scd) { - struct dccp_client *dc, *tmp; - - list_for_each_entry_safe(dc, tmp, &clients, node) - dccp_shutdown_client(dc); + generic_com_deny(scd, dss); + return 1; } -static char *dccp_info(void) +static int dccp_com_allow(struct sender_command_data *scd) { - static char *buf; - int num_clients = 0; - struct dccp_client *dc, *tmp; - - free(buf); - list_for_each_entry_safe(dc, tmp, &clients, node) - num_clients++; - buf = make_message("dccp connected clients: %d\n", num_clients); - return buf; + generic_com_allow(scd, dss); + return 1; } -static char *dccp_help(void) +static char *dccp_info(void) { - return make_message("no help available\n"); + return get_sender_info(dss, "dccp"); } /** - * the init function of the dccp sender + * The init function of the dccp sender. * - * \param s pointer to the dccp sender struct + * \param s pointer to the dccp sender struct. * * It initializes all function pointers of \a s and starts * listening on the given port. @@ -253,24 +119,23 @@ void dccp_send_init(struct sender *s) { int ret; - INIT_LIST_HEAD(&clients); s->info = dccp_info; s->send = dccp_send; s->pre_select = dccp_pre_select; s->post_select = dccp_post_select; s->shutdown_clients = dccp_shutdown_clients; - s->help = dccp_help; - s->client_cmds[SENDER_ON] = NULL; - s->client_cmds[SENDER_OFF] = NULL; - s->client_cmds[SENDER_DENY] = NULL; - s->client_cmds[SENDER_ALLOW] = NULL; + s->help = generic_sender_help; + s->client_cmds[SENDER_ON] = dccp_com_on; + s->client_cmds[SENDER_OFF] = dccp_com_off; + s->client_cmds[SENDER_DENY] = dccp_com_deny; + s->client_cmds[SENDER_ALLOW] = dccp_com_allow; s->client_cmds[SENDER_ADD] = NULL; s->client_cmds[SENDER_DELETE] = NULL; - self = s; - ret = dccp_open(); - if (ret < 0) { - PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret)); - s->status = SENDER_OFF; - } else - s->status = SENDER_ON; + + init_sender_status(dss, conf.dccp_access_arg, conf.dccp_access_given, + conf.dccp_port_arg, conf.dccp_max_clients_arg, + conf.dccp_default_deny_given); + ret = generic_com_on(dss, IPPROTO_DCCP); + if (ret < 0) + PARA_ERROR_LOG("%s\n", para_strerror(-ret)); }