Get rid of sender->status.

[paraslash.git] / dccp_send.c

diff --git a/dccp_send.c b/dccp_send.c
index c506fd96f15c222386fc14b5c7a0d74462e31f4e..0410c8bca99838a199fe30d92280d7fe333ef15f 100644 (file)
--- a/dccp_send.c
+++ b/dccp_send.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -16,14 +16,14 @@
 
 #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"
@@ -41,8 +41,8 @@ static struct sender *self;
 struct dccp_client {
        /** the dccp socket */
        int fd;
-       /** address information about the client */
-       struct sockaddr_in addr;
+       /** 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 */
@@ -65,57 +65,48 @@ static void dccp_post_select(fd_set *rfds, __a_unused fd_set *wfds)
        struct dccp_client *dc;
        int ret;
 
-       if (!FD_ISSET(listen_fd, rfds))
+       if (listen_fd < 0 || !FD_ISSET(listen_fd, rfds))
                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) {
-               PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+               PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+               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));
                return;
        }
-       PARA_NOTICE_LOG("connection from %s\n", inet_ntoa(dc->addr.sin_addr));
+       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_nonblock(dc->fd);
+       mark_fd_nonblocking(dc->fd);
        dc->cq = cq_new(DCCP_MAX_PENDING_BYTES);
 }
 
 static int dccp_open(void)
 {
-       struct sockaddr_in servaddr;
-       int ret;
+       int ret = para_listen(AF_UNSPEC, IPPROTO_DCCP, conf.dccp_port_arg);
 
-       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);
+       mark_fd_nonblocking(listen_fd);
        return 1;
 }
 
 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);
+       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);
@@ -209,7 +200,7 @@ static void dccp_send(long unsigned current_chunk,
 //             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));
+                       PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
                        dccp_shutdown_client(dc);
                        continue;
                }
@@ -271,9 +262,6 @@ void dccp_send_init(struct sender *s)
        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;
+       if (ret < 0)
+               PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 }