Make mp3_seek_next_header() more readable.

[paraslash.git] / dccp_recv.c

diff --git a/dccp_recv.c b/dccp_recv.c
index c0618602571975fbb6ab17b80f633eb8d33aaca0..d0bc53542137ac06cce22b75fcbe17d649041b9b 100644 (file)
--- a/dccp_recv.c
+++ b/dccp_recv.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.
  */
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */


@@ -57,24 +57,32 @@ static int dccp_recv_open(struct receiver_node *rn)
 {
        struct private_dccp_recv_data *pdd;
        struct dccp_recv_args_info *conf = rn->conf;
 {
        struct private_dccp_recv_data *pdd;
        struct dccp_recv_args_info *conf = rn->conf;

-       int ret = makesock(AF_UNSPEC, IPPROTO_DCCP, 0, conf->host_arg, conf->port_arg);
+       int fd, ret = makesock(AF_UNSPEC, IPPROTO_DCCP, 0, conf->host_arg,
+               conf->port_arg);

 
        if (ret < 0)
                return ret;
 
        if (ret < 0)
                return ret;

+       fd = ret;

        /*
        /*

-        * Disable unused CCIDs: the receiver does not send any application data to the
-        * server. By shutting down this unused path we reduce internal processing costs,
-        * as the unused CCIDs (in the kernel) are then bypassed.
+        * Disable unused CCIDs: the receiver does not send any application
+        * data to the server. By shutting down this unused path we reduce
+        * internal processing costs, as the unused CCIDs (in the kernel) are
+        * then bypassed.

         */
         */

-       if (shutdown(ret, SHUT_WR) < 0)
-               return -ERRNO_TO_PARA_ERROR(errno);
-
+       if (shutdown(fd, SHUT_WR) < 0) {
+               ret = -ERRNO_TO_PARA_ERROR(errno);
+               goto err;
+       }
+       ret = mark_fd_nonblocking(fd);
+       if (ret < 0)
+               goto err;

        rn->buf = para_calloc(DCCP_BUFSIZE);
        rn->private_data = pdd = para_calloc(sizeof(struct private_dccp_recv_data));
        rn->buf = para_calloc(DCCP_BUFSIZE);
        rn->private_data = pdd = para_calloc(sizeof(struct private_dccp_recv_data));

-
-       pdd->fd = ret;
-       mark_fd_nonblocking(pdd->fd);
+       pdd->fd = fd;

        return 1;
        return 1;

+err:
+       close(fd);
+       return ret;

 }
 
 static void dccp_shutdown(void)
 }
 
 static void dccp_shutdown(void)


@@ -94,48 +102,44 @@ static void *dccp_recv_parse_config(int argc, char **argv)
 
 static void dccp_recv_pre_select(struct sched *s, struct task *t)
 {
 
 static void dccp_recv_pre_select(struct sched *s, struct task *t)
 {

-       struct receiver_node *rn = t->private_data;
+       struct receiver_node *rn = container_of(t, struct receiver_node, task);

        struct private_dccp_recv_data *pdd = rn->private_data;
 
        struct private_dccp_recv_data *pdd = rn->private_data;
 

-       t->ret = 1;
+       t->error = 0;

        para_fd_set(pdd->fd, &s->rfds, &s->max_fileno);
 }
 
 static void dccp_recv_post_select(struct sched *s, struct task *t)
 {
        para_fd_set(pdd->fd, &s->rfds, &s->max_fileno);
 }
 
 static void dccp_recv_post_select(struct sched *s, struct task *t)
 {

-       struct receiver_node *rn = t->private_data;
+       struct receiver_node *rn = container_of(t, struct receiver_node, task);

        struct private_dccp_recv_data *pdd = rn->private_data;
 
        struct private_dccp_recv_data *pdd = rn->private_data;
 

-       if (rn->output_error && *rn->output_error) {
-               t->ret = *rn->output_error;
-               goto out;
+       if (rn->output_error && *rn->output_error < 0) {
+               t->error = *rn->output_error;
+               return;
+       }
+       if (!FD_ISSET(pdd->fd, &s->rfds))
+               return; /* nothing to do */
+       if (rn->loaded >= DCCP_BUFSIZE) {
+               t->error = -E_DCCP_OVERRUN;
+               return;

        }
        }

-       t->ret = 1;
-       if (!s->select_ret || !FD_ISSET(pdd->fd, &s->rfds))
-               goto out; /* nothing to do */
-       t->ret = -E_DCCP_OVERRUN;
-       if (rn->loaded >= DCCP_BUFSIZE)
-               goto out;
-       t->ret = recv_bin_buffer(pdd->fd, rn->buf + rn->loaded,
+       t->error = recv_bin_buffer(pdd->fd, rn->buf + rn->loaded,

                DCCP_BUFSIZE - rn->loaded);
                DCCP_BUFSIZE - rn->loaded);

-       if (t->ret <= 0) {
-               if (!t->ret)
-                       t->ret = -E_RECV_EOF;
-               goto out;
+       if (t->error > 0) {
+               rn->loaded += t->error;
+               return;

        }
        }

-       rn->loaded += t->ret;
-       return;
-out:
-       if (t->ret < 0)
-               rn->error = t->ret;
+       if (!t->error)
+               t->error = -E_RECV_EOF;

 }
 
 /**
 }
 
 /**

- * the init function of the dccp receiver
+ * The init function of the dccp receiver.

  *
  *

- * \param r pointer to the receiver struct to initialize
+ * \param r Pointer to the receiver struct to initialize.

  *
  *

- * Initialize all function pointers of \a r
+ * Initialize all function pointers of \a r.

  */
 void dccp_recv_init(struct receiver *r)
 {
  */
 void dccp_recv_init(struct receiver *r)
 {