server: Include git version in output of com_si().

[paraslash.git] / http_recv.c

diff --git a/http_recv.c b/http_recv.c
index 035d1f1908f9f176689fb5a51501d8b788372c17..53ef8e60d03f6d7afc4d5b9d7e3b7a2e71c97deb 100644 (file)
--- a/http_recv.c
+++ b/http_recv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -49,7 +49,7 @@ struct private_http_recv_data {
         * The file descriptor used for receiving the http stream.
         *
         * The pre_select function of the http receiver adds this file descriptor to
-        * the set of file decriptors which are checked for reading/writing (depending
+        * the set of file descriptors which are checked for reading/writing (depending
         * on the current status) by the select loop of the application (para_audiod or
         * para_recv).
         *
@@ -95,7 +95,7 @@ static void http_recv_post_select(struct sched *s, struct task *t)
        struct btr_node *btrn = rn->btrn;
        int ret;
        char *buf;
-       size_t sz;
+       size_t sz, n;
 
        t->error = 0;
        ret = btr_node_status(btrn, 0, BTR_NT_ROOT);
@@ -116,12 +116,12 @@ static void http_recv_post_select(struct sched *s, struct task *t)
                phd->status = HTTP_SENT_GET_REQUEST;
                return;
        }
-       if (!FD_ISSET(phd->fd, &s->rfds))
-               return;
        if (phd->status == HTTP_SENT_GET_REQUEST) {
-               ret = recv_pattern(phd->fd, HTTP_OK_MSG, strlen(HTTP_OK_MSG));
+               ret = read_pattern(phd->fd, HTTP_OK_MSG, strlen(HTTP_OK_MSG), &s->rfds);
                if (ret < 0)
                        goto err;
+               if (ret == 0)
+                       return;
                PARA_INFO_LOG("received ok msg, streaming\n");
                phd->status = HTTP_STREAMING;
                return;
@@ -130,13 +130,11 @@ static void http_recv_post_select(struct sched *s, struct task *t)
        sz = btr_pool_get_buffer(phd->btrp, &buf);
        if (sz == 0)
                goto err;
-       ret = recv_bin_buffer(phd->fd, buf, sz);
-       if (ret == 0)
-               ret = -E_RECV_EOF;
-       if (ret < 0)
-               goto err;
-       btr_add_output_pool(phd->btrp, ret, btrn);
-       return;
+       ret = read_nonblock(phd->fd, buf, sz, &s->rfds, &n);
+       if (n > 0)
+               btr_add_output_pool(phd->btrp, n, btrn);
+       if (ret >= 0)
+               return;
 err:
        btr_remove_node(rn->btrn);
        t->error = ret;
@@ -165,8 +163,8 @@ static int http_recv_open(struct receiver_node *rn)
 {
        struct private_http_recv_data *phd;
        struct http_recv_args_info *conf = rn->conf;
-       int fd, ret = makesock(AF_UNSPEC, IPPROTO_TCP, 0, conf->host_arg,
-               conf->port_arg);
+       int fd, ret = para_connect_simple(IPPROTO_TCP, conf->host_arg,
+                                                      conf->port_arg);
 
        if (ret < 0)
                return ret;
@@ -186,6 +184,7 @@ static int http_recv_open(struct receiver_node *rn)
 static void http_recv_free_config(void *conf)
 {
        http_recv_cmdline_parser_free(conf);
+       free(conf);
 }
 
 /**