user_list.c: Simplify populate_user_list().

[paraslash.git] / dccp_send.c

diff --git a/dccp_send.c b/dccp_send.c
index 55548620c7a67996b74aac62f2c3cb862ee575b4..d0f9448e8e048445ce0e0c6a6adf8d0d903449cc 100644 (file)
--- a/dccp_send.c
+++ b/dccp_send.c
@@ -1,19 +1,7 @@
 /*
 /*

- * Copyright (C) 2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2008 Andre Noll <maan@systemlinux.org>

  *
  *

- *     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 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * 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 */


@@ -23,183 +11,125 @@
  * (C) 2005 Ian McDonald <imcdnzl@gmail.com>
  */
 
  * (C) 2005 Ian McDonald <imcdnzl@gmail.com>
  */
 

+#include <sys/types.h>
+#include <dirent.h>
+
+#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 "server.h"
 #include "net.h"
 #include "list.h"

-#include "afs.h"
+#include "vss.h"

 #include "send.h"
 #include "send.h"

-#include "dccp.h"
-#include "error.h"
-#include "string.h"
+#include "fd.h"
+#include "close_on_fork.h"
+#include "chunk_queue.h"

 #include "server.cmdline.h"
 #include "server.cmdline.h"

-extern struct gengetopt_args_info conf;
+#include "acl.h"
+

 /** the list of connected clients **/
 static struct list_head clients;
 /** the list of connected clients **/
 static struct list_head clients;

+/** The whitelist/blacklist. */
+static struct list_head dccp_acl;

 static int listen_fd = -1;
 static int listen_fd = -1;

-static struct sender *self;
-
-/** 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;
-};
-
-static void dccp_pre_select(__a_unused struct audio_format *af, int *max_fileno, fd_set *rfds,
+
+/** Maximal number of bytes in a chunk queue. */
+#define DCCP_MAX_PENDING_BYTES 40000
+
+/** Do not write more than that many bytes at once. */
+#define DCCP_MAX_BYTES_PER_WRITE 1024
+
+static void dccp_pre_select(int *max_fileno, fd_set *rfds,

                __a_unused fd_set *wfds)
 {
                __a_unused fd_set *wfds)
 {

-       if (listen_fd < 0)
-               return;
-       FD_SET(listen_fd, rfds);
-       *max_fileno = MAX(*max_fileno, listen_fd);
+       if (listen_fd >= 0)
+               para_fd_set(listen_fd, rfds, max_fileno);

 }
 
 }
 

-static void dccp_post_select(__a_unused struct audio_format *af, fd_set *rfds,
-               __a_unused fd_set *wfds)
+static void dccp_post_select(fd_set *rfds, __a_unused fd_set *wfds)

 {
 {

-       struct dccp_client *dc;
-       int ret;
+       struct sender_client *sc;
+       int ret, fd;

 
 

-       if (!FD_ISSET(listen_fd, rfds))
+       if (listen_fd < 0 || !FD_ISSET(listen_fd, rfds))

                return;
                return;

-       dc = para_calloc(sizeof(struct dccp_client));
-       ret = para_accept(listen_fd, &dc->addr, sizeof(struct sockaddr_in));
+       ret = para_accept(listen_fd, NULL, 0);

        if (ret < 0) {
        if (ret < 0) {

-               PARA_ERROR_LOG("%s", PARA_STRERROR(-ret));
+               PARA_ERROR_LOG("%s\n", para_strerror(-ret));

                return;
        }
                return;
        }

-       PARA_NOTICE_LOG("connection from %s\n", inet_ntoa(dc->addr.sin_addr));
-       dc->fd = ret;
-       list_add(&dc->node, &clients);
-}
-
-static int dccp_open(void)
-{
-       struct sockaddr_in servaddr;
-       int ret;
-
-       ret = dccp_get_socket();
-       if (ret < 0)
-               return ret;
-       listen_fd = ret;
-
-       bzero(&servaddr, 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);
+       fd = 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(fd, SHUT_RD) < 0) {
+               ret = -ERRNO_TO_PARA_ERROR(errno);
+               goto err;
+       }
+       ret = mark_fd_nonblocking(fd);

        if (ret < 0)
        if (ret < 0)

-               return ret;
-       ret = listen(listen_fd, 0);
+               goto err;
+       ret = acl_check_access(fd, &dccp_acl, conf.dccp_default_deny_given);

        if (ret < 0)
        if (ret < 0)

-               return -E_DCCP_LISTEN;
-       PARA_DEBUG_LOG("listening on fd %d\n", listen_fd);
-       return 1;
+               goto err;
+       sc = para_calloc(sizeof(*sc));
+       sc->fd = fd;
+       sc->name = make_message("%s", remote_name(sc->fd));
+       PARA_NOTICE_LOG("connection from %s\n", sc->name);
+       para_list_add(&sc->node, &clients);
+       add_close_on_fork_list(sc->fd);
+       sc->cq = cq_new(DCCP_MAX_PENDING_BYTES);
+       return;
+err:
+       PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+       close(fd);

 }
 
 }
 

-static void dccp_shutdown_client(struct dccp_client *dc)
+static void dccp_send(long unsigned current_chunk,
+               __a_unused long unsigned chunks_sent, const char *buf, size_t len)

 {
 {

-       PARA_DEBUG_LOG("shutting down %s (fd %d)\n", inet_ntoa(dc->addr.sin_addr),
-               dc->fd);
-       close(dc->fd);
-       list_del(&dc->node);
-       free(dc);
-}
+       struct sender_client *sc, *tmp;

 
 

-static int dccp_write(int fd, const char *buf, size_t len)
-{
-       size_t send, written = 0;
-       int ret;
-again:
-       send = MIN(1024, len - written);
-       ret = write(fd, buf + written, send);
-       if (ret < 0)
-               goto err_out;
-       written += ret;
-       if (written >= len)
-               return written;
-       ret = write_ok(fd);
-       if (ret > 0)
-               goto again;
-err_out:
-       return -E_DCCP_WRITE;
+       list_for_each_entry_safe(sc, tmp, &clients, node)
+               send_chunk(sc, DCCP_MAX_BYTES_PER_WRITE, current_chunk, buf,
+                       len);

 }
 
 }
 

-static void dccp_send(__a_unused struct audio_format *af,
-               long unsigned current_chunk,
-               __a_unused long unsigned chunks_sent, const char *buf, size_t len)
+static void dccp_shutdown_clients(void)

 {
 {

-       struct dccp_client *dc, *tmp;
-       int ret, header_len;
-       char *header_buf;
+       struct sender_client *sc, *tmp;

 
 

-       if (listen_fd < 0 || !len)
-               return;
-
-       list_for_each_entry_safe(dc, tmp, &clients, node) {
-               ret = write_ok(dc->fd);
-               if (ret < 0) {
-                       dccp_shutdown_client(dc);
-                       continue;
-               }
-               if (!ret)
-                       continue;
-               if (!dc->header_sent && af->get_header_info && current_chunk) {
-                       header_buf = af->get_header_info(&header_len);
-                       if (!header_buf || header_len <= 0)
-                               continue; /* header not yet available */
-                       ret = dccp_write(dc->fd, header_buf, header_len);
-                       if (ret != header_len) {
-                               int err = errno;
-                               PARA_ERROR_LOG("header write: %d/%d (%s)\n",
-                                       ret, header_len, ret < 0?
-                                       strerror(err) : "");
-                               dccp_shutdown_client(dc);
-                               continue;
-                       }
-                       dc->header_sent = 1;
-                       ret = write_ok(dc->fd);
-                       if (ret < 0) {
-                               dccp_shutdown_client(dc);
-                               continue;
-                       }
-                       if (!ret)
-                               continue;
-               }
-//             PARA_DEBUG_LOG("writing %d bytes to fd %d\n", len, dc->fd);
-               ret = dccp_write(dc->fd, buf, len);
-               if (ret != len)
-                       dccp_shutdown_client(dc);
-       }
+       list_for_each_entry_safe(sc, tmp, &clients, node)
+               shutdown_client(sc);

 }
 
 }
 

-static void dccp_shutdown_clients(void)
+static int dccp_com_deny(struct sender_command_data *scd)

 {
 {

-       struct dccp_client *dc, *tmp;
+       acl_deny(scd->addr, scd->netmask, &dccp_acl,
+               conf.dccp_default_deny_given);
+       return 1;
+}

 
 

-       list_for_each_entry_safe(dc, tmp, &clients, node)
-               dccp_shutdown_client(dc);
+static int dccp_com_allow(struct sender_command_data *scd)
+{
+       acl_allow(scd->addr, scd->netmask, &dccp_acl,
+               conf.dccp_default_deny_given);
+       return 1;

 }
 
 static char *dccp_info(void)
 {
 }
 
 static char *dccp_info(void)
 {

-       static char *buf;

        int num_clients = 0;
        int num_clients = 0;

-       struct dccp_client *dc, *tmp;
+       struct sender_client *sc, *tmp;

 
 

-       free(buf);
-       list_for_each_entry_safe(dc, tmp, &clients, node)
+       list_for_each_entry_safe(sc, tmp, &clients, node)

                num_clients++;
                num_clients++;

-       buf = make_message("dccp connected clients: %d\n", num_clients);
-       return buf;
+       return make_message("dccp connected clients: %d\n", num_clients);

 }
 
 static char *dccp_help(void)
 }
 
 static char *dccp_help(void)


@@ -208,9 +138,9 @@ static char *dccp_help(void)
 }
 
 /**
 }
 
 /**

- * 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.
  *
  * It initializes all function pointers of \a s and starts
  * listening on the given port.


@@ -228,14 +158,14 @@ void dccp_send_init(struct sender *s)
        s->help = dccp_help;
        s->client_cmds[SENDER_ON] = NULL;
        s->client_cmds[SENDER_OFF] = NULL;
        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->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;
        s->client_cmds[SENDER_ADD] = NULL;
        s->client_cmds[SENDER_DELETE] = NULL;

-       self = s;
-       ret = dccp_open();
+       acl_init(&dccp_acl, conf.dccp_access_arg, conf.dccp_access_given);
+       ret = open_sender(IPPROTO_DCCP, conf.dccp_port_arg);

        if (ret < 0)
        if (ret < 0)

-               PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+               PARA_ERROR_LOG("%s\n", para_strerror(-ret));

        else
        else

-               s->status = SENDER_ON;
+               listen_fd = ret;

 }
 }