oggdec: Fix a thinko in post_select().

[paraslash.git] / udp_recv.c

diff --git a/udp_recv.c b/udp_recv.c
index 3d680814c163816cd8dd8cdbe9f579a955c5b4fc..d899e43933eddc9c72de93354ada14c3a607012a 100644 (file)
--- a/udp_recv.c
+++ b/udp_recv.c
@@ -23,8 +23,6 @@
 #include "fd.h"
 #include "buffer_tree.h"
 
-/** The size of the receiver node buffer. */
-#define UDP_RECV_CHUNK_SIZE (128 * 1024)
 /**
  * Data specific to the udp receiver.
  *
@@ -40,68 +38,13 @@ static void udp_recv_pre_select(struct sched *s, struct task *t)
 {
        struct receiver_node *rn = container_of(t, struct receiver_node, task);
        struct private_udp_recv_data *purd = rn->private_data;
-       int ret;
-
-       if (rn->btrn) {
-               ret = generic_recv_pre_select(s, t);
-               if (ret <= 0)
-                       return;
-       }
-       para_fd_set(purd->fd, &s->rfds, &s->max_fileno);
-}
-
-static int enough_space(size_t nbytes, size_t loaded)
-{
-       return nbytes + loaded < UDP_RECV_CHUNK_SIZE;
-}
-
-static int add_rn_output(struct receiver_node *rn, char *buf, size_t len)
-{
-       if (!len)
-               return 1;
-       if (!enough_space(len, rn->loaded))
-               return -E_UDP_OVERRUN;
-       memcpy(rn->buf + rn->loaded, buf, len);
-       rn->loaded += len;
-       return 1;
-}
 
-static void udp_recv_post_select_nobtr(__a_unused struct sched *s, struct task *t)
-{
-       struct receiver_node *rn = container_of(t, struct receiver_node, task);
-       struct private_udp_recv_data *purd = rn->private_data;
-       int ret;
-       char tmpbuf[UDP_RECV_CHUNK_SIZE];
-       size_t packet_size;
-
-       if (rn->output_error && *rn->output_error < 0) {
-               t->error = *rn->output_error;
-               return;
-       }
-       if (!FD_ISSET(purd->fd, &s->rfds))
-               return;
-       ret = recv_bin_buffer(purd->fd, tmpbuf, UDP_RECV_CHUNK_SIZE);
-       if (ret < 0) {
-               if (is_errno(ret, EINTR) || is_errno(ret, EAGAIN))
-                       goto success;
-               t->error = ret;
-               return;
-       }
-       t->error = -E_RECV_EOF;
-       if (!ret)
+       if (generic_recv_pre_select(s, t) <= 0)
                return;
-       packet_size = ret;
-       if (packet_size >= FEC_EOF_PACKET_LEN)
-               if (!memcmp(tmpbuf, FEC_EOF_PACKET, FEC_EOF_PACKET_LEN))
-                       return;
-       t->error = add_rn_output(rn, tmpbuf, packet_size);
-       if (t->error < 0)
-               return;
-success:
-       t->error = 1;
+       para_fd_set(purd->fd, &s->rfds, &s->max_fileno);
 }
 
-static void udp_recv_post_select_btr(__a_unused struct sched *s, struct task *t)
+static void udp_recv_post_select(__a_unused struct sched *s, struct task *t)
 {
        struct receiver_node *rn = container_of(t, struct receiver_node, task);
        struct private_udp_recv_data *purd = rn->private_data;
@@ -144,29 +87,14 @@ err:
        purd->fd = -1;
 }
 
-static void udp_recv_post_select(__a_unused struct sched *s, struct task *t)
-{
-       struct receiver_node *rn = container_of(t, struct receiver_node, task);
-       if (rn->btrn)
-               return udp_recv_post_select_btr(s, t);
-       udp_recv_post_select_nobtr(s, t);
-}
-
-static void udp_shutdown(void)
-{
-       return;
-}
-
 static void udp_recv_close(struct receiver_node *rn)
 {
        struct private_udp_recv_data *purd = rn->private_data;
 
        if (purd->fd >= 0)
                close(purd->fd);
-       PARA_CRIT_LOG("%p: close\n", rn);
        btr_pool_free(purd->btrp);
        free(rn->private_data);
-       free(rn->buf);
 }
 
 static void *udp_recv_parse_config(int argc, char **argv)
@@ -250,7 +178,6 @@ static int udp_recv_open(struct receiver_node *rn)
        char  *iface = c->iface_given ? c->iface_arg : NULL;
        int ret;
 
-       rn->buf = para_calloc(UDP_RECV_CHUNK_SIZE);
        rn->private_data = para_calloc(sizeof(struct private_udp_recv_data));
        purd = rn->private_data;
 
@@ -270,19 +197,19 @@ static int udp_recv_open(struct receiver_node *rn)
                close(purd->fd);
                goto err;
        }
-       PARA_CRIT_LOG("rn %p: receiving from %s:%d, fd=%d\n", rn, c->host_arg,
+       PARA_INFO_LOG("receiving from %s:%d, fd=%d\n", c->host_arg,
                c->port_arg, purd->fd);
        purd->btrp = btr_pool_new("udp_recv", 320 * 1024);
        return purd->fd;
 err:
        free(rn->private_data);
-       free(rn->buf);
        return ret;
 }
 
 static void udp_recv_free_config(void *conf)
 {
        udp_recv_cmdline_parser_free(conf);
+       free(conf);
 }
 
 /**
@@ -297,7 +224,6 @@ void udp_recv_init(struct receiver *r)
        struct udp_recv_args_info dummy;
 
        udp_recv_cmdline_parser_init(&dummy);
-       r->shutdown = udp_shutdown;
        r->open = udp_recv_open;
        r->close = udp_recv_close;
        r->pre_select = udp_recv_pre_select;