fix potential segfault in para_client

[paraslash.git] / dccp_send.c

diff --git a/dccp_send.c b/dccp_send.c
index c7805f735b02c096083058d269ee4b0d2ee6b759..74976cf202a27c430be96448011a966865fbf249 100644 (file)
--- a/dccp_send.c
+++ b/dccp_send.c
@@ -16,6 +16,8 @@
  *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  */
 
+/** \file dccp_send.c paraslash's dccp sender */
+
 /*
  * based on server.c of dccp-cs-0.01.tar.bz2,
  * (C) 2005 Ian McDonald <imcdnzl@gmail.com>
@@ -44,7 +46,8 @@ struct dccp_client {
        struct sockaddr_in addr;
        /** the position of this client in the client list */
        struct list_head node;
-       int header_sent; /* non-zero if audio file header has been sent */
+       /** non-zero if audio file header has been sent */
+       int header_sent;
 };
 
 static void dccp_pre_select(__unused struct audio_format *af, int *max_fileno, fd_set *rfds,
@@ -64,14 +67,13 @@ static void dccp_post_select(__unused struct audio_format *af, fd_set *rfds,
 
        if (!FD_ISSET(listen_fd, rfds))
                return;
-       PARA_NOTICE_LOG("%s", "accepting...\n");
        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", PARA_STRERROR(-ret));
                return;
        }
-       PARA_NOTICE_LOG("%s", "connection\n");
+       PARA_NOTICE_LOG("connection from %s\n", inet_ntoa(dc->addr.sin_addr));
        dc->fd = ret;
        list_add(&dc->node, &clients);
 }
@@ -105,11 +107,32 @@ static int dccp_open(void)
 
 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);
        list_del(&dc->node);
        free(dc);
 }
 
+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;
+}
+
 static void dccp_send(__unused struct audio_format *af,
                long unsigned current_chunk,
                __unused long unsigned chunks_sent, const char *buf, size_t len)
@@ -133,7 +156,7 @@ static void dccp_send(__unused struct audio_format *af,
                        header_buf = af->get_header_info(&header_len);
                        if (!header_buf || header_len <= 0)
                                continue; /* header not yet available */
-                       ret = write(dc->fd, header_buf, header_len);
+                       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",
@@ -142,6 +165,7 @@ static void dccp_send(__unused struct audio_format *af,
                                dccp_shutdown_client(dc);
                                continue;
                        }
+                       dc->header_sent = 1;
                        ret = write_ok(dc->fd);
                        if (ret < 0) {
                                dccp_shutdown_client(dc);
@@ -151,7 +175,7 @@ static void dccp_send(__unused struct audio_format *af,
                                continue;
                }
 //             PARA_DEBUG_LOG("writing %d bytes to fd %d\n", len, dc->fd);
-               ret = write(dc->fd, buf, len);
+               ret = dccp_write(dc->fd, buf, len);
                if (ret != len)
                        dccp_shutdown_client(dc);
        }
@@ -174,7 +198,7 @@ static char *dccp_info(void)
        free(buf);
        list_for_each_entry_safe(dc, tmp, &clients, node)
                num_clients++;
-       buf = make_message("%d connected clients\n", num_clients);
+       buf = make_message("dccp connected clients: %d\n", num_clients);
        return buf;
 }
 
@@ -183,6 +207,14 @@ static char *dccp_help(void)
        return make_message("no help available\n");
 }
 
+/**
+ * the init function of the dccp sender
+ *
+ * \param s pointer to the dccp sender struct
+ *
+ * It initializes all function pointers of \a s and starts
+ * listening on the given port.
+ */
 void dccp_send_init(struct sender *s)
 {
        int ret;