aacdec: Do not try to feed invalid buffers to libfaad

[paraslash.git] / dccp_send.c

diff --git a/dccp_send.c b/dccp_send.c
index d56286a6874cb5d56dcb4c427fa4dc05bc001d52..e838b3d87f23a64faa7eb4829f38c2dbcac7cf1c 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,20 +46,21 @@ 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,
-               __unused fd_set *wfds)
+static void dccp_pre_select(__a_unused struct audio_format *af, int *max_fileno, fd_set *rfds,
+               __a_unused fd_set *wfds)
 {
        if (listen_fd < 0)
                return;
        FD_SET(listen_fd, rfds);
-       *max_fileno = MAX(*max_fileno, listen_fd);
+       *max_fileno = PARA_MAX(*max_fileno, listen_fd);
 }
 
-static void dccp_post_select(__unused struct audio_format *af, fd_set *rfds,
-               __unused fd_set *wfds)
+static void dccp_post_select(__a_unused struct audio_format *af, fd_set *rfds,
+               __a_unused fd_set *wfds)
 {
        struct dccp_client *dc;
        int ret;
@@ -116,7 +119,7 @@ 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);
+       send = PARA_MIN(1024, len - written);
        ret = write(fd, buf + written, send);
        if (ret < 0)
                goto err_out;
@@ -130,9 +133,9 @@ err_out:
        return -E_DCCP_WRITE;
 }
 
-static void dccp_send(__unused struct audio_format *af,
+static void dccp_send(__a_unused struct audio_format *af,
                long unsigned current_chunk,
-               __unused long unsigned chunks_sent, const char *buf, size_t len)
+               __a_unused long unsigned chunks_sent, const char *buf, size_t len)
 {
        struct dccp_client *dc, *tmp;
        int ret, header_len;
@@ -204,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;
@@ -223,8 +234,9 @@ void dccp_send_init(struct sender *s)
        s->client_cmds[SENDER_DELETE] = NULL;
        self = s;
        ret = dccp_open();
-       if (ret < 0)
+       if (ret < 0) {
                PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
-       else
+               s->status = SENDER_OFF;
+       } else
                s->status = SENDER_ON;
 }