Don't let make write the filename into the output
[paraslash.git] / dccp_send.c
index 9de618b2c2f018f428684f658626a1a6e5d00916..9b72b7c90e089f6b09f711094634f69f826df3ab 100644 (file)
@@ -1,10 +1,10 @@
 /*
- * Copyright (C) 2006-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
  *
  * 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,
 #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;
-       /** The socket `name' of the client. */
-       char *name;
-       /** 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 (listen_fd < 0 || !FD_ISSET(listen_fd, rfds))
+       if (dss->listen_fd < 0 || !FD_ISSET(dss->listen_fd, rfds))
                return;
-       ret = para_accept(listen_fd, NULL, 0);
-       if (ret < 0) {
-               PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+       sc = accept_sender_client(dss);
+       if (!sc)
                return;
-       }
        /*
         * 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(ret, SHUT_RD) < 0) {
-               PARA_ERROR_LOG("shutdown(SHUT_RD): %s\n", strerror(errno));
+       if (shutdown(sc->fd, SHUT_RD) >= 0)
                return;
-       }
-       dc = para_calloc(sizeof(struct dccp_client));
-       dc->fd = ret;
-       dc->name = make_message("%s", remote_name(dc->fd));
-       PARA_NOTICE_LOG("connection from %s\n", dc->name);
-       para_list_add(&dc->node, &clients);
-       add_close_on_fork_list(dc->fd);
-       mark_fd_nonblocking(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)
 {
-       int ret = para_listen(AF_UNSPEC, IPPROTO_DCCP, conf.dccp_port_arg);
+       struct sender_client *sc, *tmp;
 
-       if (ret < 0)
-               return ret;
-       listen_fd = ret;
-       ret = mark_fd_nonblocking(listen_fd);
-       if (ret < 0) {
-               PARA_EMERG_LOG("%s\n", para_strerror(-ret));
-               exit(EXIT_FAILURE);
-       }
-       add_close_on_fork_list(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", dc->name, dc->fd);
-       free(dc->name);
-       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.
@@ -251,21 +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();
+
+       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));
 }