Get rid of struct id3tag and struct mp3info.

[paraslash.git] / http_recv.c

diff --git a/http_recv.c b/http_recv.c
index 0a460adff4009428e8d457a30ff2426e4cc93deb..2e518b2063a8c81946b27d971ad80f5fca3c070e 100644 (file)
--- a/http_recv.c
+++ b/http_recv.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-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.
  */


@@ -84,10 +84,10 @@ static char *make_request_msg(void)
 
 static void http_recv_pre_select(struct sched *s, struct task *t)
 {
 
 static void http_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_http_recv_data *phd = rn->private_data;
 
        struct private_http_recv_data *phd = rn->private_data;
 

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

        if  (phd->status == HTTP_CONNECTED)
                para_fd_set(phd->fd, &s->wfds, &s->max_fileno);
        else
        if  (phd->status == HTTP_CONNECTED)
                para_fd_set(phd->fd, &s->wfds, &s->max_fileno);
        else


@@ -97,52 +97,47 @@ static void http_recv_pre_select(struct sched *s, struct task *t)
 
 static void http_recv_post_select(struct sched *s, struct task *t)
 {
 
 static void http_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_http_recv_data *phd = rn->private_data;
 
        struct private_http_recv_data *phd = rn->private_data;
 

-       t->ret = -E_HTTP_RECV_EOF;
-       if (rn->output_eof && *rn->output_eof)
-               goto out;
-       t->ret = 1;
-       if (!s->select_ret)
-               goto out;
+       if (rn->output_error && *rn->output_error < 0) {
+               t->error = *rn->output_error;
+               return;
+       }

        if  (phd->status == HTTP_CONNECTED) {
                char *rq;
                if (!FD_ISSET(phd->fd, &s->wfds))
        if  (phd->status == HTTP_CONNECTED) {
                char *rq;
                if (!FD_ISSET(phd->fd, &s->wfds))

-                       goto out;
+                       return;

                rq = make_request_msg();
                rq = make_request_msg();

-               PARA_INFO_LOG("%s", "sending http request\n");
-               t->ret = send_va_buffer(phd->fd, "%s", rq);
+               PARA_INFO_LOG("sending http request\n");
+               t->error = send_va_buffer(phd->fd, "%s", rq);

                free(rq);
                free(rq);

-               if (t->ret > 0)
+               if (t->error >= 0)

                        phd->status = HTTP_SENT_GET_REQUEST;
                        phd->status = HTTP_SENT_GET_REQUEST;

-               goto out;
+               return;

        }
        if (!FD_ISSET(phd->fd, &s->rfds))
        }
        if (!FD_ISSET(phd->fd, &s->rfds))

-               goto out;
+               return;

        if (phd->status == HTTP_SENT_GET_REQUEST) {
        if (phd->status == HTTP_SENT_GET_REQUEST) {

-               t->ret = recv_pattern(phd->fd, HTTP_OK_MSG, MAXLINE);
-               if (t->ret < 0)
-                       goto out;
-               PARA_INFO_LOG("%s", "received ok msg, streaming\n");
-               t->ret = 1;
-               phd->status = HTTP_STREAMING;
-               goto out;
+               t->error = recv_pattern(phd->fd, HTTP_OK_MSG, MAXLINE);
+               if (t->error >= 0) {
+                       PARA_INFO_LOG("received ok msg, streaming\n");
+                       phd->status = HTTP_STREAMING;
+               }
+               return;
+       }
+       if (rn->loaded >= BUFSIZE) {
+               t->error = -E_HTTP_RECV_OVERRUN;
+               return;

        }
        }

-       t->ret = -E_HTTP_RECV_OVERRUN;
-       if (rn->loaded >= BUFSIZE)
-               goto out;
-       t->ret = recv_bin_buffer(phd->fd, rn->buf + rn->loaded,
+       t->error = recv_bin_buffer(phd->fd, rn->buf + rn->loaded,

                BUFSIZE - rn->loaded);
                BUFSIZE - rn->loaded);

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

        }
        }

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

 }
 
 static void http_recv_close(struct receiver_node *rn)
 }
 
 static void http_recv_close(struct receiver_node *rn)


@@ -166,37 +161,23 @@ static void *http_recv_parse_config(int argc, char **argv)
 static int http_recv_open(struct receiver_node *rn)
 {
        struct private_http_recv_data *phd;
 static int http_recv_open(struct receiver_node *rn)
 {
        struct private_http_recv_data *phd;

-       struct hostent *he;

        struct http_recv_args_info *conf = rn->conf;
        struct http_recv_args_info *conf = rn->conf;

-       struct sockaddr_in their_addr;
-       int ret;
+       int fd, ret = makesock(AF_UNSPEC, IPPROTO_TCP, 0, conf->host_arg,
+               conf->port_arg);

 
 

-       rn->buf = para_calloc(BUFSIZE);
-       rn->private_data = para_calloc(sizeof(struct private_http_recv_data));
-       phd = rn->private_data;
-       ret = get_host_info(conf->host_arg, &he);
-       if (ret < 0)
-               goto err_out;
-       ret = get_stream_socket(AF_INET);

        if (ret < 0)
        if (ret < 0)

-               goto err_out;
-       phd->fd = ret;
-       /* init their_addr */
-       init_sockaddr(&their_addr, conf->port_arg, he);
-       PARA_NOTICE_LOG("connecting to %s:%d\n", conf->host_arg,
-               conf->port_arg);
-       ret = PARA_CONNECT(phd->fd, &their_addr);
+               return ret;
+       fd = ret;
+       ret = mark_fd_nonblocking(fd);

        if (ret < 0) {
        if (ret < 0) {

-               close(phd->fd);
-               goto err_out;
+               close(fd);
+               return ret;

        }
        }

-       mark_fd_nonblocking(phd->fd);
+       rn->buf = para_calloc(BUFSIZE);
+       rn->private_data = phd = para_calloc(sizeof(struct private_http_recv_data));
+       phd->fd = fd;

        phd->status = HTTP_CONNECTED;
        return 1;
        phd->status = HTTP_CONNECTED;
        return 1;

-err_out:
-       free(rn->private_data);
-       free(rn->buf);
-       return ret;

 }
 
 /**
 }
 
 /**