dccp_send: Fix a fd leak.

[paraslash.git] / dccp_send.c

diff --git a/dccp_send.c b/dccp_send.c
index 5d8e6593fe0bffd5b628fe92eeffac8d9638c90a..02e60f44c680a0406826a3439543b1b389bbb456 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.
  */
@@ -63,15 +63,25 @@ static void dccp_pre_select( int *max_fileno, fd_set *rfds,
 static void dccp_post_select(fd_set *rfds, __a_unused fd_set *wfds)
 {
        struct dccp_client *dc;
-       int ret;
+       int ret, fd;
 
-       if (!FD_ISSET(listen_fd, rfds))
+       if (listen_fd < 0 || !FD_ISSET(listen_fd, rfds))
                return;
        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;
        }
+       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) {
+               PARA_ERROR_LOG("shutdown(SHUT_RD): %s\n", strerror(errno));
+               goto err;
+       }
        dc = para_calloc(sizeof(struct dccp_client));
        dc->fd = ret;
        dc->name = make_message("%s", remote_name(dc->fd));
@@ -80,6 +90,9 @@ static void dccp_post_select(fd_set *rfds, __a_unused fd_set *wfds)
        add_close_on_fork_list(dc->fd);
        mark_fd_nonblocking(dc->fd);
        dc->cq = cq_new(DCCP_MAX_PENDING_BYTES);
+       return;
+err:
+       close(fd);
 }
 
 static int dccp_open(void)
@@ -89,8 +102,12 @@ static int dccp_open(void)
        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);
-       mark_fd_nonblocking(listen_fd);
        return 1;
 }
 
@@ -191,7 +208,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;
                }
@@ -253,9 +270,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));
 }